compiz: Changes to 'debian-unstable'
debian/changelog | 11 +++++++++++
debian/patches/series | 2 +-
debian/patches/ubuntu/029_default_options | 2 +-
debian/patches/ubuntu/032_compiz_manager_add_gnomecompat | 6 +++---
4 files changed, 16 insertions(+), 5 deletions(-)
New commits:
commit 9d41e4e4db30df2324e3b34dc21de60c0cd678b6
Author: Sean Finney <seanius@debian.org>
Date: Sat Apr 11 14:26:17 2009 +0200
update changelog for 0.8.2-3
diff --git a/debian/changelog b/debian/changelog
index 5eb60fb..9be59ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+compiz (0.8.2-3) unstable; urgency=low
+
+ * import of some ubuntu patches for 0.8.2 with some modifications
+ - see debian/patches/ubuntu for patches
+ - see debian/patches/series for which patches are used and which
+ are not.
+ - includes patch to copy gnome/metacity keyboard shortcuts
+ (Closes: #503442, #454922).
+
+ -- Sean Finney <seanius@debian.org> Sat, 11 Apr 2009 14:26:06 +0200
+
compiz (0.8.2-2) unstable; urgency=low
* upgrading compiz-manager backed out some locally modified but not
commit 49fa6d07ad7b7db161d41d775983b36a0fb3cf4c
Author: Sean Finney <seanius@debian.org>
Date: Sat Apr 11 15:47:34 2009 +0200
modify default decorator path in ubuntu defaults patch
we still ship the compiz decorator as gtk-window-decorator.
diff --git a/debian/patches/ubuntu/029_default_options b/debian/patches/ubuntu/029_default_options
index dc000a5..5bebfdf 100644
--- a/debian/patches/ubuntu/029_default_options
+++ b/debian/patches/ubuntu/029_default_options
@@ -54,7 +54,7 @@
<option name="command" type="string">
<_short>Command</_short>
<_long>Decorator command line that is executed if no decorator is already running</_long>
-+ <default>/usr/bin/compiz-decorator</default>
++ <default>/usr/bin/gtk-window-decorator</default>
</option>
<option name="mipmap" type="bool">
<_short>Mipmap</_short>
commit 76a2c6e79bda79b38e815cc7f40db5de16d7c6da
Author: Sean Finney <seanius@debian.org>
Date: Sat Apr 11 15:45:44 2009 +0200
enable the ubuntu decorations patch
it seems the decorator plugin will spawn the decorator itself anyway,
so the pre-emptive launching of the window decorator by compiz-manager
isn't necessary.
diff --git a/debian/patches/series b/debian/patches/series
index cbf980a..6498bd4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -10,7 +10,7 @@ ubuntu/014-fix-gtk-window-decorator-no-argb-crash.patch
ubuntu/018_use_metacity_settings.patch
ubuntu/028_compiz_manager_blacklist
# i don't think we want this one, it removes the auto-detection of decorators??
-#ubuntu/029_compiz_manager_decoration.patch
+ubuntu/029_compiz_manager_decoration.patch
# we do this already above, with a slightly better fix
#ubuntu/029_compiz_manager_nvidia_settings.patch
ubuntu/029_default_options
commit 20b442b8b48af4090dcc3e1720a5b280836ac349
Author: Sean Finney <seanius@debian.org>
Date: Sat Apr 11 15:43:59 2009 +0200
modify gnomecompat patch to not nuke all settings in the case of error
seriously... wtf? in this case if you didn't have the mousepoll plugin
enabled it would fail to add the plugin due to a less than stellar job
of parsing the existing settings. this is fixed and the nuking is
removed anyway, just in case.
diff --git a/debian/patches/ubuntu/032_compiz_manager_add_gnomecompat b/debian/patches/ubuntu/032_compiz_manager_add_gnomecompat
index ff2d473..16dbaf4 100644
--- a/debian/patches/ubuntu/032_compiz_manager_add_gnomecompat
+++ b/debian/patches/ubuntu/032_compiz_manager_add_gnomecompat
@@ -9,10 +9,10 @@
+ verbose "running under gnome seesion, checking for gnomecompat\n"
+ if ! gconftool -g /apps/compiz/general/allscreens/options/active_plugins|grep -q gnomecompat; then
+ verbose "adding missing gnomecompat\n"
-+ V=$(gconftool -g /apps/compiz/general/allscreens/options/active_plugins|sed s/mousepoll,/mousepoll,gnomecompat,/)
++ V=$(gconftool -g /apps/compiz/general/allscreens/options/active_plugins| sed -e 's/]$/,gnomecompat]/' -e 's/\[,/[/' )
+ if ! echo $V|grep -q gnomecompat; then
-+ verbose "can not add gnomecompat, reseting\n"
-+ gconftool --unset /apps/compiz/general/allscreens/options/active_plugins
++ verbose "can not add gnomecompat\n"
++ #gconftool --unset /apps/compiz/general/allscreens/options/active_plugins
+ else
+ gconftool -s /apps/compiz/general/allscreens/options/active_plugins --type list --list-type=string $V
+ fi
Reply to: