xorg-server: Changes to 'ubuntu'
debian/changelog | 6 +---
debian/patches/140_quell_acpi_errmsgs.patch | 39 ----------------------------
debian/patches/series | 1
3 files changed, 2 insertions(+), 44 deletions(-)
New commits:
commit 505deae14f277c13d234c0675dbfc08ea33c84e2
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Thu Dec 3 11:01:27 2009 +0200
Add a note about patch 140 being dropped.
and fix spelling of "supersede" (googlefight told me this is correct :)
diff --git a/debian/changelog b/debian/changelog
index 14f58fa..e3db8d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -47,9 +47,10 @@ xorg-server (2:1.7.2-2ubuntu1) UNRELEASED; urgency=low
- 102_ubuntu_sharevts_load_cpu.patch: Upstream.
- 103_psb_auto.patch: Fallback to vesa done differently upstream.
- 110_fedora_no_move_damage.patch: Upstream dropped it.
+ - 140_quell_acpi_errmsgs.patch: Superseded.
- 153_make_dmx_compile.patch: Xdmx is fixed upstream.
- 174_set_bg_pixmap_of_cow_to_none.patch: Upstream
- - 180_fedora_no_synaptics_mouse_synthesis.patch: Superceded.
+ - 180_fedora_no_synaptics_mouse_synthesis.patch: Superseded.
- 181_fedora_log_proc_cmdline.patch: Upstream.
- 185_dix_badwindow.patch: Upstream.
- 186_autoconfig_geode.patch: Upstream.
commit 13c9ef95f0b49dad7fb86942a177cd1c060e3387
Author: Timo Aaltonen <tjaalton@cc.hut.fi>
Date: Thu Dec 3 10:57:41 2009 +0200
Drop patch 140, since it's implemented upstream.
diff --git a/debian/changelog b/debian/changelog
index 6d5889f..14f58fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,8 +13,6 @@ xorg-server (2:1.7.2-2ubuntu1) UNRELEASED; urgency=low
GDM from the console.
+ 135_rethrow_signals.patch:
When aborting, re-raise signals for apport
- + 140_quell_acpi_errmsgs.patch:
- Avoid generating extraneous warnings when acpi is missing
+ 156_exevents_copykeyclass_nullptrcheck.patch,
157_check_null_modes.patch, 162_null_crtc_in_rotation.patch,
166_nullptr_xinerama_keyrepeat.patch, 167_nullptr_xisbread.patch
@@ -57,7 +55,6 @@ xorg-server (2:1.7.2-2ubuntu1) UNRELEASED; urgency=low
- 186_autoconfig_geode.patch: Upstream.
* Patches disabled for now, need a review/refresh or both:
- 135_rethrow_signals.patch
- - 140_quell_acpi_errmsgs.patch
- 156_exevents_copykeyclass_nullptrcheck.patch
(might not be needed anymore)
- 168_glibc_trace_to_stderr.patch
diff --git a/debian/patches/140_quell_acpi_errmsgs.patch b/debian/patches/140_quell_acpi_errmsgs.patch
deleted file mode 100644
index 6c79ae6..0000000
--- a/debian/patches/140_quell_acpi_errmsgs.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Nurp xorg-server-1.4.99.906-patched2/hw/xfree86/os-support/linux/lnx_acpi.c xorg-server-1.4.99.906-working2/hw/xfree86/os-support/linux/lnx_acpi.c
---- xorg-server-1.4.99.906-patched2/hw/xfree86/os-support/linux/lnx_acpi.c 2008-09-01 13:32:09.000000000 -0700
-+++ xorg-server-1.4.99.906-working2/hw/xfree86/os-support/linux/lnx_acpi.c 2008-09-01 14:06:56.000000000 -0700
-@@ -133,6 +133,10 @@ lnxACPIOpen(void)
- int fd;
- struct sockaddr_un addr;
- int r = -1;
-+ unsigned int acpi_warning_msg_interval = 10; /* interval between error prints */
-+ static unsigned int acpi_warning_msg_timer = 0;
-+ unsigned int acpi_warning_max_count = 20; /* Don't print error more than this many times total */
-+ static unsigned int acpi_warning_count = 0;
-
- #ifdef DEBUG
- ErrorF("ACPI: OSPMOpen called\n");
-@@ -148,8 +152,22 @@ lnxACPIOpen(void)
- addr.sun_family = AF_UNIX;
- strcpy(addr.sun_path, ACPI_SOCKET);
- if ((r = connect(fd, (struct sockaddr*)&addr, sizeof(addr))) == -1) {
-- xf86MsgVerb(X_WARNING,3,"Open ACPI failed (%s) (%s)\n", ACPI_SOCKET,
-- strerror(errno));
-+ if (acpi_warning_count < acpi_warning_max_count) {
-+ if (acpi_warning_msg_timer == 0) {
-+ /* Don't fill log with warning (LP: #247195) */
-+ xf86MsgVerb(X_WARNING,3,"Open ACPI failed (%s) (%s)\n", ACPI_SOCKET,
-+ strerror(errno));
-+ acpi_warning_msg_timer = acpi_warning_msg_interval;
-+ acpi_warning_count++;
-+
-+ if (acpi_warning_count == acpi_warning_max_count) {
-+ xf86MsgVerb(X_WARNING,1,"Has the acpid daemon died? Try restarting it. Suppressing further ACPI failure messages. (see LP: #247195)\n");
-+ }
-+
-+ } else {
-+ --acpi_warning_msg_timer;
-+ }
-+ }
- shutdown(fd, 2);
- close(fd);
- return NULL;
diff --git a/debian/patches/series b/debian/patches/series
index f5e55fa..ee617c0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,7 +12,6 @@
#105_fglrx_autodetect.patch
121_only_switch_vt_when_active.diff
#135_rethrow_signals.patch
-#140_quell_acpi_errmsgs.patch
#143_default_to_vesa.patch
#156_exevents_copykeyclass_nullptrcheck.patch
157_check_null_modes.patch
Reply to: