X Strike Force X.Org X11 SVN commit: r3464 - in trunk/driver/xserver-xorg-input-evdev/debian: . patches
Author: dparsons
Date: 2006-09-23 11:55:20 -0400 (Sat, 23 Sep 2006)
New Revision: 3464
Modified:
trunk/driver/xserver-xorg-input-evdev/debian/changelog
trunk/driver/xserver-xorg-input-evdev/debian/control
trunk/driver/xserver-xorg-input-evdev/debian/patches/1-add-inotify-architectures.patch
trunk/driver/xserver-xorg-input-evdev/debian/rules
Log:
* Upstream patch 1-add-inotify-architectures.patch enables building
for hppa, mips (from git upstream) and m68k (thanks Geert Uytterhoeven).
Closes: #387922, #388639.
* Exclude evdev_drv.la from dh_install.
Modified: trunk/driver/xserver-xorg-input-evdev/debian/changelog
===================================================================
--- trunk/driver/xserver-xorg-input-evdev/debian/changelog 2006-09-23 15:28:46 UTC (rev 3463)
+++ trunk/driver/xserver-xorg-input-evdev/debian/changelog 2006-09-23 15:55:20 UTC (rev 3464)
@@ -1,16 +1,18 @@
-xserver-xorg-input-evdev (1:1.1.2-2) UNRELEASED; urgency=low
+xserver-xorg-input-evdev (1:1.1.2-2) unstable; urgency=low
+ [ Andres Salomon ]
+ * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
+ idempotency fix.
+
[ Drew Parsons ]
* Upstream patch 1-add-inotify-architectures.patch enables building
- for hppa and mips.
+ for hppa, mips (from git upstream) and m68k (thanks Geert Uytterhoeven).
+ Closes: #387922, #388639.
* Install upstream ChangeLog. Closes: #370300.
+ * Exclude evdev_drv.la from dh_install.
- [ Andres Salomon ]
- * Test for obj-$(DEB_BUILD_GNU_TYPE) before creating it during build;
- idempotency fix.
+ -- Drew Parsons <dparsons@debian.org> Sun, 24 Sep 2006 01:51:55 +1000
- -- Drew Parsons <dparsons@debian.org> Mon, 18 Sep 2006 00:54:45 +1000
-
xserver-xorg-input-evdev (1:1.1.2-1) unstable; urgency=low
* New upstream release
Modified: trunk/driver/xserver-xorg-input-evdev/debian/control
===================================================================
--- trunk/driver/xserver-xorg-input-evdev/debian/control 2006-09-23 15:28:46 UTC (rev 3463)
+++ trunk/driver/xserver-xorg-input-evdev/debian/control 2006-09-23 15:55:20 UTC (rev 3464)
@@ -2,8 +2,8 @@
Section: x11
Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
-Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>
-Build-Depends: debhelper (>= 5.0.0), pkg-config, xserver-xorg-dev, linux-kernel-headers, x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev, x11proto-kb-dev
+Uploaders: David Nusinow <dnusinow@debian.org>, Branden Robinson <branden@debian.org>, Fabio M. Di Nitto <fabbione@fabbione.net>, Drew Parsons <dparsons@debian.org>
+Build-Depends: debhelper (>= 5.0.0), pkg-config, quilt, xserver-xorg-dev, linux-kernel-headers, x11proto-core-dev, x11proto-randr-dev, x11proto-input-dev, x11proto-kb-dev
Standards-Version: 3.7.2
Package: xserver-xorg-input-evdev
Modified: trunk/driver/xserver-xorg-input-evdev/debian/patches/1-add-inotify-architectures.patch
===================================================================
--- trunk/driver/xserver-xorg-input-evdev/debian/patches/1-add-inotify-architectures.patch 2006-09-23 15:28:46 UTC (rev 3463)
+++ trunk/driver/xserver-xorg-input-evdev/debian/patches/1-add-inotify-architectures.patch 2006-09-23 15:55:20 UTC (rev 3464)
@@ -1,8 +1,8 @@
Index: xserver-xorg-input-evdev/src/inotify-syscalls.h
===================================================================
---- xserver-xorg-input-evdev.orig/src/inotify-syscalls.h 2006-09-18 00:44:07.000000000 +1000
-+++ xserver-xorg-input-evdev/src/inotify-syscalls.h 2006-09-18 00:47:29.000000000 +1000
-@@ -39,6 +39,24 @@
+--- xserver-xorg-input-evdev.orig/src/inotify-syscalls.h 2006-09-18 00:20:43.000000000 +1000
++++ xserver-xorg-input-evdev/src/inotify-syscalls.h 2006-09-24 01:33:12.000000000 +1000
+@@ -39,6 +39,28 @@
# define __NR_inotify_init 290
# define __NR_inotify_add_watch 291
# define __NR_inotify_rm_watch 292
@@ -24,6 +24,10 @@
+# define __NR_inotify_add_watch 5244
+# define __NR_inotify_rm_watch 5245
+# endif
++#elif defined (__mc68000__)
++# define __NR_inotify_init 284
++# define __NR_inotify_add_watch 285
++# define __NR_inotify_rm_watch 286
#else
# error "Unsupported architecture!"
#endif
Modified: trunk/driver/xserver-xorg-input-evdev/debian/rules
===================================================================
--- trunk/driver/xserver-xorg-input-evdev/debian/rules 2006-09-23 15:28:46 UTC (rev 3463)
+++ trunk/driver/xserver-xorg-input-evdev/debian/rules 2006-09-23 15:55:20 UTC (rev 3464)
@@ -72,7 +72,7 @@
dh_installdocs
dh_installchangelogs ChangeLog
- dh_install --sourcedir=debian/tmp --list-missing
+ dh_install --sourcedir=debian/tmp --list-missing --exclude=evdev_drv.la
dh_link
dh_strip
dh_compress
Reply to: