libxkbcommon: Changes to 'debian-unstable'
debian/changelog | 11 +++
debian/control | 1
debian/patches/0001-Remove-linux-input.h-include-from-test-x11comp.c.patch | 33 ++++++++++
debian/patches/series | 1
debian/rules | 2
5 files changed, 47 insertions(+), 1 deletion(-)
New commits:
commit 54244a821ba338450d6743d5bd2b7aeaf813c63f
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Tue Sep 16 23:07:18 2014 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 4fd36ba..8c6074d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-libxkbcommon (0.4.3-2) UNRELEASED; urgency=medium
+libxkbcommon (0.4.3-2) unstable; urgency=high
* d/p/0001-Remove-linux-input.h-include-from-test-x11comp.c.patch:
+ Patch from Pino Toscano to fix the build on !linux. Closes: #760624.
* debian/control,
debian/rules:
+ Enable quilt as the patch system.
+ * High urgency for RC bug fix.
- -- Emilio Pozuelo Monfort <pochu@debian.org> Tue, 16 Sep 2014 23:04:35 +0200
+ -- Emilio Pozuelo Monfort <pochu@debian.org> Tue, 16 Sep 2014 23:07:00 +0200
libxkbcommon (0.4.3-1) unstable; urgency=medium
commit 5b2abf9ce7773521c7c00fb22532aa6125f674e4
Author: Emilio Pozuelo Monfort <pochu@debian.org>
Date: Tue Sep 16 23:06:43 2014 +0200
Fix build on !linux
diff --git a/debian/changelog b/debian/changelog
index 21fadd7..4fd36ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+libxkbcommon (0.4.3-2) UNRELEASED; urgency=medium
+
+ * d/p/0001-Remove-linux-input.h-include-from-test-x11comp.c.patch:
+ + Patch from Pino Toscano to fix the build on !linux. Closes: #760624.
+ * debian/control,
+ debian/rules:
+ + Enable quilt as the patch system.
+
+ -- Emilio Pozuelo Monfort <pochu@debian.org> Tue, 16 Sep 2014 23:04:35 +0200
+
libxkbcommon (0.4.3-1) unstable; urgency=medium
[ Andreas Henriksson ]
diff --git a/debian/control b/debian/control
index 1d00ae3..6626a4d 100644
--- a/debian/control
+++ b/debian/control
@@ -6,6 +6,7 @@ Uploaders: Cyril Brulebois <kibi@debian.org>, Michael Stapelberg <stapelberg@deb
Build-Depends:
debhelper (>= 9),
dh-autoreconf,
+ quilt,
pkg-config,
xutils-dev (>= 7.5+4),
bison,
diff --git a/debian/patches/0001-Remove-linux-input.h-include-from-test-x11comp.c.patch b/debian/patches/0001-Remove-linux-input.h-include-from-test-x11comp.c.patch
new file mode 100644
index 0000000..c99a925
--- /dev/null
+++ b/debian/patches/0001-Remove-linux-input.h-include-from-test-x11comp.c.patch
@@ -0,0 +1,33 @@
+From e95fb475ebd203b030f17ddf9c55e487d3c929a0 Mon Sep 17 00:00:00 2001
+From: Pino Toscano <toscano.pino@tiscali.it>
+Date: Sat, 6 Sep 2014 11:05:44 +0300
+Subject: [PATCH] Remove <linux/input.h> include from test/x11comp.c
+
+libxkbcommon 0.4.3 introduces a new test, x11comp, which does not build
+on non-Linux OSes because of the unconditional <linux/input.h> include.
+
+This seems not needed even on Linux, so attached there is a simple patch
+to remove it.
+
+https://bugs.freedesktop.org/show_bug.cgi?id=83551
+
+Signed-off-by: Ran Benita <ran234@gmail.com>
+---
+ test/x11comp.c | 1 -
+ 1 file changed, 1 deletion(-)
+
+diff --git a/test/x11comp.c b/test/x11comp.c
+index c30ed63..bc87a72 100644
+--- a/test/x11comp.c
++++ b/test/x11comp.c
+@@ -28,7 +28,6 @@
+ #include <signal.h>
+ #include <sys/types.h>
+ #include <sys/wait.h>
+-#include <linux/input.h>
+
+ #include "test.h"
+ #include "xkbcommon/xkbcommon-x11.h"
+--
+2.1.0
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8e9aec8
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Remove-linux-input.h-include-from-test-x11comp.c.patch
diff --git a/debian/rules b/debian/rules
index eb91fca..0e66ae2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ override_dh_makeshlibs:
dh_makeshlibs -- -c4
%:
- dh $@ --with autoreconf
+ dh $@ --with autoreconf,quilt
# For maintainer use only, generate a tarball
Reply to: