xserver-xorg-input-aiptek: Changes to 'debian-unstable'
debian/changelog | 10 ++++++++++
debian/compat | 2 +-
debian/control | 8 ++++----
debian/rules | 3 +++
src/xf86Aiptek.c | 18 ++++++++++++------
5 files changed, 30 insertions(+), 11 deletions(-)
New commits:
commit cd6e566cf79762ed040faf2223d5a2b705bee285
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Mon Mar 14 18:18:18 2016 +0100
Bump Standards-Version to 3.9.7 (no changes).
diff --git a/debian/changelog b/debian/changelog
index e989beb..c520b69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ xserver-xorg-input-aiptek (1:1.4.1-2) UNRELEASED; urgency=medium
1.18)) from upstream (Closes: #813359). Thanks, Tobias Schlemmer!
* Bump debhelper compat level to 9.
* Update Vcs fields to use https.
+ * Bump Standards-Version to 3.9.7 (no changes).
-- Andreas Boll <andreas.boll.dev@gmail.com> Mon, 14 Mar 2016 17:57:28 +0100
diff --git a/debian/control b/debian/control
index 2bc7098..5962ee7 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends:
x11proto-core-dev,
x11proto-input-dev,
xutils-dev (>= 1:7.5+4)
-Standards-Version: 3.9.2
+Standards-Version: 3.9.7
Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-input-aiptek.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/driver/xserver-xorg-input-aiptek.git
commit 45c68c52d8ef7e9e32498a43a0a4ad7cbb056dea
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Mon Mar 14 18:14:15 2016 +0100
Update Vcs fields to use https.
diff --git a/debian/changelog b/debian/changelog
index 516e353..e989beb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ xserver-xorg-input-aiptek (1:1.4.1-2) UNRELEASED; urgency=medium
* Cherry-pick f075def (Fix build against current input ABI (xserver
1.18)) from upstream (Closes: #813359). Thanks, Tobias Schlemmer!
* Bump debhelper compat level to 9.
+ * Update Vcs fields to use https.
-- Andreas Boll <andreas.boll.dev@gmail.com> Mon, 14 Mar 2016 17:57:28 +0100
diff --git a/debian/control b/debian/control
index d4fb8a5..2bc7098 100644
--- a/debian/control
+++ b/debian/control
@@ -13,8 +13,8 @@ Build-Depends:
x11proto-input-dev,
xutils-dev (>= 1:7.5+4)
Standards-Version: 3.9.2
-Vcs-Git: git://git.debian.org/git/pkg-xorg/driver/xserver-xorg-input-aiptek
-Vcs-Browser: http://git.debian.org/?p=pkg-xorg/driver/xserver-xorg-input-aiptek.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-xorg/driver/xserver-xorg-input-aiptek.git
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-xorg/driver/xserver-xorg-input-aiptek.git
Package: xserver-xorg-input-aiptek
Architecture: any
commit 372c661b57510e5dbca1b6b2835f4cd244e2b065
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Mon Mar 14 18:09:07 2016 +0100
Bump debhelper compat level to 9.
diff --git a/debian/changelog b/debian/changelog
index 6e5178c..516e353 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ xserver-xorg-input-aiptek (1:1.4.1-2) UNRELEASED; urgency=medium
* Cherry-pick f075def (Fix build against current input ABI (xserver
1.18)) from upstream (Closes: #813359). Thanks, Tobias Schlemmer!
+ * Bump debhelper compat level to 9.
-- Andreas Boll <andreas.boll.dev@gmail.com> Mon, 14 Mar 2016 17:57:28 +0100
diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index b946f8c..d4fb8a5 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
- debhelper (>= 8),
+ debhelper (>= 9),
dh-autoreconf,
pkg-config,
quilt,
diff --git a/debian/rules b/debian/rules
index 3d192dc..6df982d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,8 @@
#!/usr/bin/make -f
+override_dh_auto_configure:
+ dh_auto_configure -- --libdir=\$${exec_prefix}/lib
+
# Install in debian/tmp to retain control through dh_install:
override_dh_auto_install:
dh_auto_install --destdir=debian/tmp
commit 3157a40af3a30d86aff1c297e20fecee218cd624
Author: Andreas Boll <andreas.boll.dev@gmail.com>
Date: Mon Mar 14 18:04:30 2016 +0100
Bump changelog.
diff --git a/debian/changelog b/debian/changelog
index a7cbb3c..6e5178c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-input-aiptek (1:1.4.1-2) UNRELEASED; urgency=medium
+
+ * Cherry-pick f075def (Fix build against current input ABI (xserver
+ 1.18)) from upstream (Closes: #813359). Thanks, Tobias Schlemmer!
+
+ -- Andreas Boll <andreas.boll.dev@gmail.com> Mon, 14 Mar 2016 17:57:28 +0100
+
xserver-xorg-input-aiptek (1:1.4.1-1) unstable; urgency=low
[ Timo Aaltonen ]
commit 922d1da89b84f944cc62a8acfb198c2f2151fd57
Author: Tobias Schlemmer <keinstein@users.sf.net>
Date: Thu Mar 10 19:13:41 2016 +0100
Fix build against current input ABI (xserver 1.18)
xf86PostKeyEvent dropped the valuator arguments it wasn't using.
Debian bug#813359 <https://bugs.debian.org/813359>
Signed-off-by: Julien Cristau <jcristau@debian.org>
(cherry picked from commit f075deff61d3092d6754e48a3b63d40647888a35)
diff --git a/src/xf86Aiptek.c b/src/xf86Aiptek.c
index a68814f..8d16ffd 100644
--- a/src/xf86Aiptek.c
+++ b/src/xf86Aiptek.c
@@ -293,13 +293,19 @@ xf86AiptekSendEvents(InputInfoPtr pInfo, int r_z)
*/
/* Keyboard 'make' (press) event */
- xf86PostKeyEvent(pInfo->dev, i+8, TRUE,
- bAbsolute, 0, 5,
- x, y, common->currentValues.button, xTilt, yTilt);
+ xf86PostKeyEvent(pInfo->dev, i+8, TRUE
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 22
+ , bAbsolute, 0, 5,
+ x, y, common->currentValues.button, xTilt, yTilt
+#endif
+ );
/* Keyboard 'break' (depress) event */
- xf86PostKeyEvent(pInfo->dev, i+8, FALSE,
- bAbsolute, 0, 5,
- x, y, common->currentValues.button, xTilt, yTilt);
+ xf86PostKeyEvent(pInfo->dev, i+8, FALSE
+#if GET_ABI_MAJOR(ABI_XINPUT_VERSION) < 22
+ , bAbsolute, 0, 5,
+ x, y, common->currentValues.button, xTilt, yTilt
+#endif
+ );
break;
}
}
Reply to: