debian/changelog | 9 +++++++++
debian/local/xvfb-run | 2 +-
debian/patches/123_no_composite_for_xvfb_run.patch | 11 -----------
debian/patches/142_psb_auto.patch | 6 +++---
debian/patches/series | 1 -
5 files changed, 13 insertions(+), 16 deletions(-)
New commits:
commit f2a834ce8d8f3463f2a62330fb7f820342a60d05
Author: Loïc Minier <[EMAIL PROTECTED]>
Date: Wed Oct 15 15:48:57 2008 +0200
Release
diff --git a/debian/changelog b/debian/changelog
index b5bbd57..cae30f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.5.2-1ubuntu2) UNRELEASED; urgency=low
+xorg-server (2:1.5.2-1ubuntu2) intrepid; urgency=low
* Update patch 142_psb_auto to also try psb and vesa for 0x8109.
* Apply and drop patch 123_no_composite_for_xvfb_run which was changing
commit 1032a40eeb1c7fd6ab8d3fcaed5c2620ccc86227
Author: Loïc Minier <[EMAIL PROTECTED]>
Date: Wed Oct 15 15:40:09 2008 +0200
Apply and drop patch 123_no_composite_for_xvfb_run which was changing files
below debian/ (xvfb-run, to disable the Composite extension by default).
diff --git a/debian/changelog b/debian/changelog
index 2ad29e2..b5bbd57 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
xorg-server (2:1.5.2-1ubuntu2) UNRELEASED; urgency=low
* Update patch 142_psb_auto to also try psb and vesa for 0x8109.
+ * Apply and drop patch 123_no_composite_for_xvfb_run which was changing
+ files below debian/ (xvfb-run, to disable the Composite extension by
+ default).
-- Loic Minier <[EMAIL PROTECTED]> Wed, 15 Oct 2008 15:27:23 +0200
diff --git a/debian/local/xvfb-run b/debian/local/xvfb-run
index c85f86a..148da9f 100644
--- a/debian/local/xvfb-run
+++ b/debian/local/xvfb-run
@@ -16,7 +16,7 @@ SERVERNUM=99
AUTHFILE=
ERRORFILE=/dev/null
STARTWAIT=3
-XVFBARGS="-screen 0 640x480x8"
+XVFBARGS="-screen 0 640x480x8 -extension Composite"
LISTENTCP="-nolisten tcp"
XAUTHPROTO=.
diff --git a/debian/patches/123_no_composite_for_xvfb_run.patch
b/debian/patches/123_no_composite_for_xvfb_run.patch
deleted file mode 100644
index 2a817d3..0000000
--- a/debian/patches/123_no_composite_for_xvfb_run.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- debian/local/xvfb-run 2006-10-13 18:42:49.000000000 +0200
-+++ xorg-server-1.1.1/debian/local/xvfb-run 2006-10-13 18:42:37.000000000
+0200
-@@ -16,7 +16,7 @@
- AUTHFILE=
- ERRORFILE=/dev/null
- STARTWAIT=3
--XVFBARGS="-screen 0 640x480x8"
-+XVFBARGS="-screen 0 640x480x8 -extension Composite"
- LISTENTCP="-nolisten tcp"
- XAUTHPROTO=.
-
diff --git a/debian/patches/series b/debian/patches/series
index 7a992a0..2f61cfe 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -9,7 +9,6 @@
107_fedora_dont_backfill_bg_none.patch
110_fedora_no_move_damage.patch
121_only_switch_vt_when_active.diff
-123_no_composite_for_xvfb_run.patch
135_rethrow_signals.patch
136_fedora_force_switchcorekeyboard_for_evdev.patch
137_add_device_property_support.patch
commit 8a8cabc19ac41f3b22d9a301454a9950e9eb0b6f
Author: Loïc Minier <[EMAIL PROTECTED]>
Date: Wed Oct 15 15:34:42 2008 +0200
Update patch 142_psb_auto to also try psb and vesa for 0x8109.
diff --git a/debian/changelog b/debian/changelog
index 070a6fc..2ad29e2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xorg-server (2:1.5.2-1ubuntu2) UNRELEASED; urgency=low
+
+ * Update patch 142_psb_auto to also try psb and vesa for 0x8109.
+
+ -- Loic Minier <[EMAIL PROTECTED]> Wed, 15 Oct 2008 15:27:23 +0200
+
xorg-server (2:1.5.2-1ubuntu1) intrepid; urgency=low
* Merge from debian-experimental.
diff --git a/debian/patches/142_psb_auto.patch
b/debian/patches/142_psb_auto.patch
index c3a85c5..685144e 100644
--- a/debian/patches/142_psb_auto.patch
+++ b/debian/patches/142_psb_auto.patch
@@ -5,8 +5,8 @@ in style to the savage driver section.
Bryce Harrington 23-Aug-2007
---- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c 2008-10-14
23:22:23.000000000 +0200
-+++ xorg-server/hw/xfree86/common/xf86AutoConfig.c 2008-10-14
23:23:00.000000000 +0200
+--- xorg-server.orig/hw/xfree86/common/xf86AutoConfig.c
++++ xorg-server/hw/xfree86/common/xf86AutoConfig.c
@@ -166,11 +166,18 @@
case 0x102c: driverList[0] = "chips"; break;
case 0x1013: driverList[0] = "cirrus"; break;
@@ -20,7 +20,7 @@ Bryce Harrington 23-Aug-2007
+ {
+ case 0x00d1: case 0x7800:
+ driverList[0] = "i740"; break;
-+ case 0x8108:
++ case 0x8108: case 0x8109:
+ driverList[0] = "psb";
+ driverList[1] = "vesa";
+ break;
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
