[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

X Strike Force X.Org X11 SVN commit: r3227 - in trunk/driver/xserver-xorg-input-evdev/debian: . patches



Author: dparsons
Date: 2006-09-17 10:58:03 -0400 (Sun, 17 Sep 2006)
New Revision: 3227

Added:
   trunk/driver/xserver-xorg-input-evdev/debian/patches/
   trunk/driver/xserver-xorg-input-evdev/debian/patches/1-add-inotify-architectures.patch
   trunk/driver/xserver-xorg-input-evdev/debian/patches/series
Modified:
   trunk/driver/xserver-xorg-input-evdev/debian/changelog
   trunk/driver/xserver-xorg-input-evdev/debian/rules
Log:
  * Upstream patch 1-add-inotify-architectures.patch enables building
    for hppa and mips (m68k remains, see #387922).
  * Install upstream ChangeLog. Closes: #370300.
	


Modified: trunk/driver/xserver-xorg-input-evdev/debian/changelog
===================================================================
--- trunk/driver/xserver-xorg-input-evdev/debian/changelog	2006-09-17 14:05:37 UTC (rev 3226)
+++ trunk/driver/xserver-xorg-input-evdev/debian/changelog	2006-09-17 14:58:03 UTC (rev 3227)
@@ -1,3 +1,11 @@
+xserver-xorg-input-evdev (1:1.1.2-2) UNRELEASED; urgency=low
+
+  * Upstream patch 1-add-inotify-architectures.patch enables building
+    for hppa and mips.
+  * Install upstream ChangeLog. Closes: #370300.
+
+ -- 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

Added: 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	                        (rev 0)
+++ trunk/driver/xserver-xorg-input-evdev/debian/patches/1-add-inotify-architectures.patch	2006-09-17 14:58:03 UTC (rev 3227)
@@ -0,0 +1,29 @@
+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 @@
+ # define __NR_inotify_init	290
+ # define __NR_inotify_add_watch	291
+ # define __NR_inotify_rm_watch	292
++#elif defined (__hppa__) || defined (__hppa64__)
++# define __NR_inotify_init	269
++# define __NR_inotify_add_watch	270
++# define __NR_inotify_rm_watch	271
++#elif defined (__mips__)
++# if _MIPS_SIM == _MIPS_SIM_ABI32
++#  define __NR_inotify_init		4284
++#  define __NR_inotify_add_watch	4285
++#  define __NR_inotify_rm_watch		4286
++# elif _MIPS_SIM == _MIPS_SIM_NABI32
++#  define __NR_inotify_init		6247
++#  define __NR_inotify_add_watch	6248
++#  define __NR_inotify_rm_watch		6249
++# elif _MIPS_SIM == _MIPS_SIM_ABI64
++#  define __NR_inotify_init		5243
++#  define __NR_inotify_add_watch	5244
++#  define __NR_inotify_rm_watch		5245
++# endif
+ #else
+ # error "Unsupported architecture!"
+ #endif

Added: trunk/driver/xserver-xorg-input-evdev/debian/patches/series
===================================================================
--- trunk/driver/xserver-xorg-input-evdev/debian/patches/series	                        (rev 0)
+++ trunk/driver/xserver-xorg-input-evdev/debian/patches/series	2006-09-17 14:58:03 UTC (rev 3227)
@@ -0,0 +1 @@
+1-add-inotify-architectures.patch

Modified: trunk/driver/xserver-xorg-input-evdev/debian/rules
===================================================================
--- trunk/driver/xserver-xorg-input-evdev/debian/rules	2006-09-17 14:05:37 UTC (rev 3226)
+++ trunk/driver/xserver-xorg-input-evdev/debian/rules	2006-09-17 14:58:03 UTC (rev 3227)
@@ -71,7 +71,7 @@
 	dh_testroot
 
 	dh_installdocs
-	dh_installchangelogs
+	dh_installchangelogs ChangeLog
 	dh_install --sourcedir=debian/tmp --list-missing
 	dh_link
 	dh_strip



Reply to: