xorg-server: Changes to 'ubuntu'
debian/changelog | 8 +++++
debian/patches/101_fedora-apm-typedefs.patch | 40 +++++++++++++++++++++++++++
debian/patches/series | 1
3 files changed, 49 insertions(+)
New commits:
commit efabdf5baaaab0b43855679ef3ace859abb1cccd
Author: Timo Aaltonen <tjaalton@deckard.hut.fi>
Date: Mon Dec 17 12:36:47 2007 +0200
Add patch 101_fedora-apm-typedefs.patch
Temporary hack from Fedora for broken kernels that don't publish the
/dev/apm_bios types.
diff --git a/debian/changelog b/debian/changelog
index d3563a2..f2ed081 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xorg-server (2:1.4.1~git20071212-1ubuntu2) hardy; urgency=low
+
+ * debian/patches/101_fedora-apm-typedefs.patch:
+ - Temporary hack from Fedora for broken kernels that don't publish the
+ /dev/apm_bios types.
+
+ -- Timo Aaltonen <tepsipakki@ubuntu.com> Mon, 17 Dec 2007 11:54:46 +0200
+
xorg-server (2:1.4.1~git20071212-1ubuntu1) hardy; urgency=low
* Merge with Debian unstable, remaining changes:
diff --git a/debian/patches/101_fedora-apm-typedefs.patch b/debian/patches/101_fedora-apm-typedefs.patch
new file mode 100644
index 0000000..9b9fddf
--- /dev/null
+++ b/debian/patches/101_fedora-apm-typedefs.patch
@@ -0,0 +1,40 @@
+From 3fd969f08e4f550ac28fee3bbdbe55e9db872091 Mon Sep 17 00:00:00 2001
+From: Adam Jackson <ajax@redhat.com>
+Date: Mon, 3 Dec 2007 14:00:25 -0500
+Subject: [PATCH] apm_event_t workaround
+
+---
+ hw/kdrive/linux/linux.c | 2 ++
+ hw/xfree86/os-support/linux/lnx_apm.c | 3 +++
+ 2 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/hw/kdrive/linux/linux.c b/hw/kdrive/linux/linux.c
+index 23cd8f5..2f9cb62 100644
+--- a/hw/kdrive/linux/linux.c
++++ b/hw/kdrive/linux/linux.c
+@@ -275,6 +275,8 @@ LinuxApmBlock (pointer blockData, OSTimePtr pTimeout, pointer pReadmask)
+
+ static Bool LinuxApmRunning;
+
++#define apm_event_t unsigned short
++
+ static void
+ LinuxApmWakeup (pointer blockData, int result, pointer pReadmask)
+ {
+diff --git a/hw/xfree86/os-support/linux/lnx_apm.c b/hw/xfree86/os-support/linux/lnx_apm.c
+index 16ac80d..6bcae47 100644
+--- a/hw/xfree86/os-support/linux/lnx_apm.c
++++ b/hw/xfree86/os-support/linux/lnx_apm.c
+@@ -39,6 +39,9 @@ static PMClose lnxAPMOpen(void);
+ static void lnxCloseAPM(void);
+ static pointer APMihPtr = NULL;
+
++/* XXX this is wrong, do not ever commit me upstream */
++#define apm_event_t unsigned short
++
+ static struct {
+ apm_event_t apmLinux;
+ pmEvent xf86;
+--
+1.5.2.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 6355207..13b5f3c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,6 +21,7 @@
93_spooltodir_check_file_exists
93_xprint_fonts_fix
100_avoid_acpi_insanity.diff
+101_fedora-apm-typedefs.patch
102_ubuntu_sharevts_load_cpu.patch
104_fedora_init_origins_fix.patch
106_ubuntu_fpic_libxf86config.patch
Reply to: