Bug#635252: [libxmu6] support multiarch same

[gregory hainaut <gregory.hainaut@gmail.com>]

Package: libxmu6
Version: 2:1.1.0-2.1
Severity: wishlist
Tags: patch

--- Please enter the report below this line. ---

Dears Maintainers,

Could you support multiarch same for libxmu/libxmuu? Multiarch
information can be found on this wiki
http://wiki.debian.org/Multiarch/Implementation

A small patch is attached.

Short description of the patch:
* build lib in usr/lib/$DEB_HOST_MULTIARCH
* bump debhelper to support ${misc:Pre-Depends}
* move file to /usr/lib/$DEB_HOST_MULTIARCH

Best regards,
Gregory

diff -u libxmu-1.1.0/debian/rules libxmu-1.1.0/debian/rules
--- libxmu-1.1.0/debian/rules
+++ libxmu-1.1.0/debian/rules
@@ -28,6 +28,7 @@
 else
 	confflags += --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE)
 endif
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 configure: $(STAMP_DIR)/patch
 	dh_testdir
@@ -43,6 +44,7 @@
 	             --infodir=\$${prefix}/share/info $(confflags) \
 	             --docdir=\$${prefix}/share/doc/libxmu-headers \
 	             --with-xmlto --without-fop \
+				 --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 	             CFLAGS="$(CFLAGS)" 
 	cd build && $(MAKE)
 	>$@
diff -u libxmu-1.1.0/debian/control libxmu-1.1.0/debian/control
--- libxmu-1.1.0/debian/control
+++ libxmu-1.1.0/debian/control
@@ -4,7 +4,7 @@
 Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
 Uploaders: David Nusinow <dnusinow@debian.org>, Cyril Brulebois <kibi@debian.org>
 Build-Depends:
- debhelper (>= 5.0.0),
+ debhelper (>= 8.1.3),
  libx11-dev (>= 1:0.99.2),
  libxt-dev (>= 1:0.99.1),
  libxext-dev (>= 1:0.99.1),
@@ -22,6 +22,8 @@
 Package: libxmu6
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: X11 miscellaneous utility library
  libXmu provides a set of miscellaneous utility convenience functions for X
@@ -38,6 +40,7 @@
 Section: debug
 Architecture: any
 Priority: extra
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}, libxmu6 (= ${binary:Version})
 Description: X11 miscellaneous utility library (debug package)
  libXmu provides a set of miscellaneous utility convenience functions for X
@@ -74,6 +77,8 @@
 Package: libxmuu1
 Section: libs
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: X11 miscellaneous micro-utility library
  libXmuu provides a set of miscellaneous utility convenience functions for X
@@ -90,6 +95,7 @@
 Section: debug
 Architecture: any
 Priority: extra
+Multi-Arch: same
 Depends: ${shlibs:Depends}, ${misc:Depends}, libxmuu1 (= ${binary:Version})
 Description: X11 miscellaneous micro-utility library (debug package)
  libXmuu provides a set of miscellaneous utility convenience functions for X
diff -u libxmu-1.1.0/debian/libxmuu1.install libxmu-1.1.0/debian/libxmuu1.install
--- libxmu-1.1.0/debian/libxmuu1.install
+++ libxmu-1.1.0/debian/libxmuu1.install
@@ -1 +1 @@
-usr/lib/libXmuu.so.1*
+usr/lib/*/libXmuu.so.1*
diff -u libxmu-1.1.0/debian/libxmu6.install libxmu-1.1.0/debian/libxmu6.install
--- libxmu-1.1.0/debian/libxmu6.install
+++ libxmu-1.1.0/debian/libxmu6.install
@@ -1 +1 @@
-usr/lib/libXmu.so.6*
+usr/lib/*/libXmu.so.6*
diff -u libxmu-1.1.0/debian/libxmuu-dev.install libxmu-1.1.0/debian/libxmuu-dev.install
--- libxmu-1.1.0/debian/libxmuu-dev.install
+++ libxmu-1.1.0/debian/libxmuu-dev.install
@@ -1,3 +1,3 @@
-usr/lib/libXmuu.a
-usr/lib/libXmuu.so
-usr/lib/pkgconfig/xmuu.pc
+usr/lib/*/libXmuu.a
+usr/lib/*/libXmuu.so
+usr/lib/*/pkgconfig/xmuu.pc
diff -u libxmu-1.1.0/debian/libxmu-dev.install libxmu-1.1.0/debian/libxmu-dev.install
--- libxmu-1.1.0/debian/libxmu-dev.install
+++ libxmu-1.1.0/debian/libxmu-dev.install
@@ -1,3 +1,3 @@
-usr/lib/libXmu.a
-usr/lib/libXmu.so
-usr/lib/pkgconfig/xmu.pc
+usr/lib/*/libXmu.a
+usr/lib/*/libXmu.so
+usr/lib/*/pkgconfig/xmu.pc