xorg-server: Changes to 'debian-unstable'
Rebased ref, commits from common ancestor:
commit 1ab0d6f915a85a670432e579b760c4604ed2920a
Author: Brice Goglin <bgoglin@debian.org>
Date: Mon Mar 15 13:32:17 2010 +0100
Add 06_dont_trap_access_to_timer_and_keyboard.diff
diff --git a/debian/changelog b/debian/changelog
index c18c3ee..d8b15d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xorg-server (2:1.7.5.902-2) UNRELEASED; urgency=low
+
+ * Add 06_dont_trap_access_to_timer_and_keyboard.diff,
+ thanks Samuel Thibault.
+
+ -- Brice Goglin <bgoglin@debian.org> Tue, 16 Mar 2010 08:06:29 +0100
+
xorg-server (2:1.7.5.902-1) unstable; urgency=low
[ Julien Cristau ]
diff --git a/debian/patches/06_dont_trap_access_to_timer_and_keyboard.diff b/debian/patches/06_dont_trap_access_to_timer_and_keyboard.diff
new file mode 100644
index 0000000..23d8dc7
--- /dev/null
+++ b/debian/patches/06_dont_trap_access_to_timer_and_keyboard.diff
@@ -0,0 +1,22 @@
+[PATCH] Do not trap access to timer and keyboard
+
+Some VESA BIOSes need to access to them.
+
+Signed-off-by: Samuel Thibault <samuel.thibault@ens-lyon.org>
+---
+ hw/xfree86/os-support/hurd/hurd_video.c | 2 --
+ 1 files changed, 0 insertions(+), 2 deletions(-)
+
+diff --git a/hw/xfree86/os-support/hurd/hurd_video.c b/hw/xfree86/os-support/hurd/hurd_video.c
+index 4a99db3..e049ceb 100644
+--- a/hw/xfree86/os-support/hurd/hurd_video.c
++++ b/hw/xfree86/os-support/hurd/hurd_video.c
+@@ -124,8 +124,6 @@ xf86EnableIO()
+ FatalError("xf86EnableIO: ioperm() failed (%s)\n", strerror(errno));
+ return FALSE;
+ }
+- ioperm(0x40,4,0); /* trap access to the timer chip */
+- ioperm(0x60,4,0); /* trap access to the keyboard controller */
+ return TRUE;
+ }
+
diff --git a/debian/patches/series b/debian/patches/series
index 29afbca..59f2548 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,6 +6,7 @@
03_fedora_glx_versioning.diff
04_fedora_glx14-swrast.diff
05_only_call_gamma_set_if_nonnull.diff
+06_dont_trap_access_to_timer_and_keyboard.diff
#13_debian_add_xkbpath_env_variable.diff
11-Move-config_init-after-CreateWellKnownSockets-and-In.diff
12-Add-libudev-input-hotplug-backend.diff
commit 4b30f4314ccfd6a7a46c07ab7027430027bbf288
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Mar 15 22:19:06 2010 +0100
Upload to unstable.
diff --git a/debian/changelog b/debian/changelog
index d69fee3..c18c3ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xorg-server (2:1.7.5.902-1) UNRELEASED; urgency=low
+xorg-server (2:1.7.5.902-1) unstable; urgency=low
[ Julien Cristau ]
* config/udev: fix adding unnamed devices.
@@ -38,7 +38,7 @@ xorg-server (2:1.7.5.902-1) UNRELEASED; urgency=low
* Tweak builderstring to use the name of the person responsible for the
upload instead of an host-specific one (Closes: #574017).
- -- Drew Parsons <dparsons@debian.org> Wed, 03 Mar 2010 23:33:54 +1100
+ -- Cyril Brulebois <kibi@debian.org> Mon, 15 Mar 2010 22:19:01 +0100
xorg-server (2:1.7.5-1) unstable; urgency=low
commit 5461b39585e739ed2df0d2200dc657123cfe71ff
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Mar 15 21:50:31 2010 +0100
Tweak builderstring to use the name of the person responsible for the upload instead of an host-specific one (Closes: #574017).
diff --git a/debian/changelog b/debian/changelog
index b61768a..d69fee3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -35,6 +35,8 @@ xorg-server (2:1.7.5.902-1) UNRELEASED; urgency=low
* Add nettle-dev to Build-Depends; and pass --with-sha1=libnettle for
the udeb build (and --with-sha1=libgcrypt for the main build).
* Add myself to Uploaders.
+ * Tweak builderstring to use the name of the person responsible for the
+ upload instead of an host-specific one (Closes: #574017).
-- Drew Parsons <dparsons@debian.org> Wed, 03 Mar 2010 23:33:54 +1100
diff --git a/debian/rules b/debian/rules
index e767aff..649935c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,6 +65,8 @@ INSTALL=/usr/bin/install
VENDOR = $(shell lsb_release -i -s)
+BUILDER=$(shell dpkg-parsechangelog | awk -F': ' '/^Maintainer: / {print $$2}')
+
# disable-static is so we don't get libfoo.a for modules. now if only we could
# kill the .las.
confflags += \
commit 117c4516aa22f19f5c30e6ba0cd221202276dd90
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Mar 15 15:02:34 2010 +0100
Add myself to Uploaders.
diff --git a/debian/changelog b/debian/changelog
index 8d12681..b61768a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -34,6 +34,7 @@ xorg-server (2:1.7.5.902-1) UNRELEASED; urgency=low
statically against libnettle.a to avoid an extra udeb for a few bytes.
* Add nettle-dev to Build-Depends; and pass --with-sha1=libnettle for
the udeb build (and --with-sha1=libgcrypt for the main build).
+ * Add myself to Uploaders.
-- Drew Parsons <dparsons@debian.org> Wed, 03 Mar 2010 23:33:54 +1100
diff --git a/debian/control b/debian/control
index 6643904..cb940b3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xorg-server
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Steve Langasek <vorlon@debian.org>, Drew Parsons <dparsons@debian.org>, Brice Goglin <bgoglin@debian.org>
+Uploaders: David Nusinow <dnusinow@debian.org>, Steve Langasek <vorlon@debian.org>, Drew Parsons <dparsons@debian.org>, Brice Goglin <bgoglin@debian.org>, Cyril Brulebois <kibi@debian.org>
# all the Build-Depends up to x11proto-xf86-dri-dev are for the normal Xorg
# server, and common dependencies for the DIX.
# x11proto-xf86dri-dev and libdrm-dev are for DRI support for the Xorg server.
commit 1853d00779aa9ecf81cd7fb94d89a25d81b520a8
Author: Cyril Brulebois <kibi@debian.org>
Date: Mon Mar 15 14:00:34 2010 +0100
Bump version for libudev-dev again.
Needed to match the udev upload where the patch was actually merged.
diff --git a/debian/control b/debian/control
index eedfe5c..6643904 100644
--- a/debian/control
+++ b/debian/control
@@ -49,7 +49,7 @@ Build-Depends:
nettle-dev,
libdbus-1-dev [kfreebsd-amd64 kfreebsd-i386],
libhal-dev [kfreebsd-amd64 kfreebsd-i386],
- libudev-dev (>= 150-3) [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
+ libudev-dev (>= 151-3) [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
libselinux1-dev (>= 2.0.80) [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
libaudit-dev [alpha amd64 arm armeb armel avr32 hppa i386 ia64 lpia m32r m68k mips mipsel powerpc ppc64 s390 s390x sh3 sh3eb sh4 sh4eb sparc],
x11proto-xf86dri-dev (>= 2.1.0),
Reply to: