xorg-server: Changes to 'ubuntu'
debian/changelog | 5 +--
debian/patches/188_default_primary_to_first_busid.patch | 22 ++++++++--------
debian/patches/series | 2 -
3 files changed, 14 insertions(+), 15 deletions(-)
New commits:
commit 4d3c22b5a32c5337b95f948984a15a0656ed3013
Author: Bryce Harrington <bryce@bryceharrington.org>
Date: Thu Dec 3 13:26:20 2009 -0800
Refresh patch 188
diff --git a/debian/changelog b/debian/changelog
index 7abeda7..c4546d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,7 +34,7 @@ xorg-server (2:1.7.2-2ubuntu1) UNRELEASED; urgency=low
Quirk for another LPL monitor (LP: #380009)
+ 188_default_primary_to_first_busid.patch:
Pick the first device and carry on (LP 459512)
- + 189_xserver_1.5.0_bg_none_root.patch:
+ + 189_xserver_1.5.0_bg_none_root.patch:
Create a root window with no background.
+ 190_cache-xkbcomp_output_for_fast_start_up.patch:
Cache keyboard settings.
@@ -55,12 +55,11 @@ xorg-server (2:1.7.2-2ubuntu1) UNRELEASED; urgency=low
- 185_dix_badwindow.patch: Upstream.
- 186_autoconfig_geode.patch: Upstream.
* Patches disabled for now, need a review/refresh or both:
- - 135_rethrow_signals.patch
+ - 135_rethrow_signals.patch - TODO: Refresh
- 156_exevents_copykeyclass_nullptrcheck.patch
(might not be needed anymore)
- 168_glibc_trace_to_stderr.patch
- 169_mipointer_nullptr_checks.patch
- - 188_default_primary_to_first_busid.patch
- 190_cache-xkbcomp_output_for_fast_start_up.patch
* 189_xserver_1.5.0_bg_none_root.patch: Fetched a new version.
* control, local/64-xorg-xkb.rules: Don't depend on keyboard-configuration
diff --git a/debian/patches/188_default_primary_to_first_busid.patch b/debian/patches/188_default_primary_to_first_busid.patch
index 5cfa79a..df8f066 100644
--- a/debian/patches/188_default_primary_to_first_busid.patch
+++ b/debian/patches/188_default_primary_to_first_busid.patch
@@ -1,15 +1,15 @@
-Binary files xorg-server-ubuntu-git-patched/.git/index and xorg-server-ubuntu-git-working/.git/index differ
-diff -Nurp xorg-server-ubuntu-git-patched/hw/xfree86/common/xf86pciBus.c xorg-server-ubuntu-git-working/hw/xfree86/common/xf86pciBus.c
---- xorg-server-ubuntu-git-patched/hw/xfree86/common/xf86pciBus.c 2009-10-23 16:18:49.000000000 -0700
-+++ xorg-server-ubuntu-git-working/hw/xfree86/common/xf86pciBus.c 2009-10-23 18:49:36.000000000 -0700
-@@ -424,8 +424,8 @@ xf86PciProbe(void)
- primaryBus.id.pci = info;
- } else {
- xf86Msg(X_NOTICE,
+diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c
+index ac018e7..c00391c 100644
+--- a/hw/xfree86/common/xf86pciBus.c
++++ b/hw/xfree86/common/xf86pciBus.c
+@@ -141,8 +141,8 @@ xf86PciProbe(void)
+ primaryBus.id.pci = info;
+ } else {
+ xf86Msg(X_NOTICE,
- "More than one possible primary device found\n");
-- primaryBus.type ^= (BusType)(-1);
+- primaryBus.type ^= (BusType)(-1);
+ "More than one possible primary device found. Using first one seen.\n");
-+ break;
- }
++ break;
}
}
+ }
diff --git a/debian/patches/series b/debian/patches/series
index ee617c0..5db9ace 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -28,6 +28,6 @@
177_animated_cursor_change_master.patch
184_virtual_devices_autodetect.patch
187_edid_quirk_hp_nc8430.patch
-#188_default_primary_to_first_busid.patch
+188_default_primary_to_first_busid.patch
189_xserver_1.5.0_bg_none_root.patch
#190_cache-xkbcomp_output_for_fast_start_up.patch
Reply to: