libxtst: Changes to 'debian-unstable'
debian/changelog | 7 +++++++
debian/control | 5 +++++
debian/libxtst-dev.install | 6 +++---
debian/libxtst6-udeb.install | 2 +-
debian/libxtst6.install | 2 +-
debian/rules | 6 ++++--
6 files changed, 21 insertions(+), 7 deletions(-)
New commits:
commit 18e5cab539fc7e5d6eb1adc82e351f3ae47365bb
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Aug 26 22:18:30 2011 +0200
Don't use dh_testroot in clean.
diff --git a/debian/changelog b/debian/changelog
index 892c4d7..122ea9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
libxtst (2:1.2.0-4) UNRELEASED; urgency=low
* Build for multiarch (closes: #639348). Thanks, Peter Samuelson!
+ * Don't use dh_testroot in clean.
-- Julien Cristau <jcristau@debian.org> Fri, 26 Aug 2011 22:10:51 +0200
diff --git a/debian/rules b/debian/rules
index 46a2c90..6fbe494 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,7 +51,6 @@ build-stamp: $(STAMP_DIR)/patch
clean: xsfclean
dh_testdir
- dh_testroot
rm -f build-stamp
rm -f config.cache config.log config.status
commit 19731f744b8193462428f7ee87129ff29ee83134
Author: Julien Cristau <jcristau@debian.org>
Date: Fri Aug 26 22:11:25 2011 +0200
Add changelog entry
diff --git a/debian/changelog b/debian/changelog
index e2dd5ee..892c4d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libxtst (2:1.2.0-4) UNRELEASED; urgency=low
+
+ * Build for multiarch (closes: #639348). Thanks, Peter Samuelson!
+
+ -- Julien Cristau <jcristau@debian.org> Fri, 26 Aug 2011 22:10:51 +0200
+
libxtst (2:1.2.0-3) unstable; urgency=low
* Upload to unstable.
commit e11e5db09e9112ea2d7d712ec78f4eb95d885a4c
Author: Peter Samuelson <peter@p12n.org>
Date: Fri Aug 26 22:10:40 2011 +0200
Build for multiarch
diff --git a/debian/control b/debian/control
index 9ebf2e0..c27cb6b 100644
--- a/debian/control
+++ b/debian/control
@@ -4,6 +4,7 @@ Priority: optional
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Cyril Brulebois <kibi@debian.org>
Build-Depends:
+ dpkg-dev (>= 1.16),
debhelper (>= 5.0.0),
libx11-dev (>= 2:0.99.3),
libxext-dev (>= 2:1.0.99.4),
@@ -26,6 +27,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-xorg/lib/libxtst.git
Package: libxtst6
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: multiarch-support
Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common
Description: X11 Testing -- Record extension library
libXtst provides an X Window System client interface to the Record
@@ -50,6 +53,7 @@ Description: X11 Testing -- Record extension library
Package: libxtst6-dbg
Architecture: any
+Multi-Arch: same
Section: debug
Priority: extra
Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxtst6 (= ${binary:Version})
@@ -72,6 +76,7 @@ Description: X11 Record extension library (debug package)
Package: libxtst-dev
Section: libdevel
Architecture: any
+Multi-Arch: same
Depends:
${shlibs:Depends},
${misc:Depends},
diff --git a/debian/libxtst-dev.install b/debian/libxtst-dev.install
index 735a9f6..5d98180 100644
--- a/debian/libxtst-dev.install
+++ b/debian/libxtst-dev.install
@@ -1,6 +1,6 @@
-usr/lib/libXtst.a
-usr/lib/libXtst.so
-usr/lib/pkgconfig/xtst.pc
+usr/lib/*/libXtst.a
+usr/lib/*/libXtst.so
+usr/lib/*/pkgconfig/xtst.pc
usr/share/man/man3
usr/include/X11/extensions/
usr/share/doc/libxtst-dev/
diff --git a/debian/libxtst6-udeb.install b/debian/libxtst6-udeb.install
index 9f81ac0..74e296b 100644
--- a/debian/libxtst6-udeb.install
+++ b/debian/libxtst6-udeb.install
@@ -1 +1 @@
-usr/lib/libXtst.so.6*
+usr/lib/*/libXtst.so.6* usr/lib
diff --git a/debian/libxtst6.install b/debian/libxtst6.install
index 9f81ac0..1e2faa0 100644
--- a/debian/libxtst6.install
+++ b/debian/libxtst6.install
@@ -1 +1 @@
-usr/lib/libXtst.so.6*
+usr/lib/*/libXtst.so.6*
diff --git a/debian/rules b/debian/rules
index 8f6467c..46a2c90 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,7 @@ endif
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
confflags += --build=$(DEB_HOST_GNU_TYPE)
else
@@ -41,6 +42,7 @@ build-stamp: $(STAMP_DIR)/patch
cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--docdir=\$${prefix}/share/doc/libxtst-dev \
--with-xmlto --without-fop \
CFLAGS="$(CFLAGS)"
@@ -81,7 +83,8 @@ binary-arch: build install
dh_installchangelogs ChangeLog
dh_installman
dh_link
- dh_strip --dbg-package=$(PACKAGE)-dbg
+ dh_strip -p$(PACKAGE) --dbg-package=$(PACKAGE)-dbg
+ dh_strip -N$(PACKAGE)
dh_compress
dh_fixperms
dh_makeshlibs --add-udeb=$(PACKAGE)-udeb
Reply to: