Bug#691699: libxkbcommon: [PATCH] upgrade to 0.2.0
Source: libxkbcommon
Severity: wishlist
Tags: patch
Hello,
libxkbcommon recently released version 0.2.0. Since this library is
going to be a dependency of the next version of i3lock, I’d love to see
the packaging being updated to 0.2.0.
In fact, I’ve cloned the git repository, imported the new upstream
version and modified the packaging to produce a multi-arch, nearly
lintian-clean (except for the shlib-calls-exit, spelling-error-in-binary
and no-symbols-control-file wishlist items) package.
Attached you can find the patches, hopefully you can merge them (I have
never collaborated this way on git packaging). In case you cannot merge
them for some reason, let me know and I can upload the repository or
re-generate the patches in a different way if necessary.
Thanks!
PS: I have skipped attaching the first patch of the series which is just
the result of "git-import-orig --pristine-tar --upstream-branch
upstream-experimental --debian-branch debian-experimental
../libxkbcommon-0.2.0.tar.bz2 -u 0.2.0" — since the old email has not
showed up as a bugreport yet, I suppose it was too big for the BTS.
>From 8817ecc3d99a11031f099d14470376bb67da7ed1 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <stapelberg@debian.org>
Date: Sun, 28 Oct 2012 16:47:58 +0100
Subject: [PATCH 2/8] update changelog for new upstream release
---
debian/changelog | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index dff4e6c..aaa27ce 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+libxkbcommon (0.2.0-1) experimental; urgency=low
+
+ [ Michael Stapelberg ]
+ * New upstream version
+
+ -- Cyril Brulebois <kibi@debian.org> Sun, 28 Oct 2012 17:26:49 +0100
+
libxkbcommon (0.1.0~2-1) UNRELEASED; urgency=low
* Merge master up to f491285a5f.
--
1.7.10.4
>From 33624005b6737bd4ca7332ce921649db48256ec3 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <stapelberg@debian.org>
Date: Sun, 28 Oct 2012 16:59:13 +0100
Subject: [PATCH 3/8] install xkbcommon-compat.h
---
debian/libxkbcommon-dev.install | 1 +
1 file changed, 1 insertion(+)
diff --git a/debian/libxkbcommon-dev.install b/debian/libxkbcommon-dev.install
index 55a9b31..a93830f 100644
--- a/debian/libxkbcommon-dev.install
+++ b/debian/libxkbcommon-dev.install
@@ -2,6 +2,7 @@
usr/include/xkbcommon/xkbcommon.h
usr/include/xkbcommon/xkbcommon-keysyms.h
usr/include/xkbcommon/xkbcommon-names.h
+usr/include/xkbcommon/xkbcommon-compat.h
usr/lib/libxkbcommon.a
usr/lib/libxkbcommon.so
usr/lib/pkgconfig/xkbcommon.pc
--
1.7.10.4
>From 883eb65df6cb24a697bea07834d935a49912b298 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <stapelberg@debian.org>
Date: Sun, 28 Oct 2012 17:03:45 +0100
Subject: [PATCH 4/8] add homepage field, update description
---
debian/control | 28 ++++++++++------------------
1 file changed, 10 insertions(+), 18 deletions(-)
diff --git a/debian/control b/debian/control
index cc1e9bf..52afda2 100644
--- a/debian/control
+++ b/debian/control
@@ -17,6 +17,7 @@ Build-Depends:
Standards-Version: 3.9.3
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxkbcommon
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxkbcommon.git
+Homepage: http://www.xkbcommon.org/
Package: libxkbcommon0
Section: libs
@@ -26,17 +27,10 @@ Depends:
${shlibs:Depends},
${misc:Depends},
Description: library interface to the XKB compiler - shared library
- libxkbcommon aims at replacing xkbcomp, the XKB compiler.
- .
- This is an experimental library, and its ABI/API is likely to change
- on a regular fashion before it stabilizes, depending on XServer's and
- Wayland's needs in particular.
- .
- More information about X.Org can be found at:
- <URL:http://www.X.org>
- .
- This module can be found at
- git://anongit.freedesktop.org/git/xorg/lib/libxkbcommon
+ xkbcommon is a library to handle keyboard descriptions, including loading them
+ from disk, parsing them and handling their state. It's mainly meant for client
+ toolkits, window systems, and other system applications; currently that
+ includes Wayland, kmscon, GTK+, Clutter, and more.
Package: libxkbcommon-dev
Section: libdevel
@@ -47,11 +41,9 @@ Depends:
${shlibs:Depends},
${misc:Depends},
Description: library interface to the XKB compiler - development files
- libxkbcommon aims at replacing xkbcomp, the XKB compiler.
- .
- This is an experimental library, and its ABI/API is likely to change
- on a regular fashion before it stabilizes, depending on XServer's and
- Wayland's needs in particular.
+ xkbcommon is a library to handle keyboard descriptions, including loading them
+ from disk, parsing them and handling their state. It's mainly meant for client
+ toolkits, window systems, and other system applications; currently that
+ includes Wayland, kmscon, GTK+, Clutter, and more.
.
- This package contains the development headers for the library found in
- libxkbcommon0. Non-developers likely have little use for this package.
+ This package contains the development header files for xkbcommon.
--
1.7.10.4
>From 94aac1fc0d1381d372ceedcabb20d69ba2994dc4 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <stapelberg@debian.org>
Date: Sun, 28 Oct 2012 17:03:55 +0100
Subject: [PATCH 5/8] update source version to 3.0 (quilt)
---
debian/source/format | 1 +
1 file changed, 1 insertion(+)
create mode 100644 debian/source/format
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
1.7.10.4
>From 615fc7c351f66d485498d497015f7dfc8078c099 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <stapelberg@debian.org>
Date: Sun, 28 Oct 2012 17:06:22 +0100
Subject: [PATCH 6/8] kill old tarball target
---
debian/rules | 15 ---------------
1 file changed, 15 deletions(-)
diff --git a/debian/rules b/debian/rules
index 0fd829c..d608bc7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -17,18 +17,3 @@ override_dh_makeshlibs:
%:
dh $@ --with autoreconf
-
-
-# Until upstream releases something:
-tarball: source=libxkbcommon
-tarball: version=$(shell dpkg-parsechangelog|grep ^Version:|sed 's/Version: \(.*\)~.*$$/\1/')
-tarball: new_rev=$(shell dpkg-parsechangelog|grep ^Version:|sed 's/Version: .*~\(.*\)-.*$$/\1/')
-tarball:
- @if [ -z "$(REV)" ]; then \
- echo "E: Set REV to the revision you want packaged"; \
- exit 1; \
- fi
- # Actual work:
- git archive --format=tar --prefix=$(source)-$(version)~$(new_rev)/ \
- $(REV) | gzip -9 > ../$(source)_$(version)~$(new_rev).orig.tar.gz
- @echo "I: If you're happy with the results, please use pristine-tar commit."
--
1.7.10.4
>From 71db08e9a7d7308c561a0d04e6361fca0a31b3c4 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <stapelberg@debian.org>
Date: Sun, 28 Oct 2012 17:07:42 +0100
Subject: [PATCH 7/8] use debhelper >= 9
---
debian/compat | 2 +-
debian/control | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
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 52afda2..99689de 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,
xutils-dev (>= 7.5+4),
--
1.7.10.4
>From 0d27252618d8bdef3345cbca33b431824e8df869 Mon Sep 17 00:00:00 2001
From: Michael Stapelberg <stapelberg@debian.org>
Date: Sun, 28 Oct 2012 17:18:33 +0100
Subject: [PATCH 8/8] convert to multi-arch
---
debian/control | 2 ++
debian/libxkbcommon-dev.install | 6 +++---
debian/libxkbcommon0.install | 4 ++--
3 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/debian/control b/debian/control
index 99689de..66da8a4 100644
--- a/debian/control
+++ b/debian/control
@@ -22,6 +22,8 @@ Homepage: http://www.xkbcommon.org/
Package: libxkbcommon0
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends:
xkb-data,
${shlibs:Depends},
diff --git a/debian/libxkbcommon-dev.install b/debian/libxkbcommon-dev.install
index a93830f..92a61fa 100644
--- a/debian/libxkbcommon-dev.install
+++ b/debian/libxkbcommon-dev.install
@@ -3,6 +3,6 @@ usr/include/xkbcommon/xkbcommon.h
usr/include/xkbcommon/xkbcommon-keysyms.h
usr/include/xkbcommon/xkbcommon-names.h
usr/include/xkbcommon/xkbcommon-compat.h
-usr/lib/libxkbcommon.a
-usr/lib/libxkbcommon.so
-usr/lib/pkgconfig/xkbcommon.pc
+usr/lib/*/libxkbcommon.a
+usr/lib/*/libxkbcommon.so
+usr/lib/*/pkgconfig/xkbcommon.pc
diff --git a/debian/libxkbcommon0.install b/debian/libxkbcommon0.install
index f69a4ea..2d61406 100644
--- a/debian/libxkbcommon0.install
+++ b/debian/libxkbcommon0.install
@@ -1,3 +1,3 @@
# Use no wildcards to ensure we spot any update:
-usr/lib/libxkbcommon.so.0
-usr/lib/libxkbcommon.so.0.0.0
+usr/lib/*/libxkbcommon.so.0
+usr/lib/*/libxkbcommon.so.0.0.0
--
1.7.10.4
Reply to: