Merge lp:~compiz-team/compiz/compiz.fix_1130160 into lp:compiz/0.9.9

Proposed by Sam Spilsbury
Status: Merged
Approved by: Michael Terry
Approved revision: 3613
Merged at revision: 3617
Proposed branch: lp:~compiz-team/compiz/compiz.fix_1130160
Merge into: lp:compiz/0.9.9
Diff against target: 20 lines (+2/-2)
2 files modified
debian/compiz-gnome.install (+1/-1)
debian/unity.ini (+1/-1)
To merge this branch: bzr merge lp:~compiz-team/compiz/compiz.fix_1130160
Reviewer Review Type Date Requested Status
Michael Terry Approve
PS Jenkins bot continuous-integration Pending
Review via email: mp+149308@code.launchpad.net

Commit message

Enable copytex by default and stick the upgrades in the right place

(LP: #1130160)

Description of the change

Enable copytex by default and stick the upgrades in the right place

(LP: #1130160)

To post a comment you must log in.
Revision history for this message
Michael Terry (mterry) wrote :

Sure.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/compiz-gnome.install'
2--- debian/compiz-gnome.install 2012-09-12 12:48:46 +0000
3+++ debian/compiz-gnome.install 2013-02-19 15:25:29 +0000
4@@ -5,7 +5,7 @@
5 debian/tmp/usr/bin/gtk-window-decorator
6 debian/65compiz_profile-on-session /etc/X11/Xsession.d
7 debian/unity.ini /etc/compizconfig/
8-debian/profile_upgrades/*.upgrade etc/compizconfig/upgrades
9+debian/profile_upgrades/*.upgrade usr/share/compizconfig/upgrades
10 debian/tmp/usr/lib/compizconfig/backends/libgsettings.so
11 debian/tmp/usr/lib/libcompizconfig_gsettings_backend.so
12 postinst/convert-files/*.convert usr/lib/compiz/migration/
13
14=== modified file 'debian/unity.ini'
15--- debian/unity.ini 2012-06-19 11:22:48 +0000
16+++ debian/unity.ini 2013-02-19 15:25:29 +0000
17@@ -1,3 +1,3 @@
18 [core]
19-s0_active_plugins = core;composite;opengl;compiztoolbox;decor;vpswitch;snap;mousepoll;resize;place;move;wall;grid;regex;imgpng;session;gnomecompat;animation;fade;unitymtgrabhandles;workarounds;scale;expo;ezoom;unityshell
20+s0_active_plugins = core;composite;opengl;copytex;compiztoolbox;decor;vpswitch;snap;mousepoll;resize;place;move;wall;grid;regex;imgpng;session;gnomecompat;animation;fade;unitymtgrabhandles;workarounds;scale;expo;ezoom;unityshell
21

Subscribers

People subscribed via source and target branches