xserver-xorg-input-evdev: Changes to 'debian-experimental'
ChangeLog | 165 ++++
configure | 20
debian/changelog | 18
debian/control | 2
debian/patches/include-the-proper-header-for-XkbSetRulesDflts-and-X.patch | 21
debian/patches/series | 1
debian/rules | 4
debian/xsfbs/xsfbs-autoreconf.mk | 150 ---
debian/xsfbs/xsfbs.mk | 79 --
debian/xsfbs/xsfbs.sh | 387 +++++-----
src/Makefile.in | 8
11 files changed, 437 insertions(+), 418 deletions(-)
New commits:
commit 633117c00ee7c57818e1194bb0fb788fe3a584e2
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Jul 14 02:20:26 2008 +0200
Build against xserver 1.5 rc5.
Disable the patch for now, xkbfile.h is missing from xserver-xorg-dev.
diff --git a/debian/changelog b/debian/changelog
index 5ba992c..993f07e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-evdev (1:2.0.1-2) experimental; urgency=low
+
+ * Build against xserver 1.5 rc5.
+ * Disable the patch for now, xkbfile.h is missing from xserver-xorg-dev.
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 14 Jul 2008 02:20:56 +0200
+
xserver-xorg-input-evdev (1:2.0.1-1) unstable; urgency=low
[ Julien Cristau, Timo Aaltonen ]
diff --git a/debian/control b/debian/control
index 757ea46..5e66802 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: David Nusinow <dnusinow@debian.org>, Drew Parsons <dparsons@debian.org>, Julien Cristau <jcristau@debian.org>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 2:1.4), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev, x11proto-kb-dev, dpkg-dev (>= 1.14.17)
+Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev (>= 2:1.4.99.905), x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev, x11proto-kb-dev, dpkg-dev (>= 1.14.17)
Standards-Version: 3.7.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-evdev
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-evdev.git
diff --git a/debian/patches/series b/debian/patches/series
index 0bc726b..8241de9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-include-the-proper-header-for-XkbSetRulesDflts-and-X.patch
+#include-the-proper-header-for-XkbSetRulesDflts-and-X.patch
commit b809c20bec5be95db5f9278586ca0965b1b4d6a7
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 13 15:37:15 2008 +0200
Prepare changelog for upload
diff --git a/debian/changelog b/debian/changelog
index aa4bd65..5ba992c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-xserver-xorg-input-evdev (1:2.0.1-1) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:2.0.1-1) unstable; urgency=low
[ Julien Cristau, Timo Aaltonen ]
* New upstream release.
@@ -14,7 +14,7 @@ xserver-xorg-input-evdev (1:2.0.1-1) UNRELEASED; urgency=low
dpkg-dev >= 1.14.17.
* Fix target dependencies in debian/rules.
- -- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 01 Jul 2008 19:26:00 +0300
+ -- Julien Cristau <jcristau@debian.org> Sun, 13 Jul 2008 15:37:13 +0200
xserver-xorg-input-evdev (1:1.2.0-1) unstable; urgency=low
commit abce57373bd789036f1f960fbe68c36ba56d4126
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 13 15:32:08 2008 +0200
fix attribution in changelog
diff --git a/debian/changelog b/debian/changelog
index 739e01c..aa4bd65 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
xserver-xorg-input-evdev (1:2.0.1-1) UNRELEASED; urgency=low
+ [ Julien Cristau, Timo Aaltonen ]
+ * New upstream release.
+
[ Julien Cristau ]
* Drop the XS- prefix from Vcs-* control fields.
- * New upstream release.
* Drop evdev_no_flush_on_init.diff, obsolete.
* New patch include-the-proper-header-for-XkbSetRulesDflts-and-X.patch, fix
a 'missing declaration' compiler warning by including the right header.
commit 0a43b67e7dd432e891610590d409122ae3ef5992
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 13 15:31:27 2008 +0200
Fix target dependencies in debian/rules.
diff --git a/debian/changelog b/debian/changelog
index 8dfa877..739e01c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,7 @@ xserver-xorg-input-evdev (1:2.0.1-1) UNRELEASED; urgency=low
/usr/bin/Xorg and other modules, and that's not a bug, so we want
dpkg-shlibdeps to shut up about symbols it can't find. Build-depend on
dpkg-dev >= 1.14.17.
+ * Fix target dependencies in debian/rules.
-- Timo Aaltonen <tepsipakki@ubuntu.com> Tue, 01 Jul 2008 19:26:00 +0300
diff --git a/debian/rules b/debian/rules
index 9d27e8f..620884c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -31,8 +31,8 @@ endif
# kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
confflags += --disable-static
-build: patch build-stamp
-build-stamp:
+build: build-stamp
+build-stamp: $(STAMP_DIR)/patch
dh_testdir
test -d obj-$(DEB_BUILD_GNU_TYPE) || mkdir obj-$(DEB_BUILD_GNU_TYPE)
commit d8a36f90aaab34c386564cf351ac787d713435a5
Author: Julien Cristau <jcristau@debian.org>
Date: Sun Jul 13 15:28:09 2008 +0200
update patch for new upstream
diff --git a/debian/patches/include-the-proper-header-for-XkbSetRulesDflts-and-X.patch b/debian/patches/include-the-proper-header-for-XkbSetRulesDflts-and-X.patch
index 8c80497..8b3d7d4 100644
--- a/debian/patches/include-the-proper-header-for-XkbSetRulesDflts-and-X.patch
+++ b/debian/patches/include-the-proper-header-for-XkbSetRulesDflts-and-X.patch
@@ -4,15 +4,13 @@ Date: Thu, 22 May 2008 20:54:02 +0200
Subject: [PATCH] include the proper header for XkbSetRulesDflts and XkbInitKeyboardDeviceStruct
---
- src/evdev.c | 3 +--
+ src/evdev.h | 3 +--
1 files changed, 1 insertions(+), 2 deletions(-)
-diff --git a/src/evdev.c b/src/evdev.c
-index e212c14..18999f4 100644
---- a/src/evdev.c
-+++ b/src/evdev.c
-@@ -45,8 +45,7 @@
- #include <mipointer.h>
+--- xserver-xorg-input-evdev.orig/src/evdev.h
++++ xserver-xorg-input-evdev/src/evdev.h
+@@ -36,8 +36,7 @@
+ #include <xf86_OSproc.h>
#if defined(XKB)
-/* XXX VERY WRONG. this is a client side header. */
@@ -20,7 +18,4 @@ index e212c14..18999f4 100644
+#include <xkbsrv.h>
#endif
- #include <xf86Module.h>
---
-1.5.5.1
-
+ typedef struct {
commit 66e28c41fd0932dbd7c98ec2dfd6d531cae9d030
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jul 10 18:30:03 2008 +0200
Revert "Remove the patch, not needed anymore."
This reverts commit 1e99025632815c565dd24ca3328ff304cb763e50.
diff --git a/debian/changelog b/debian/changelog
index cc9fd60..8dfa877 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ xserver-xorg-input-evdev (1:2.0.1-1) UNRELEASED; urgency=low
* Drop the XS- prefix from Vcs-* control fields.
* New upstream release.
* Drop evdev_no_flush_on_init.diff, obsolete.
+ * New patch include-the-proper-header-for-XkbSetRulesDflts-and-X.patch, fix
+ a 'missing declaration' compiler warning by including the right header.
* Run dpkg-shlibdeps with --warnings=6. Drivers reference symbols from
/usr/bin/Xorg and other modules, and that's not a bug, so we want
dpkg-shlibdeps to shut up about symbols it can't find. Build-depend on
diff --git a/debian/patches/include-the-proper-header-for-XkbSetRulesDflts-and-X.patch b/debian/patches/include-the-proper-header-for-XkbSetRulesDflts-and-X.patch
new file mode 100644
index 0000000..8c80497
--- /dev/null
+++ b/debian/patches/include-the-proper-header-for-XkbSetRulesDflts-and-X.patch
@@ -0,0 +1,26 @@
+From 9007585c1fce21e786372c2f1ca1c7776f3eafdb Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Thu, 22 May 2008 20:54:02 +0200
+Subject: [PATCH] include the proper header for XkbSetRulesDflts and XkbInitKeyboardDeviceStruct
+
+---
+ src/evdev.c | 3 +--
+ 1 files changed, 1 insertions(+), 2 deletions(-)
+
+diff --git a/src/evdev.c b/src/evdev.c
+index e212c14..18999f4 100644
+--- a/src/evdev.c
++++ b/src/evdev.c
+@@ -45,8 +45,7 @@
+ #include <mipointer.h>
+
+ #if defined(XKB)
+-/* XXX VERY WRONG. this is a client side header. */
+-#include <X11/extensions/XKBstr.h>
++#include <xkbsrv.h>
+ #endif
+
+ #include <xf86Module.h>
+--
+1.5.5.1
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..0bc726b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+include-the-proper-header-for-XkbSetRulesDflts-and-X.patch
commit 3096936f2473c873ddc747da160cc0895f8f96ed
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jul 10 18:29:45 2008 +0200
update changelogs
diff --git a/ChangeLog b/ChangeLog
index 12c37bb..340dc01 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,168 @@
+commit b125b834f4ce4877204b9c8e98ad2641e2c7b082
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Sun Jun 22 17:52:58 2008 +0930
+
+ evdev 2.0.1
+
+commit 05b20db8dbfb47bc370fe24e50ef563f1879be61
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Sat Jun 21 16:42:12 2008 +0930
+
+ No need to finalize MB emulation after EvdevProbe anymore.
+
+ Follow-up to 76800bfa75807e49398380b902f6c0f547cd4c0e.
+ (cherry picked from commit 5a0ea39b79b27b7c3117661a21e7ab5eba3c9b24)
+
+commit 43768d59da2c519dde5a8efaf0ff2b12b6c47fcc
+Author: Simon Munton <simon@munton.demon.co.uk>
+Date: Sat Jun 21 10:19:07 2008 +0930
+
+ Close file descriptor if EvdevProbe fails.
+
+ Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
+ (cherry picked from commit 373e13ae353d1e0022f8821adc528ebc5411d47d)
+
+commit 9c524f6963645bf42bbd41d4189d6319020a133d
+Author: Keith Packard <keithp@keithp.com>
+Date: Fri Jun 20 18:20:55 2008 -0700
+
+ Enable middle button emulation at DEVICE_ON instead of DEVICE_INIT.
+
+ This ensures that the middle button emulation is re-enabled after VT switch,
+ otherwise the block handler that deals with the timeouts would not get
+ re-registered.
+
+ Signed-off-by: Keith Packard <keithp@keithp.com>
+ (cherry picked from commit 76800bfa75807e49398380b902f6c0f547cd4c0e)
+
+commit 04003a98a9ca1b4b0c32d319fab07ee7afc83c75
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Tue Jun 17 14:01:49 2008 +0930
+
+ evdev 2.0.0
+
+commit 0443fb430f2481c1f0d0d83730a9145b5794f559
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Tue Jun 17 13:59:15 2008 +0930
+
+ Shut up compiler warning "implicit declaration of function 'xf86Msg'"
+
+commit 998f52010f92dc79f2ace6048a2f3fd600a97582
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Thu Jun 12 11:23:10 2008 +0930
+
+ Finalize MB emulation if EvdevProbe fails.
+
+ This avoids segfaults when HAL is restarted behind our backs. Also, only init
+ MB emulation when the device actually has a button.
+
+commit de07c04f5c2874b8e407913c3121e715e46653d2
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Wed Jun 11 11:24:07 2008 +0930
+
+ evdev 1.99.4
+
+ 1.99.3 had a nasty bug, so here's a quick update.
+
+commit 01355b9d4b3ed92da42f90fb69384eb22cdcb3d9
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Wed Jun 11 11:19:04 2008 +0930
+
+ If Emulate3Buttons is specified in the config, don't auto-deactivate it.
+
+ Default setting is still "on" until middle button is pressed. If the options
+ is however explicitly stated in the config file, it takes the value from the
+ config file, no matter if a middle button is present.
+
+commit 9591dc1f6cc89208805b120eabd055e8dabd3e40
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Wed Jun 11 10:36:00 2008 +0930
+
+ Remove wakeup handlers when device is closed.
+
+ Less SIGABRTs are less exciting, but sometimes boredom is what we want.
+
+commit 08ba40b2532bd61b60c9cf994b21300f596f7ebd
+Author: Adam Jackson <ajax@redhat.com>
+Date: Tue Jun 10 17:35:33 2008 -0400
+
+ evdev 1.99.3
+
+commit 39dc453691804648f34dbd856bd7e66cfdc59d66
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Tue Jun 10 22:48:01 2008 +0930
+
+ Disable middle mouse button emulation when a real middle MB event is detected.
+
+ Devices may report middle mouse buttons even if they don't have one (PS/2
+ devices just don't know any better), so we can't be sure until we see the
+ event.
+
+commit e8887435ac065ec3071b2d8bf0895e8cb196ec3d
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Tue Jun 10 15:55:40 2008 +0930
+
+ Enable middle-mouse button emulation.
+
+ Ported from xf86-input-mouse, with a few cleanups.
+
+commit b0f6987ee6b133e28f3af18da62cfb5ca79fbe07
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Tue Jun 10 22:41:43 2008 +0930
+
+ Plug a memory leak, we allocated pEvdev twice, dropping the first memory area.
+
+commit fec73e1418a4da1b64496faca27b06fef0aa5206
+Author: Sven Wegener <swegener@gentoo.org>
+Date: Sat Jun 7 13:01:22 2008 +0200
+
+ evdev: Port b4a5a204 "Fix pointer crossing screen bug." to current master branch
+
+ The commit b4a5a204 fixed an issue, where we can't move the pointer to
+ other screens and this happens in current master branch again. This commit
+ ports the old commit to the current master branch.
+
+ Signed-off-by: Sven Wegener <swegener@gentoo.org>
+ Signed-off-by: Peter Hutterer <peter@cs.unisa.edu.au>
+
+commit da112737eb109dc263169e820b7ef903b7f8624f
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Sun Jun 8 00:12:03 2008 +0930
+
+ Check for XINPUT ABI < 3 (corrected version)
+
+ Thanks to Sven Wegener for pointing out the incorrect previous version.
+
+commit d40125ea8c2ce6ec0f98bdc0655f79aa7274152e
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Sun Jun 8 00:09:40 2008 +0930
+
+ Revert "Check for XINPUT ABI, parameters of InitValuatorClassRec have changed."
+
+ GetMotionEvents() doesn't exist, led to compile errors with servers pre-MPX
+ merge. Thanks to Sven Wegener for pointing this out.
+
+ This reverts commit 42422d8f69e6806e1adfd93017cac064a75041c7.
+
+commit 42422d8f69e6806e1adfd93017cac064a75041c7
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Mon May 26 19:17:19 2008 +0930
+
+ Check for XINPUT ABI, parameters of InitValuatorClassRec have changed.
+
+commit 15e0091f0b4b0d7dff29da143d405255a1c3bc12
+Author: Peter Hutterer <peter@cs.unisa.edu.au>
+Date: Wed May 21 16:48:32 2008 +0930
+
+ Fail if the device cannot be grabbed during the probe.
+
+ If the grab fails, this is most likely a sign that the device has been grabbed
+ already (probably by a device specified in xorg.conf). So let's not add the
+ device to the server's input device list, since it won't generate events
+ anyway.
+
+ Exception: keyboards and kernel 2.4 are not affected.
+
commit d45f315845e19a720af25dc5f6c8a4c654c6e225
Author: Adam Jackson <ajax@redhat.com>
Date: Wed May 21 15:05:10 2008 -0400
diff --git a/debian/changelog b/debian/changelog
index f5e3a07..cc9fd60 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,7 @@ xserver-xorg-input-evdev (1:2.0.1-1) UNRELEASED; urgency=low
[ Julien Cristau ]
* Drop the XS- prefix from Vcs-* control fields.
- * New upstream release candidate.
+ * New upstream release.
* Drop evdev_no_flush_on_init.diff, obsolete.
* Run dpkg-shlibdeps with --warnings=6. Drivers reference symbols from
/usr/bin/Xorg and other modules, and that's not a bug, so we want
commit 884793eaadc6543537e6d1290dbd50d11b54f71a
Author: Julien Cristau <jcristau@debian.org>
Date: Thu Jul 10 18:24:18 2008 +0200
autoreconf
diff --git a/configure b/configure
index 531db2f..2e5c368 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for xf86-input-evdev 1.99.2.
+# Generated by GNU Autoconf 2.61 for xf86-input-evdev 2.0.1.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=xorg>.
#
@@ -728,8 +728,8 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='xf86-input-evdev'
PACKAGE_TARNAME='xf86-input-evdev'
-PACKAGE_VERSION='1.99.2'
-PACKAGE_STRING='xf86-input-evdev 1.99.2'
+PACKAGE_VERSION='2.0.1'
+PACKAGE_STRING='xf86-input-evdev 2.0.1'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=xorg'
ac_unique_file="Makefile.am"
@@ -1416,7 +1416,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures xf86-input-evdev 1.99.2 to adapt to many kinds of systems.
+\`configure' configures xf86-input-evdev 2.0.1 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1486,7 +1486,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of xf86-input-evdev 1.99.2:";;
+ short | recursive ) echo "Configuration of xf86-input-evdev 2.0.1:";;
esac
cat <<\_ACEOF
@@ -1598,7 +1598,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-xf86-input-evdev configure 1.99.2
+xf86-input-evdev configure 2.0.1
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1612,7 +1612,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by xf86-input-evdev $as_me 1.99.2, which was
+It was created by xf86-input-evdev $as_me 2.0.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2304,7 +2304,7 @@ fi
# Define the identity of the package.
PACKAGE='xf86-input-evdev'
- VERSION='1.99.2'
+ VERSION='2.0.1'
cat >>confdefs.h <<_ACEOF
@@ -21712,7 +21712,7 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by xf86-input-evdev $as_me 1.99.2, which was
+This file was extended by xf86-input-evdev $as_me 2.0.1, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -21765,7 +21765,7 @@ Report bugs to <bug-autoconf@gnu.org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-xf86-input-evdev config.status 1.99.2
+xf86-input-evdev config.status 2.0.1
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
diff --git a/src/Makefile.in b/src/Makefile.in
index cd96f8f..db7896c 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -71,7 +71,7 @@ am__installdirs = "$(DESTDIR)$(@DRIVER_NAME@_drv_ladir)"
@DRIVER_NAME@_drv_laLTLIBRARIES_INSTALL = $(INSTALL)
LTLIBRARIES = $(@DRIVER_NAME@_drv_la_LTLIBRARIES)
@DRIVER_NAME@_drv_la_LIBADD =
-am_@DRIVER_NAME@_drv_la_OBJECTS = @DRIVER_NAME@.lo
+am_@DRIVER_NAME@_drv_la_OBJECTS = @DRIVER_NAME@.lo emuMB.lo
@DRIVER_NAME@_drv_la_OBJECTS = $(am_@DRIVER_NAME@_drv_la_OBJECTS)
@DRIVER_NAME@_drv_la_LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
@@ -228,7 +228,10 @@ top_srcdir = @top_srcdir@
@DRIVER_NAME@_drv_la_LTLIBRARIES = @DRIVER_NAME@_drv.la
@DRIVER_NAME@_drv_la_LDFLAGS = -module -avoid-version
@DRIVER_NAME@_drv_ladir = @inputdir@
-@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c
+@DRIVER_NAME@_drv_la_SOURCES = @DRIVER_NAME@.c \
+ @DRIVER_NAME@.h \
+ emuMB.c
+
all: all-am
.SUFFIXES:
@@ -299,6 +302,7 @@ distclean-compile:
-rm -f *.tab.c
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/@DRIVER_NAME@.Plo@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/emuMB.Plo@am__quote@
.c.o:
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
commit 4c2fb5aa80a15b5a9a9b51b03c7dc30496a22561
Author: Brice Goglin <bgoglin@debian.org>
Date: Sat May 31 13:23:24 2008 +0200
Update xsfbs/quilt patching rules to be compatible with the
"3.0 (quilt)" source package.
Thanks to Raphael Hertzog.
See http://lists.debian.org/debian-x/2008/05/msg01250.html for details.
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index c11923f..b871b3b 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -21,10 +21,8 @@
# Pass $(DH_OPTIONS) into the environment for debhelper's benefit.
export DH_OPTIONS
-# force quilt to not use ~/.quiltrc
-QUILT = quilt --quiltrc /dev/null
-# force QUILT_PATCHES to the default in case it is exported in the environment
-QUILT_PATCHES = patches/
+# force quilt to not use ~/.quiltrc and to use debian/patches
+QUILT = QUILT_PATCHES=debian/patches quilt --quiltrc /dev/null
# Set up parameters for the upstream build environment.
@@ -121,19 +119,11 @@ $(STAMP_DIR)/stampdir:
# Set up the package build directory as quilt expects to find it.
.PHONY: prepare
stampdir_targets+=prepare
-prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/patches $(STAMP_DIR)/log
+prepare: $(STAMP_DIR)/genscripts $(STAMP_DIR)/prepare $(STAMP_DIR)/log
$(STAMP_DIR)/prepare: $(STAMP_DIR)/stampdir
- if [ ! -e $(STAMP_DIR)/patches ]; then \
- mkdir $(STAMP_DIR)/patches; \
- ln -s $(STAMP_DIR)/patches .pc; \
- echo 2 >$(STAMP_DIR)/patches/.version; \
- fi; \
if [ ! -e $(STAMP_DIR)/log ]; then \
mkdir $(STAMP_DIR)/log; \
fi; \
- if [ -e debian/patches ] && [ ! -e patches ]; then \
- ln -s debian/patches patches; \
- fi; \
>$@
# Apply all patches to the upstream source.
@@ -162,10 +152,10 @@ $(STAMP_DIR)/patch: $(STAMP_DIR)/prepare
# Revert all patches to the upstream source.
.PHONY: unpatch
-unpatch:
+unpatch: $(STAMP_DIR)/prepare
rm -f $(STAMP_DIR)/patch
@echo -n "Unapplying patches..."; \
- if [ -e $(STAMP_DIR)/patches/applied-patches ]; then \
+ if $(QUILT) applied >/dev/null 2>/dev/null; then \
if $(QUILT) pop -a -v >$(STAMP_DIR)/log/unpatch 2>&1; then \
cat $(STAMP_DIR)/log/unpatch; \
echo "successful."; \
@@ -192,7 +182,7 @@ cleanscripts:
.PHONY: xsfclean
xsfclean: cleanscripts unpatch
dh_testdir
- rm -rf .pc patches
+ rm -rf .pc
rm -rf $(STAMP_DIR) $(SOURCE_DIR)
rm -rf imports
dh_clean debian/shlibs.local \
commit dcf4204d5328834172df80951a18de014b0f74ef
Author: Julien Cristau <jcristau@debian.org>
Date: Fri May 30 12:26:18 2008 +0200
xsfbs.sh: use 'local' now that policy allows it
Policy 3.7.3 allows /bin/sh scripts to use 'local'.
diff --git a/debian/xsfbs/xsfbs.sh b/debian/xsfbs/xsfbs.sh
index 0c7607a..72efa95 100644
--- a/debian/xsfbs/xsfbs.sh
+++ b/debian/xsfbs/xsfbs.sh
@@ -238,19 +238,19 @@ analyze_path () {
# analyze_path /usr/X11R6/bin -> ls -dl /usr /usr/X11R6 /usr/X11R6/bin
# Thanks to Randolph Chung for this clever hack.
- #local f g
+ local f g
while [ -n "$1" ]; do
reject_whitespace "$1"
- _g=
+ g=
message "Analyzing $1:"
- for _f in $(echo "$1" | tr / \ ); do
- if [ -e /$_g$_f ]; then
- ls -dl /$_g$_f /$_g$_f.dpkg-* 2> /dev/null || true
- _g=$_g$_f/
+ for f in $(echo "$1" | tr / \ ); do
+ if [ -e /$g$f ]; then
+ ls -dl /$g$f /$g$f.dpkg-* 2> /dev/null || true
+ g=$g$f/
else
- message "/$_g$_f: nonexistent; directory contents of /$_g:"
- ls -l /$_g
+ message "/$g$f: nonexistent; directory contents of /$g:"
+ ls -l /$g
break
fi
done
@@ -259,27 +259,27 @@ analyze_path () {
}
find_culprits () {
- #local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
- # msg
+ local f p dpkg_info_dir possible_culprits smoking_guns bad_packages package \
+ msg
reject_whitespace "$1"
message "Searching for overlapping packages..."
- _dpkg_info_dir=/var/lib/dpkg/info
- if [ -d $_dpkg_info_dir ]; then
- if [ "$(echo $_dpkg_info_dir/*.list)" != "$_dpkg_info_dir/*.list" ]; then
- _possible_culprits=$(ls -1 $_dpkg_info_dir/*.list | egrep -v \
+ dpkg_info_dir=/var/lib/dpkg/info
+ if [ -d $dpkg_info_dir ]; then
+ if [ "$(echo $dpkg_info_dir/*.list)" != "$dpkg_info_dir/*.list" ]; then
+ possible_culprits=$(ls -1 $dpkg_info_dir/*.list | egrep -v \
"(xbase-clients|x11-common|xfs|xlibs)")
- if [ -n "$_possible_culprits" ]; then
- _smoking_guns=$(grep -l "$1" $_possible_culprits || true)
- if [ -n "$_smoking_guns" ]; then
- _bad_packages=$(printf "\\n")
- for f in $_smoking_guns; do
+ if [ -n "$possible_culprits" ]; then
+ smoking_guns=$(grep -l "$1" $possible_culprits || true)
+ if [ -n "$smoking_guns" ]; then
+ bad_packages=$(printf "\\n")
+ for f in $smoking_guns; do
# too bad you can't nest parameter expansion voodoo
p=${f%*.list} # strip off the trailing ".list"
- _package=${p##*/} # strip off the directories
- _bad_packages=$(printf "%s\n%s" "$_bad_packages" "$_package")
+ package=${p##*/} # strip off the directories
+ bad_packages=$(printf "%s\n%s" "$bad_packages" "$package")
done
- _msg=$(cat <<EOF
+ msg=$(cat <<EOF
The following packages appear to have file overlaps with the X.Org packages;
these packages are either very old, or in violation of Debian Policy. Try
upgrading each of these packages to the latest available version if possible:
@@ -291,17 +291,17 @@ Tracking System. You may want to refer the package maintainer to section 12.8
of the Debian Policy manual.
EOF
)
- message "$_msg"
- message "The overlapping packages are: $_bad_packages"
+ message "$msg"
+ message "The overlapping packages are: $bad_packages"
else
message "no overlaps found."
fi
fi
else
- message "cannot search; no matches for $_dpkg_info_dir/*.list."
+ message "cannot search; no matches for $dpkg_info_dir/*.list."
fi
else
- message "cannot search; $_dpkg_info_dir does not exist."
+ message "cannot search; $dpkg_info_dir does not exist."
fi
}
@@ -323,7 +323,7 @@ check_symlink () {
#
# Primarily used by check_symlinks_and_warn() and check_symlinks_and_bomb().
- #local symlink
+ local symlink
# validate arguments
if [ $# -ne 1 ]; then
@@ -332,9 +332,9 @@ check_symlink () {
exit $SHELL_LIB_USAGE_ERROR
fi
- _symlink="$1"
+ symlink="$1"
- if [ "$(maplink "$_symlink")" = "$(readlink "$_symlink")" ]; then
+ if [ "$(maplink "$symlink")" = "$(readlink "$symlink")" ]; then
return 0
else
return 1
@@ -349,7 +349,7 @@ check_symlinks_and_warn () {
# Call this function from a preinst script in the event $1 is "upgrade" or
# "install".
- #local errmsg symlink
+ local errmsg symlink
# validate arguments
if [ $# -lt 1 ]; then
@@ -359,25 +359,25 @@ check_symlinks_and_warn () {
fi
while [ -n "$1" ]; do
- _symlink="$1"
- if [ -L "$_symlink" ]; then
- if ! check_symlink "$_symlink"; then
- observe "$_symlink symbolic link points to wrong location" \
- "$(readlink "$_symlink"); removing"
- rm "$_symlink"
+ symlink="$1"
+ if [ -L "$symlink" ]; then
+ if ! check_symlink "$symlink"; then
+ observe "$symlink symbolic link points to wrong location" \
+ "$(readlink "$symlink"); removing"
+ rm "$symlink"
fi
- elif [ -e "$_symlink" ]; then
- _errmsg="$_symlink exists and is not a symbolic link; this package cannot"
- _errmsg="$_errmsg be installed until this"
- if [ -f "$_symlink" ]; then
- _errmsg="$_errmsg file"
- elif [ -d "$_symlink" ]; then
- _errmsg="$_errmsg directory"
+ elif [ -e "$symlink" ]; then
+ errmsg="$symlink exists and is not a symbolic link; this package cannot"
+ errmsg="$errmsg be installed until this"
+ if [ -f "$symlink" ]; then
+ errmsg="$errmsg file"
+ elif [ -d "$symlink" ]; then
+ errmsg="$errmsg directory"
else
- _errmsg="$_errmsg thing"
+ errmsg="$errmsg thing"
fi
- _errmsg="$_errmsg is removed"
- die "$_errmsg"
+ errmsg="$errmsg is removed"
+ die "$errmsg"
fi
shift
done
@@ -390,7 +390,7 @@ check_symlinks_and_bomb () {
#
# Call this function from a postinst script.
- #local problem symlink
+ local problem symlink
# validate arguments
if [ $# -lt 1 ]; then
@@ -400,24 +400,24 @@ check_symlinks_and_bomb () {
fi
while [ -n "$1" ]; do
- _problem=
- _symlink="$1"
- if [ -L "$_symlink" ]; then
- if ! check_symlink "$_symlink"; then
- _problem=yes
- warn "$_symlink symbolic link points to wrong location" \
- "$(readlink "$_symlink")"
+ problem=
+ symlink="$1"
+ if [ -L "$symlink" ]; then
+ if ! check_symlink "$symlink"; then
+ problem=yes
+ warn "$symlink symbolic link points to wrong location" \
+ "$(readlink "$symlink")"
fi
- elif [ -e "$_symlink" ]; then
- _problem=yes
- warn "$_symlink is not a symbolic link"
+ elif [ -e "$symlink" ]; then
+ problem=yes
+ warn "$symlink is not a symbolic link"
else
- _problem=yes
- warn "$_symlink symbolic link does not exist"
+ problem=yes
+ warn "$symlink symbolic link does not exist"
fi
- if [ -n "$_problem" ]; then
- analyze_path "$_symlink" "$(readlink "$_symlink")"
- find_culprits "$_symlink"
+ if [ -n "$problem" ]; then
+ analyze_path "$symlink" "$(readlink "$symlink")"
+ find_culprits "$symlink"
die "bad symbolic links on system"
fi
shift
@@ -427,9 +427,9 @@ check_symlinks_and_bomb () {
font_update () {
# run $UPDATECMDS in $FONTDIRS
- #local dir cmd shortcmd x_font_dir_prefix
+ local dir cmd shortcmd x_font_dir_prefix
- _x_font_dir_prefix="/usr/share/fonts/X11"
+ x_font_dir_prefix="/usr/share/fonts/X11"
if [ -z "$UPDATECMDS" ]; then
usage_error "font_update() called but \$UPDATECMDS not set"
@@ -441,32 +441,32 @@ font_update () {
reject_unlikely_path_chars "$UPDATECMDS"
reject_unlikely_path_chars "$FONTDIRS"
- for _dir in $FONTDIRS; do
- if [ -d "$_x_font_dir_prefix/$_dir" ]; then
- for _cmd in $UPDATECMDS; do
- if which "$_cmd" > /dev/null 2>&1; then
- _shortcmd=${_cmd##*/}
- observe "running $_shortcmd in $_dir font directory"
- _cmd_opts=
- if [ "$_shortcmd" = "update-fonts-alias" ]; then
- _cmd_opts=--x11r7-layout
+ for dir in $FONTDIRS; do
+ if [ -d "$x_font_dir_prefix/$dir" ]; then
+ for cmd in $UPDATECMDS; do
+ if which "$cmd" > /dev/null 2>&1; then
+ shortcmd=${cmd##*/}
+ observe "running $shortcmd in $dir font directory"
+ cmd_opts=
+ if [ "$shortcmd" = "update-fonts-alias" ]; then
+ cmd_opts=--x11r7-layout
fi
- if [ "$_shortcmd" = "update-fonts-dir" ]; then
- _cmd_opts=--x11r7-layout
+ if [ "$shortcmd" = "update-fonts-dir" ]; then
+ cmd_opts=--x11r7-layout
fi
- if [ "$_shortcmd" = "update-fonts-scale" ]; then
- _cmd_opts=--x11r7-layout
+ if [ "$shortcmd" = "update-fonts-scale" ]; then
+ cmd_opts=--x11r7-layout
fi
- $_cmd $_cmd_opts $_dir || warn "$_cmd $_cmd_opts $_dir" \
+ $cmd $cmd_opts $dir || warn "$cmd $cmd_opts $dir" \
"failed; font directory data may not" \
"be up to date"
else
- warn "$_cmd not found; not updating corresponding $_dir font" \
+ warn "$cmd not found; not updating corresponding $dir font" \
"directory data"
fi
done
else
- warn "$_dir is not a directory; not updating font directory data"
+ warn "$dir is not a directory; not updating font directory data"
fi
done
}
@@ -485,7 +485,7 @@ remove_conffile_prepare () {
# version (or installed over a version removed-but-not-purged) prior to the
# one in which the conffile was obsoleted.
- #local conffile current_checksum
+ local conffile current_checksum
# validate arguments
if [ $# -lt 2 ]; then
@@ -494,19 +494,19 @@ remove_conffile_prepare () {
exit $SHELL_LIB_USAGE_ERROR
fi
- _conffile="$1"
+ conffile="$1"
shift
- # does the _conffile even exist?
- if [ -e "$_conffile" ]; then
+ # does the conffile even exist?
+ if [ -e "$conffile" ]; then
# calculate its checksum
- _current_checksum=$(md5sum < "$_conffile" | sed 's/[[:space:]].*//')
+ current_checksum=$(md5sum < "$conffile" | sed 's/[[:space:]].*//')
# compare it to each supplied checksum
while [ -n "$1" ]; do
- if [ "$_current_checksum" = "$1" ]; then
+ if [ "$current_checksum" = "$1" ]; then
# we found a match; move the confffile and stop looking
- observe "preparing obsolete conffile $_conffile for removal"
- mv "$_conffile" "$_conffile.$THIS_PACKAGE-tmp"
+ observe "preparing obsolete conffile $conffile for removal"
+ mv "$conffile" "$conffile.$THIS_PACKAGE-tmp"
break
fi
shift
@@ -553,7 +553,7 @@ remove_conffile_commit () {
# Call this function from a postinst script after having used
# remove_conffile_prepare() in the preinst.
- #local conffile
+ local conffile
# validate arguments
if [ $# -ne 1 ]; then
@@ -562,12 +562,12 @@ remove_conffile_commit () {
exit $SHELL_LIB_USAGE_ERROR
fi
- _conffile="$1"
+ conffile="$1"
# if the temporary file created by remove_conffile_prepare() exists, remove it
- if [ -e "$_conffile.$THIS_PACKAGE-tmp" ]; then
- observe "committing removal of obsolete conffile $_conffile"
- rm "$_conffile.$THIS_PACKAGE-tmp"
+ if [ -e "$conffile.$THIS_PACKAGE-tmp" ]; then
+ observe "committing removal of obsolete conffile $conffile"
+ rm "$conffile.$THIS_PACKAGE-tmp"
fi
}
@@ -580,7 +580,7 @@ remove_conffile_rollback () {
# or "abort-install" is after having used remove_conffile_prepare() in the
# preinst.
- #local conffile
+ local conffile
# validate arguments
if [ $# -ne 1 ]; then
@@ -589,13 +589,13 @@ remove_conffile_rollback () {
exit $SHELL_LIB_USAGE_ERROR
fi
- _conffile="$1"
+ conffile="$1"
# if the temporary file created by remove_conffile_prepare() exists, move it
# back
- if [ -e "$_conffile.$THIS_PACKAGE-tmp" ]; then
Reply to: