Bug#639679: libxp: please convert to multiarch
Package: libxp
Version: 1:1.0.1-1
Severity: wishlist
Tags: patch
Dear Maintainers,
Could you support multiarch same for libxp
Multiarch Information can be found on this wiki
http://wiki.debian.org/Multiarch/Implementation
A propsed patch is attached
Thank you.
-- System Information:
Debian Release: wheezy/sid
APT prefers oneiric-updates
APT policy: (500, 'oneiric-updates'), (500, 'oneiric-security'), (500, 'oneiric'), (100, 'oneiric-backports')
Architecture: amd64 (x86_64)
Kernel: Linux 3.0.0-9-generic (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -u libxp-1.0.1/debian/changelog libxp-1.0.1/debian/changelog
--- libxp-1.0.1/debian/changelog
+++ libxp-1.0.1/debian/changelog
@@ -1,3 +1,9 @@
+libxp (1:1.0.1-2) UNRELEASED; urgency=low
+
+ * convert to multiarch
+
+ -- Julian Taylor <jtaylor.debian@googlemail.com> Mon, 29 Aug 2011 12:54:02 +0200
+
libxp (1:1.0.1-1) unstable; urgency=low
* New upstream release.
diff -u libxp-1.0.1/debian/rules libxp-1.0.1/debian/rules
--- libxp-1.0.1/debian/rules
+++ libxp-1.0.1/debian/rules
@@ -23,6 +23,7 @@
endif
DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
@@ -41,6 +42,7 @@
cd build && \
../configure --prefix=/usr --mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info $(confflags) \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
CFLAGS="$(CFLAGS)"
$(MAKE) -C build
diff -u libxp-1.0.1/debian/control libxp-1.0.1/debian/control
--- libxp-1.0.1/debian/control
+++ libxp-1.0.1/debian/control
@@ -4,7 +4,7 @@
Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Drew Parsons <dparsons@debian.org>, Cyril Brulebois <kibi@debian.org>
Build-Depends:
- debhelper (>= 5),
+ debhelper (>= 8.1.3~),
quilt,
pkg-config,
libx11-dev (>= 1:0.99.2),
@@ -20,6 +20,8 @@
Package: libxp6
Section: libs
Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
Depends:
${shlibs:Depends},
${misc:Depends},
@@ -37,6 +39,7 @@
Section: debug
Priority: extra
Architecture: any
+Multi-Arch: same
Depends:
libxp6 (= ${binary:Version}),
${shlibs:Depends},
diff -u libxp-1.0.1/debian/libxp-dev.install libxp-1.0.1/debian/libxp-dev.install
--- libxp-1.0.1/debian/libxp-dev.install
+++ libxp-1.0.1/debian/libxp-dev.install
@@ -1,3 +1,3 @@
-usr/lib/libXp.a
-usr/lib/libXp.so
-usr/lib/pkgconfig/xp.pc
+usr/lib/*/libXp.a
+usr/lib/*/libXp.so
+usr/lib/*/pkgconfig/xp.pc
diff -u libxp-1.0.1/debian/libxp6.install libxp-1.0.1/debian/libxp6.install
--- libxp-1.0.1/debian/libxp6.install
+++ libxp-1.0.1/debian/libxp6.install
@@ -1 +1 @@
-usr/lib/libXp.so.6*
+usr/lib/*/libXp.so.6*
diff -u libxp-1.0.1/debian/compat libxp-1.0.1/debian/compat
--- libxp-1.0.1/debian/compat
+++ libxp-1.0.1/debian/compat
@@ -1 +1 @@
-5
+9
Reply to: