debian/changelog | 8 ++++++++
debian/patches/compiz-debian-paths.patch | 19 +++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 28 insertions(+)
New commits:
commit 53aff7193ca0f995ffddaa3388a839fbbe105000
Author: Sean Finney <sean...@debian.org>
Date: Wed Apr 8 22:57:22 2009 +0200
prep changelog for quick-fix update
diff --git a/debian/changelog b/debian/changelog
index 3a236df..5eb60fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+compiz (0.8.2-2) unstable; urgency=low
+
+ * upgrading compiz-manager backed out some locally modified but not
+ quilt-using changes in paths. so, new patch compiz-debian-paths.patch
+ should fix this (closes: #522985).
+
+ -- Sean Finney <sean...@debian.org> Wed, 08 Apr 2009 23:13:19 +0200
+
compiz (0.8.2-1) unstable; urgency=low
* new upstream release.
commit 2800647335e16aa10543336aa869c358bd60059b
Author: Sean Finney <sean...@debian.org>
Date: Wed Apr 8 22:37:10 2009 +0200
new patch compiz-debian-paths.patch for debian installed paths
diff --git a/debian/patches/compiz-debian-paths.patch
b/debian/patches/compiz-debian-paths.patch
new file mode 100644
index 0000000..3229ada
--- /dev/null
+++ b/debian/patches/compiz-debian-paths.patch
@@ -0,0 +1,19 @@
+--- 0-compiz.orig/debian/compiz-manager
++++ 0-compiz/debian/compiz-manager
+@@ -27,13 +27,13 @@
+ #
+
+
+-COMPIZ_BIN_PATH="/usr/local/bin/" # For window decorators and compiz
+-PLUGIN_PATH="/usr/local/lib/compiz/"
++COMPIZ_BIN_PATH="/usr/bin/" # For window decorators and compiz
++PLUGIN_PATH="/usr/lib/compiz/"
+ GLXINFO="/usr/bin/glxinfo"
+ KWIN="/usr/bin/kwin"
+ METACITY="/usr/bin/metacity"
+ XFWM="/usr/bin/xfwm"
+-COMPIZ_NAME="compiz" # Final name for compiz (compiz.real)
++COMPIZ_NAME="compiz.real" # Final name for compiz (compiz.real)
+
+ # For Xgl LD_PRELOAD
+ LIBGL_NVIDIA="/usr/lib/nvidia/libGL.so.1.2.xlibmesa"
diff --git a/debian/patches/series b/debian/patches/series
index 19d8697..c249f38 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@
015_optional-fbo.patch
compiz-manager-nvidia-settings-optional.patch
whitelist-fglrx.patch
+compiz-debian-paths.patch
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
