--- Begin Message ---
Package: libxtst
Version: 2:1.2.0-3
Severity: minor
Tags: patch
Someone on IRC asked how to use libxtst6 as multi-arch.
I had a quick look and found it wasn't very hard to convert it.
I do not know quite why he needed this - something about "Xilinx ISE",
whatever that is. But in the spirit of not wasting work, here is my
patch.
The extra dh_strip line in debian/rules are needed so that
--dbg-package does _not_ pick up the udeb, because the udeb
copy of the library is not under the multiarch path.
I'm not sure whether it is safe or reasonable to specify
Multi-Arch: same for the -dev package.
--
Peter Samuelson | org-tld!p12n!peter | http://p12n.org/
diff -u libxtst-1.2.0/debian/libxtst-dev.install libxtst-1.2.0/debian/libxtst-dev.install
--- libxtst-1.2.0/debian/libxtst-dev.install
+++ libxtst-1.2.0/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 -u libxtst-1.2.0/debian/control libxtst-1.2.0/debian/control
--- libxtst-1.2.0/debian/control
+++ libxtst-1.2.0/debian/control
@@ -4,6 +4,7 @@
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 @@
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 @@
Package: libxtst6-dbg
Architecture: any
+Multi-Arch: same
Section: debug
Priority: extra
Depends: ${shlibs:Depends}, ${misc:Depends}, x11-common, libxtst6 (= ${binary:Version})
diff -u libxtst-1.2.0/debian/libxtst6-udeb.install libxtst-1.2.0/debian/libxtst6-udeb.install
--- libxtst-1.2.0/debian/libxtst6-udeb.install
+++ libxtst-1.2.0/debian/libxtst6-udeb.install
@@ -1 +1 @@
-usr/lib/libXtst.so.6*
+usr/lib/*/libXtst.so.6* usr/lib
diff -u libxtst-1.2.0/debian/rules libxtst-1.2.0/debian/rules
--- libxtst-1.2.0/debian/rules
+++ libxtst-1.2.0/debian/rules
@@ -26,6 +26,7 @@
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 @@
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 @@
dh_installchangelogs ChangeLog
dh_installman
dh_link
- dh_strip --dbg-package=$(PACKAGE)-dbg
+ dh_strip -p$(PACKAGE)-udeb
+ dh_strip -N$(PACKAGE)-udeb --dbg-package=$(PACKAGE)-dbg
dh_compress
dh_fixperms
dh_makeshlibs --add-udeb=$(PACKAGE)-udeb
diff -u libxtst-1.2.0/debian/libxtst6.install libxtst-1.2.0/debian/libxtst6.install
--- libxtst-1.2.0/debian/libxtst6.install
+++ libxtst-1.2.0/debian/libxtst6.install
@@ -1 +1 @@
-usr/lib/libXtst.so.6*
+usr/lib/*/libXtst.so.6*
--- End Message ---
--- Begin Message ---
Source: libxtst
Source-Version: 2:1.2.0-4
We believe that the bug you reported is fixed in the latest version of
libxtst, which is due to be installed in the Debian FTP archive:
libxtst-dev_1.2.0-4_amd64.deb
to main/libx/libxtst/libxtst-dev_1.2.0-4_amd64.deb
libxtst6-dbg_1.2.0-4_amd64.deb
to main/libx/libxtst/libxtst6-dbg_1.2.0-4_amd64.deb
libxtst6-udeb_1.2.0-4_amd64.udeb
to main/libx/libxtst/libxtst6-udeb_1.2.0-4_amd64.udeb
libxtst6_1.2.0-4_amd64.deb
to main/libx/libxtst/libxtst6_1.2.0-4_amd64.deb
libxtst_1.2.0-4.diff.gz
to main/libx/libxtst/libxtst_1.2.0-4.diff.gz
libxtst_1.2.0-4.dsc
to main/libx/libxtst/libxtst_1.2.0-4.dsc
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to 639348@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Steve Langasek <vorlon@debian.org> (supplier of updated libxtst package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmaster@debian.org)
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Format: 1.8
Date: Fri, 21 Oct 2011 20:17:23 -0700
Source: libxtst
Binary: libxtst6 libxtst6-udeb libxtst6-dbg libxtst-dev
Architecture: source amd64
Version: 2:1.2.0-4
Distribution: unstable
Urgency: low
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Changed-By: Steve Langasek <vorlon@debian.org>
Description:
libxtst-dev - X11 Record extension library (development headers)
libxtst6 - X11 Testing -- Record extension library
libxtst6-dbg - X11 Record extension library (debug package)
libxtst6-udeb - X11 Testing -- Record extension library (udeb)
Closes: 639348
Changes:
libxtst (2:1.2.0-4) unstable; urgency=low
.
[ Julien Cristau ]
* Build for multiarch (closes: #639348). Thanks, Peter Samuelson!
* Don't use dh_testroot in clean.
.
[ Steve Langasek ]
* Don't mark libxtst-dev Multi-Arch: same, because its documentation isn't
identical across architectures.
Checksums-Sha1:
253ea939c1bd619d92b11e6013edc7b1abd609c0 2240 libxtst_1.2.0-4.dsc
449f696493c5ecb762edab400d5e2a3d1dd69b0d 16242 libxtst_1.2.0-4.diff.gz
8281d5d77622b137a0b3bcdec7bee6c3dcecce7b 24072 libxtst6_1.2.0-4_amd64.deb
5fe99c446722d33828db75afaf46a507af2c9707 10320 libxtst6-udeb_1.2.0-4_amd64.udeb
b447edc55163bd0510d55e3f579bed1b804552c3 52976 libxtst6-dbg_1.2.0-4_amd64.deb
c49bcc04e99e66bf176d6d53f6a06ef5ad63bee2 74418 libxtst-dev_1.2.0-4_amd64.deb
Checksums-Sha256:
4dd4ef95e1ce089a58fe0f76c4959c62a7f0757fc6b908c3d8cdcc79e4b4f0dd 2240 libxtst_1.2.0-4.dsc
ab6e6ccdc87ff5c62006dfbaf9c94c3a0b74f1306c1347f64b8421293e8bb60f 16242 libxtst_1.2.0-4.diff.gz
40d3dbeffdc8a850fcd7951fd0565ceeaafa05abf76b2953c9e815d87483c66c 24072 libxtst6_1.2.0-4_amd64.deb
9c3fa3d60c3e20ad06bbe90f7220337e236436f80b396ccc94c5b843cbcb4e96 10320 libxtst6-udeb_1.2.0-4_amd64.udeb
591c5d07f6e8b2e8c3e80feb71ca76e4d99c2a963df4d680228f8a527217677e 52976 libxtst6-dbg_1.2.0-4_amd64.deb
ccf44bd3c9c7d35b4df2a7d5ade3cc35af471cdce1d147460d08058b98fb9e53 74418 libxtst-dev_1.2.0-4_amd64.deb
Files:
a75d54dc453e6167c83f764c25168073 2240 x11 optional libxtst_1.2.0-4.dsc
95b1ac7fcefa7fb2626f9a1eb82ac50a 16242 x11 optional libxtst_1.2.0-4.diff.gz
28731db56577babdedb7e5a84cc5b627 24072 libs optional libxtst6_1.2.0-4_amd64.deb
776dc3d49100fa0f7032f1f96b10fcb6 10320 debian-installer optional libxtst6-udeb_1.2.0-4_amd64.udeb
4f0dabc81e78264b783bd587eb288176 52976 debug extra libxtst6-dbg_1.2.0-4_amd64.deb
44b613e6bb67223f9ce15fe725d066e7 74418 libdevel optional libxtst-dev_1.2.0-4_amd64.deb
Package-Type: udeb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
iQIVAwUBTqI2e1aNMPMhshM9AQh/qA//UrItbFNBGOrHLt6j+oaqWu6su/E3L/kR
iRYbIzxB1gBH1aaE8ckcO1ho+cu5rr02hUPsTiLBfKlkYM9aHYqhNVoLhAzgR33B
tCJzAQAs230B4+0bAPiegjZIU66LlkI+TgsVxy07Hyf0peoqutY5UcQPXa1KnOzd
Qx2sRdIpEpZS8fFjwUfb92XGs0U6c5vlETyFn1qHz3gBxGfBIb+PIIbId8g8283V
D9c0yfym7dlktB47CRl6nVlqK/nkjTDgcBYTyScFqewjQjSbwb1ruggnDtORp/Qr
wiVtMtX97BX3A02VJIGnPv2WS5O2y4lSAVGeoBT8IVso3ddKqQKZ3riwap4be0Aq
C3m38xX0NJIxbN7olrfUZdfmMKMQtHGpDNIGZ4UVXJA1wYTa8A/AnpS5ZjxTDtsX
fsQW3OBUDbMpHh/TQFtrtSFtI96w+9jy7ViqmbfV7jNJVyYownobNLFvXry3z+cx
cgw257Zk6puto2rwVsK8OgVSsBMr67qPRkETur0Et2Eq4RnUarGUUcHS3hLzwIjg
k5QJDUv6TbGjEiNfxrL4Lqxy/bDS6YmrxYnjG9Rhx0IYt0qZIU50BfUnqb/IBZxk
EKHqNEP9Dmm0f0IDrYmlWAlqcXs3Ci9F17yq3qTbAt7KeerouvDb2f08oih2n2O3
vQ+DTKT5zxk=
=SyF1
-----END PGP SIGNATURE-----
--- End Message ---