xserver-xorg-input-evtouch: Changes to 'debian-unstable'
debian/changelog | 9 +++++++++
debian/patches/03_fix_compile_warns.patch | 27 ---------------------------
debian/patches/04_include_xf86_ansic_h.patch | 23 +++++++++++++++++++++++
debian/patches/series | 3 ++-
debian/rules | 12 +-----------
5 files changed, 35 insertions(+), 39 deletions(-)
New commits:
commit 568e337aa66dc57abab98cfe2dd382dfd2804e99
Author: Mattia Dongili <malattia@linux.it>
Date: Tue Sep 11 23:04:05 2007 +0900
Fix a compile warning by moving xf86=ansic.h header inclusion
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/patches/04_include_xf86_ansic_h.patch b/debian/patches/04_include_xf86_ansic_h.patch
new file mode 100644
index 0000000..009ff7e
--- /dev/null
+++ b/debian/patches/04_include_xf86_ansic_h.patch
@@ -0,0 +1,23 @@
+Index: xserver-xorg-input-evtouch/libtouch.c
+===================================================================
+--- xserver-xorg-input-evtouch.orig/libtouch.c 2007-09-11 23:00:20.762131559 +0900
++++ xserver-xorg-input-evtouch/libtouch.c 2007-09-11 23:00:43.263413833 +0900
+@@ -34,7 +34,6 @@
+ #ifndef NEED_XF86_TYPES
+ #define NEED_XF86_TYPES
+ #endif
+-#include <xf86_ansic.h>
+ #include <xf86_OSproc.h>
+ #include <xf86Xinput.h>
+ #include <exevents.h>
+Index: xserver-xorg-input-evtouch/libtouch.h
+===================================================================
+--- xserver-xorg-input-evtouch.orig/libtouch.h 2007-09-11 23:00:20.762131559 +0900
++++ xserver-xorg-input-evtouch/libtouch.h 2007-09-11 23:00:51.263869754 +0900
+@@ -1,5 +1,6 @@
+ #ifndef _libtouch_H_
+ #define _libtouch_H_
++#include <xf86_ansic.h>
+ #include <os.h>
+
+ #define TOUCHED 0x01
diff --git a/debian/patches/series b/debian/patches/series
index 2531ad2..1b48c59 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
#02-buttonless-device.patch
#03_fix_compile_warns.patch
+04_include_xf86_ansic_h.patch
commit f70e88a6eae55c5dbd2df26fab37b83e844037c5
Author: Mattia Dongili <malattia@linux.it>
Date: Tue Sep 11 22:55:21 2007 +0900
Removed 03_fix_compile_warns.patch applied upstream
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/changelog b/debian/changelog
index 5bb4363..ac01702 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xf86-input-evtouch (0.8.7-1) unstable; urgency=low
* New upstream release:
- Added "fix" for AMD64-crashes on touch (Closes: #431925)
* updated xsfbs
+ * removed 03_fix_compile_warns.patch applied upstream
-- Mattia Dongili <malattia@debian.org> Tue, 11 Sep 2007 22:42:32 +0900
diff --git a/debian/patches/03_fix_compile_warns.patch b/debian/patches/03_fix_compile_warns.patch
deleted file mode 100644
index 08f5699..0000000
--- a/debian/patches/03_fix_compile_warns.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Index: xserver-xorg-input-evtouch/evtouch.c
-===================================================================
---- xserver-xorg-input-evtouch.orig/evtouch.c 2007-06-13 22:38:27.256330304 +0900
-+++ xserver-xorg-input-evtouch/evtouch.c 2007-06-13 22:48:38.791179689 +0900
-@@ -79,6 +79,9 @@
- #include "compiler.h"
-
- #include "xisb.h"
-+#include <xorg/randrstr.h>
-+#include <xorg/exevents.h>
-+#include <xorg/xf86_ansic.h>
-
- /*****************************************************************************
- * Local Headers
-Index: xserver-xorg-input-evtouch/libtouch.h
-===================================================================
---- xserver-xorg-input-evtouch.orig/libtouch.h 2007-06-13 22:33:17.738691899 +0900
-+++ xserver-xorg-input-evtouch/libtouch.h 2007-06-13 22:48:38.791179689 +0900
-@@ -61,6 +61,8 @@ void libtouchSetMoveLimit(LibTouchRecPtr
- void libtouchInit(LibTouchRecPtr libtouch, LocalDevicePtr local);
-
- void libtouchSetPos(LibTouchRecPtr libtouch, int x, int y);
-+void libtouchSetYPos(LibTouchRecPtr libtouch, int y);
-+void libtouchSetXPos(LibTouchRecPtr libtouch, int x);
- void libtouchTriggerSM(LibTouchRecPtr libtouch, LibTouchState_t touch);
-
- #endif
diff --git a/debian/patches/series b/debian/patches/series
index f2279f2..2531ad2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
#02-buttonless-device.patch
-03_fix_compile_warns.patch
+#03_fix_compile_warns.patch
commit d0d1c2d26e8df1b6345ab04e545da97f1319d129
Author: Mattia Dongili <malattia@linux.it>
Date: Tue Sep 11 22:47:31 2007 +0900
Add changelog entry for 0.8.7-1
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/changelog b/debian/changelog
index ff9a2ca..5bb4363 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xf86-input-evtouch (0.8.7-1) unstable; urgency=low
+
+ * New upstream release:
+ - Added "fix" for AMD64-crashes on touch (Closes: #431925)
+ * updated xsfbs
+
+ -- Mattia Dongili <malattia@debian.org> Tue, 11 Sep 2007 22:42:32 +0900
+
xf86-input-evtouch (0.8.6-1) unstable; urgency=low
* New upstream release:
commit 0c4ca7dc23d9b555426abe4f55e261c39699bc1e
Author: Mattia Dongili <malattia@linux.it>
Date: Tue Sep 11 22:33:36 2007 +0900
Removed pacth/unpatch target already provided by xsfbs
Signed-off-by: Mattia Dongili <malattia@linux.it>
diff --git a/debian/rules b/debian/rules
index a0c101b..ed5016a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,22 +16,12 @@ else
endif
configure: configure-stamp
-configure-stamp: patch-stamp
+configure-stamp: patch
dh_testdir
# Add here commands to configure the package.
./configure --prefix=/usr --enable-evcalibrate
touch configure-stamp
-patch: patch-stamp
-patch-stamp:
- QUILT_PATCHES=debian/patches quilt push -a || test $$? = 2
- touch patch-stamp
-
-unpatch:
- -QUILT_PATCHES=debian/patches quilt pop -a
- rm -rf .pc patch-stamp
-
-
build: build-stamp
build-stamp: configure-stamp
Reply to: