libxkbcommon: Changes to 'debian-unstable'
debian/changelog | 5 ++++-
debian/control | 1 +
debian/copyright | 4 +---
debian/rules | 24 +++++++++++-------------
4 files changed, 17 insertions(+), 17 deletions(-)
New commits:
commit b751b429470a7b7cd4515167ec120fa4e5d728c9
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Fri Feb 15 18:07:48 2013 +0200
rules: Don't run tests on !linux.
diff --git a/debian/changelog b/debian/changelog
index aafce91..8b55d74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,6 +15,7 @@ libxkbcommon (0.2.0-1) UNRELEASED; urgency=low
* copyright: Remove the note about no tarballs, add upstream url.
* control: Added homepage.
* rules: Replace old tarball target with generic gentarball target.
+ * rules: Don't run tests on !linux.
-- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 16 Aug 2012 21:37:51 +0300
diff --git a/debian/rules b/debian/rules
index a4fd666..7fc8ca3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
#!/usr/bin/make -f
+DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
# We need to point to xkb-data's files. The default should be OK but
# let's be cautious:
override_dh_auto_configure:
@@ -10,6 +12,10 @@ override_dh_install:
find debian/tmp -name '*.la' -delete
dh_install --fail-missing
+ifneq ($(DEB_HOST_ARCH_OS), linux)
+override_dh_auto_test:
+endif
+
%:
dh $@ --with autoreconf
commit ac473fc1db3fbf91f573642cc50d1460a9e5543a
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Fri Feb 15 17:57:28 2013 +0200
rules: Replace old tarball target with generic gentarball target.
diff --git a/debian/changelog b/debian/changelog
index 09454d6..aafce91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ libxkbcommon (0.2.0-1) UNRELEASED; urgency=low
* Add libxkbcommon0.symbols.
* copyright: Remove the note about no tarballs, add upstream url.
* control: Added homepage.
+ * rules: Replace old tarball target with generic gentarball target.
-- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 16 Aug 2012 21:37:51 +0300
diff --git a/debian/rules b/debian/rules
index 5d70418..a4fd666 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,16 +14,8 @@ override_dh_install:
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."
+# For maintainer use only, generate a tarball
+gentarball: SOURCE=$(shell dpkg-parsechangelog|awk '/^Source:/ {print $$2}')
+gentarball: UV=$(shell dpkg-parsechangelog|awk '/^Version:/ {print $$2}'|sed 's/-.*$$//')
+gentarball:
+ git archive --format=tar upstream-unstable --prefix=$(SOURCE)-$(UV)/ | gzip -9 > ../$(SOURCE)_$(UV).orig.tar.gz
commit 66853ff8a33db2ce7bb5a2968ab69da00a6f29f2
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Fri Feb 15 17:42:38 2013 +0200
control: Added homepage.
diff --git a/debian/changelog b/debian/changelog
index ebddf00..09454d6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ libxkbcommon (0.2.0-1) UNRELEASED; urgency=low
* Use source format 1.0.
* Add libxkbcommon0.symbols.
* copyright: Remove the note about no tarballs, add upstream url.
+ * control: Added homepage.
-- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 16 Aug 2012 21:37:51 +0300
diff --git a/debian/control b/debian/control
index 6a5a9e7..ef6c2ff 100644
--- a/debian/control
+++ b/debian/control
@@ -15,6 +15,7 @@ Build-Depends:
x11proto-kb-dev (>= 1.0.5),
xkb-data,
Standards-Version: 3.9.4
+Homepage: http://www.xkbcommon.org/
Vcs-Git: git://git.debian.org/git/pkg-xorg/lib/libxkbcommon
Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxkbcommon.git
commit 36cad0aa2b176ea356da4937d4642672d6889cfb
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Tue Feb 12 21:28:15 2013 +0200
changelog cleanup
diff --git a/debian/changelog b/debian/changelog
index 0977f72..ebddf00 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,7 +4,6 @@ libxkbcommon (0.2.0-1) UNRELEASED; urgency=low
* libxkbcommon-dev.install: Add new headers, rename existing.
* control: Update Standards-Version, no changes.
* watch: Updated.
- * libxkbcommon-dev.install: Add xkbcommon-compat.h.
* control: Remove the comments about the experimental status, this is
an actual release.
* control: Use debhelper 9 and convert to multiarch.
commit f9d387d872b6abcbe60716ead52614af660331db
Author: Timo Aaltonen <tjaalton@ubuntu.com>
Date: Tue Feb 12 21:27:50 2013 +0200
copyright: Remove the note about no tarballs, add upstream url.
diff --git a/debian/changelog b/debian/changelog
index 3aed697..0977f72 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ libxkbcommon (0.2.0-1) UNRELEASED; urgency=low
release now.
* Use source format 1.0.
* Add libxkbcommon0.symbols.
+ * copyright: Remove the note about no tarballs, add upstream url.
-- Timo Aaltonen <tjaalton@ubuntu.com> Thu, 16 Aug 2012 21:37:51 +0300
diff --git a/debian/copyright b/debian/copyright
index f21c982..efbe2ee 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,4 @@
-There's currently no released tarball for this library. It is built
-from the git upstream repository located at:
- http://cgit.freedesktop.org/xorg/lib/libxkbcommon/
+Source: http://xkbcommon.org/
Copyright 1985, 1987, 1988, 1990, 1998 The Open Group
Copyright 2008, 2009 Dan Nicholson
Reply to: