compiz: Changes to 'debian-unstable'
debian/changelog | 7 +++++
debian/patches/compiz-manager-nvidia-settings-optional.patch | 2 -
debian/patches/compiz-manager-posixly-correct.patch | 2 -
debian/patches/series | 1
debian/patches/whitelist-fglrx.patch | 13 +++++++++++
debian/patches/xscreensaver-damage-fix.patch | 8 ++----
6 files changed, 26 insertions(+), 7 deletions(-)
New commits:
commit 225a0b3aa756d2e3393afd7ee5a2c1729f4baea8
Author: Sean Finney <seanius@debian.org>
Date: Mon Sep 1 08:01:55 2008 +0200
whitelist fglrx in compiz-manager
diff --git a/debian/changelog b/debian/changelog
index ba3dd28..c20d2cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-compiz (0.7.6-7) unstable; urgency=low
+compiz (0.7.6-7) unstable; urgency=medium
* refresh quilt patches to apply with no fuzz/offsets.
+ * add fglrx driver to compiz-manager whitelist (closes: #495539).
- -- Sean Finney <seanius@debian.org> Sun, 31 Aug 2008 10:21:55 +0200
+ -- Sean Finney <seanius@debian.org> Mon, 01 Sep 2008 08:00:56 +0200
compiz (0.7.6-6) unstable; urgency=high
diff --git a/debian/patches/series b/debian/patches/series
index 7228035..7cad7b6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ compiz-manager-posixly-correct.patch
compiz-manager-nvidia-settings-optional.patch
disable-libx11-xcb-support.patch
xscreensaver-damage-fix.patch
+whitelist-fglrx.patch
diff --git a/debian/patches/whitelist-fglrx.patch b/debian/patches/whitelist-fglrx.patch
new file mode 100644
index 0000000..ba593c9
--- /dev/null
+++ b/debian/patches/whitelist-fglrx.patch
@@ -0,0 +1,13 @@
+whitelist the fglrx driver too
+see #495539
+--- 0-compiz.orig/debian/compiz-manager
++++ 0-compiz/debian/compiz-manager
+@@ -51,7 +51,7 @@ FALLBACKWM="${METACITY}"
+ FALLBACKWM_OPTIONS="--replace $@"
+
+ # Driver whitelist
+-WHITELIST="nvidia intel ati radeon i810"
++WHITELIST="fglrx nvidia intel ati radeon i810"
+
+ # blacklist based on the pci ids
+ # See http://wiki.compiz-fusion.org/Hardware/Blacklist for details
commit 52dc2408c8c058983e4993f308659702d3fbeacd
Author: Sean Finney <seanius@debian.org>
Date: Sun Aug 31 10:21:42 2008 +0200
refresh quilt patches
diff --git a/debian/changelog b/debian/changelog
index 8e255b8..ba3dd28 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+compiz (0.7.6-7) unstable; urgency=low
+
+ * refresh quilt patches to apply with no fuzz/offsets.
+
+ -- Sean Finney <seanius@debian.org> Sun, 31 Aug 2008 10:21:55 +0200
+
compiz (0.7.6-6) unstable; urgency=high
* backport commit aed97c441881d9c382c7865d0305fc8f884c10ac to fix the
diff --git a/debian/patches/compiz-manager-nvidia-settings-optional.patch b/debian/patches/compiz-manager-nvidia-settings-optional.patch
index 7de6fa3..11e11fe 100644
--- a/debian/patches/compiz-manager-nvidia-settings-optional.patch
+++ b/debian/patches/compiz-manager-nvidia-settings-optional.patch
@@ -1,6 +1,6 @@
--- 0-compiz.orig/debian/compiz-manager
+++ 0-compiz/debian/compiz-manager
-@@ -198,6 +198,10 @@ check_xgl()
+@@ -197,6 +197,10 @@ check_xgl()
# Check if the nVidia card has enough video ram to make sense
check_nvidia_memory()
{
diff --git a/debian/patches/compiz-manager-posixly-correct.patch b/debian/patches/compiz-manager-posixly-correct.patch
index 3bb62b3..e913f4a 100644
--- a/debian/patches/compiz-manager-posixly-correct.patch
+++ b/debian/patches/compiz-manager-posixly-correct.patch
@@ -2,7 +2,7 @@ debian bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=456628
reported upstream: http://bugs.opencompositing.org/show_bug.cgi?id=708
--- 0-compiz.orig/debian/compiz-manager
+++ 0-compiz/debian/compiz-manager
-@@ -150,7 +150,7 @@ check_fbconfig()
+@@ -149,7 +149,7 @@ check_fbconfig()
check_tfp()
{
verbose "Checking for texture_from_pixmap: "
diff --git a/debian/patches/xscreensaver-damage-fix.patch b/debian/patches/xscreensaver-damage-fix.patch
index 4509cc8..a46a127 100644
--- a/debian/patches/xscreensaver-damage-fix.patch
+++ b/debian/patches/xscreensaver-damage-fix.patch
@@ -1,10 +1,8 @@
imported from upstream commit aed97c441881d9c382c7865d0305fc8f884c10ac
fixes #483170
-diff --git a/src/screen.c b/src/screen.c
-index 2b7c914..807699b 100644
---- a/src/screen.c
-+++ b/src/screen.c
-@@ -2401,6 +2401,13 @@ damageScreenRegion (CompScreen *screen,
+--- 0-compiz.orig/src/screen.c
++++ 0-compiz/src/screen.c
+@@ -2420,6 +2420,13 @@ damageScreenRegion (CompScreen *screen,
XUnionRegion (screen->damage, region, screen->damage);
screen->damageMask |= COMP_SCREEN_DAMAGE_REGION_MASK;
Reply to: