summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJulien Viard de Galbert <julien@vdg.blogsite.org>2010-05-30 17:35:48 +0200
committerJulien Viard de Galbert <julien@vdg.blogsite.org>2010-05-30 17:35:48 +0200
commit1e12bb6fc199fb3627a36c5cc55a0a1abab2b981 (patch)
tree1b00e3e05590f2ce2af5eefe5016061e882937bd
parentfd3ddced82d38a41751201307579a77840969e9d (diff)
dedicating package revisionHEADxorg7.5+xs1.6
fix compilation against xserver 1.6
-rw-r--r--debian/changelog6
-rw-r--r--debian/control2
-rw-r--r--debian/patches/04_server-1.7-ftbfs.diff4
-rwxr-xr-xdebian/xsfbs/xsfbs.mk4
4 files changed, 11 insertions, 5 deletions
diff --git a/debian/changelog b/debian/changelog
index 7f93d33..d24953b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+xf86-input-evtouch (0.8.8-4+xorg7.5+xs1.6) unstable; urgency=low
+
+ * dedicating package name, rebuild against xsserver 1.6
+
+ -- Julien Viard de Galbert <julien@silicone.homelinux.org> Sun, 30 May 2010 16:59:17 +0200
+
xf86-input-evtouch (0.8.8-4) unstable; urgency=medium
* Line-wrap the Build-Depends control field.
diff --git a/debian/control b/debian/control
index 391c1aa..3fb3802 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Mattia Dongili <malattia@debian.org>
Build-Depends:
debhelper (>= 5),
pkg-config,
- xserver-xorg-dev (>= 2:1.7.6.901),
+ xserver-xorg-dev (>= 2:1.5.99.901),
x11proto-randr-dev,
libxrender-dev,
libx11-dev,
diff --git a/debian/patches/04_server-1.7-ftbfs.diff b/debian/patches/04_server-1.7-ftbfs.diff
index 726297c..016b662 100644
--- a/debian/patches/04_server-1.7-ftbfs.diff
+++ b/debian/patches/04_server-1.7-ftbfs.diff
@@ -246,7 +246,7 @@ Index: xserver-xorg-input-evtouch/evtouch.c
+ return labels;
+#endif
+}
-+
++#ifdef HAVE_LABELS
+static char* abs_labels[] = {
+ AXIS_LABEL_PROP_ABS_X,
+ AXIS_LABEL_PROP_ABS_Y,
@@ -259,7 +259,7 @@ Index: xserver-xorg-input-evtouch/evtouch.c
+ AXIS_LABEL_PROP_REL_Z,
+ AXIS_LABEL_PROP_REL_WHEEL
+};
-+
++#endif
+static void
+EvtouchInitAxesLabels(EVTouchPrivatePtr pEVTouch, int natoms, Atom *atoms)
+{
diff --git a/debian/xsfbs/xsfbs.mk b/debian/xsfbs/xsfbs.mk
index 3c59c20..cfeb302 100755
--- a/debian/xsfbs/xsfbs.mk
+++ b/debian/xsfbs/xsfbs.mk
@@ -271,8 +271,8 @@ endif
.PHONY: serverabi
serverabi: install
ifeq ($(VIDEODEP),)
- @echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed'
- @exit 1
+ #@echo 'error: xserver-xorg-dev >= 1.7.6.901 needs to be installed'
+ #@exit 1
else
echo "xviddriver:Depends=$(VIDEODEP)" >> debian/$(PACKAGE).substvars
echo "xinpdriver:Depends=$(INPUTDEP)" >> debian/$(PACKAGE).substvars