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

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



Author: dnusinow
Date: 2006-09-27 19:49:11 -0400 (Wed, 27 Sep 2006)
New Revision: 3526

Added:
   trunk/driver/xserver-xorg-input-keyboard/debian/patches/
   trunk/driver/xserver-xorg-input-keyboard/debian/patches/01_64bit_pointer.diff
Modified:
   trunk/driver/xserver-xorg-input-keyboard/debian/changelog
   trunk/driver/xserver-xorg-input-keyboard/debian/control
   trunk/driver/xserver-xorg-input-keyboard/debian/rules
Log:
* Add watch file
* Add 01_64bit_pointer.diff to include to correct pointer size on 64 bit 
  arches. Thanks Dann Frazier. (closes: #389514)

Modified: trunk/driver/xserver-xorg-input-keyboard/debian/changelog
===================================================================
--- trunk/driver/xserver-xorg-input-keyboard/debian/changelog	2006-09-27 22:18:16 UTC (rev 3525)
+++ trunk/driver/xserver-xorg-input-keyboard/debian/changelog	2006-09-27 23:49:11 UTC (rev 3526)
@@ -1,3 +1,14 @@
+xserver-xorg-input-keyboard (1:1.1.0-3) unstable; urgency=low
+
+  [ Thierry Reding ]
+  * Add watch file
+
+  [ David Nusinow ]
+  * Add 01_64bit_pointer.diff to include to correct pointer size on 64 bit 
+    arches. Thanks Dann Frazier. (closes: #389514)
+
+ -- David Nusinow <dnusinow@debian.org>  Wed, 27 Sep 2006 19:48:36 -0400
+
 xserver-xorg-input-keyboard (1:1.1.0-2) unstable; urgency=low
 
   * Build-Depends: xserver-xorg-dev (>= 2:1.1.1-4). Closes: #387146.

Modified: trunk/driver/xserver-xorg-input-keyboard/debian/control
===================================================================
--- trunk/driver/xserver-xorg-input-keyboard/debian/control	2006-09-27 22:18:16 UTC (rev 3525)
+++ trunk/driver/xserver-xorg-input-keyboard/debian/control	2006-09-27 23:49:11 UTC (rev 3526)
@@ -3,7 +3,7 @@
 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>, Drew Parsons <dparsons@debian.org>
-Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.1.1-4), x11proto-kb-dev, x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev
+Build-Depends: debhelper (>= 5), pkg-config, xserver-xorg-dev (>= 2:1.1.1-4), x11proto-kb-dev, x11proto-input-dev, x11proto-core-dev, x11proto-randr-dev, quilt
 Standards-Version: 3.7.2
 
 Package: xserver-xorg-input-kbd

Added: trunk/driver/xserver-xorg-input-keyboard/debian/patches/01_64bit_pointer.diff
===================================================================
--- trunk/driver/xserver-xorg-input-keyboard/debian/patches/01_64bit_pointer.diff	                        (rev 0)
+++ trunk/driver/xserver-xorg-input-keyboard/debian/patches/01_64bit_pointer.diff	2006-09-27 23:49:11 UTC (rev 3526)
@@ -0,0 +1,12 @@
+Index: xserver-xorg-input-keyboard/src/kbd.c
+===================================================================
+--- xserver-xorg-input-keyboard.orig/src/kbd.c	2006-09-27 19:47:36.000000000 -0400
++++ xserver-xorg-input-keyboard/src/kbd.c	2006-09-27 19:48:07.000000000 -0400
+@@ -19,6 +19,7 @@
+ #endif
+ 
+ #include <stdio.h>
++#include <string.h>
+   
+ #define NEED_EVENTS
+ #include <X11/X.h>

Modified: trunk/driver/xserver-xorg-input-keyboard/debian/rules
===================================================================
--- trunk/driver/xserver-xorg-input-keyboard/debian/rules	2006-09-27 22:18:16 UTC (rev 3525)
+++ trunk/driver/xserver-xorg-input-keyboard/debian/rules	2006-09-27 23:49:11 UTC (rev 3526)
@@ -31,7 +31,7 @@
 # kbd_drv.a isn't phenomenally useful; kbd_drv.so more so
 confflags += --disable-static
 
-build: build-stamp
+build: patch build-stamp
 build-stamp:
 	dh_testdir
 
@@ -44,7 +44,7 @@
 
 	touch build-stamp
 
-clean:
+clean: xsfclean
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp



Reply to: