martin

diff -Nru /tmp/wkwoG3bzVH/xorg-7.2/debian/changelog /tmp/1aQqfKg88d/xorg-7.2/debian/changelog--- /tmp/wkwoG3bzVH/xorg-7.2/debian/changelog	2007-03-08 11:42:25.000000000 +0100+++ /tmp/1aQqfKg88d/xorg-7.2/debian/changelog	2007-03-09 10:53:39.000000000 +0100@@ -1,3 +1,11 @@+xorg (1:7.2-0ubuntu7) feisty; urgency=low++  * debian/local/dexconf: Disable composite when using the fglrx driver. It+    does not support composition, and enabling it by default (as recently done+    in xorg-server) breaks DRI for fglrx. (LP: #90688)++ -- Martin Pitt <martin.pitt@ubuntu.com>  Fri,  9 Mar 2007 10:52:42 +0100+ xorg (1:7.2-0ubuntu6) feisty; urgency=low    * xserver-xorg.templates: Add xserver-xorg/config/device/extra_options sodiff -Nru /tmp/wkwoG3bzVH/xorg-7.2/debian/local/dexconf /tmp/1aQqfKg88d/xorg-7.2/debian/local/dexconf--- /tmp/wkwoG3bzVH/xorg-7.2/debian/local/dexconf	2007-03-08 12:27:57.000000000 +0100+++ /tmp/1aQqfKg88d/xorg-7.2/debian/local/dexconf	2007-03-09 10:55:26.000000000 +0100@@ -398,6 +398,19 @@ printf "$DEVICE_EXTRA_OPTIONS" | perl -nae 'print "\tOption\t\t\"$F[0]\"\t\t\"@F[1..$#F]\"\n"' >&4 printf "EndSection\n" >&4 +### EXTENSIONS ###++# fglrx driver does not support composite, and enabling it by default (as done+# in xserver-xorg) breaks DRI.+if [ "$DEVICE_DRIVER" = "fglrx" ]; then+  cat >&4 <<SECTION++Section "Extensions"+	Option		"Composite"	"0"+EndSection+SECTION+fi+ ### Elographic touch screen. It's both screen and input..  ELOTOUCH=no