diff -u compiz-0.7.7+git20080807/debian/changelog compiz-0.7.7+git20080807/debian/changelog
--- compiz-0.7.7+git20080807/debian/changelog
+++ compiz-0.7.7+git20080807/debian/changelog
@@ -1,3 +1,10 @@
+compiz (1:0.7.7+git20080807-0ubuntu5) intrepid; urgency=low
+
+  * drop debian/patches/036_blacklist_ati_on_laptop.patch
+    which was a firefighting hack (LP: #201330)
+
+ -- Tormod Volden <debian.tormod@gmail.com>  Fri, 29 Aug 2008 14:21:31 +0200
+
 compiz (1:0.7.7+git20080807-0ubuntu4) intrepid; urgency=low
 
   * debian/patches/045_xscreensaver_damage_fix.patch:
reverted:
--- compiz-0.7.7+git20080807/debian/patches/036_blacklist_ati_on_laptop.patch
+++ compiz-0.7.7+git20080807.orig/debian/patches/036_blacklist_ati_on_laptop.patch
@@ -1,24 +0,0 @@
-Index: compiz-0.7.2/debian/compiz-manager
-===================================================================
---- compiz-0.7.2.orig/debian/compiz-manager	2008-03-11 08:26:06.000000000 -0500
-+++ compiz-0.7.2/debian/compiz-manager	2008-03-11 08:26:26.000000000 -0500
-@@ -260,6 +260,19 @@
- 		verbose "$(xset q) \n"
- 	return 0
- 	fi
-+
-+	#don't run on laptops using ati driver
-+	if laptop-detect; then
-+		for DRV in ati radeon; do
-+	                if egrep -q "Loading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG &&
-+        	           ! egrep -q "Unloading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG;
-+                	then
-+				verbose "Found laptop using ${DRV} driver. \n"
-+	                        return 1
-+        	        fi
-+		done
-+	fi
-+
- 	for DRV in ${WHITELIST}; do
- 		if egrep -q "Loading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG &&
- 		   ! egrep -q "Unloading ${XORG_DRIVER_PATH}${DRV}_drv\.so" $LOG; 
diff -u compiz-0.7.7+git20080807/debian/patches/series compiz-0.7.7+git20080807/debian/patches/series
--- compiz-0.7.7+git20080807/debian/patches/series
+++ compiz-0.7.7+git20080807/debian/patches/series
@@ -23,7 +23,6 @@
 #033_honor_default_plugins
 #034_dbus_decoration
 035_ignore_workspaces
-036_blacklist_ati_on_laptop.patch
 037_fullscreen_stacking_fixes.patch
 040_resolve-animation-fade-conflict_from_upstream.patch
 #041-start-decorator.patch