Bug#636989: libjpeg8: Please add multiarch support

[gregory hainaut]

Hello Gregor, Bill,

By chance, I convert libjpeg8 on my system few week ago. It seems to
work fine on my side. Feel free to use it.

Patch overview:
+ bump debhelper to support ${misc:Pre-Depends}
+ move library to /usr/lib/$(DEB_HOST_MULTIARCH)

Cheers,
Gregory
diff -Nru libjpeg8-8c/debian/changelog libjpeg8-8c/debian/changelog
--- libjpeg8-8c/debian/changelog	2011-07-07 15:08:56.000000000 +0200
+++ libjpeg8-8c/debian/changelog	2011-07-10 14:57:59.000000000 +0200
@@ -1,3 +1,10 @@
+libjpeg8 (8c-2.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * transition multiarch 
+
+ -- Gregory Hainaut <gregory.hain...@gmail.com>  Sun, 10 Jul 2011 14:57:51 +0200
+
 libjpeg8 (8c-2) unstable; urgency=low
 
   * The "Angèle" release
diff -Nru libjpeg8-8c/debian/control libjpeg8-8c/debian/control
--- libjpeg8-8c/debian/control	2011-07-06 23:23:58.000000000 +0200
+++ libjpeg8-8c/debian/control	2011-07-10 14:56:40.000000000 +0200
@@ -2,12 +2,14 @@
 Maintainer: Bill Allombert <ballo...@debian.org>
 Section: graphics
 Priority: optional
-Build-Depends: debhelper (>= 5), autotools-dev
+Build-Depends: debhelper (>= 8.1.3), autotools-dev
 Standards-Version: 3.9.2
 
 Package: libjpeg8
 Architecture: any
 Section: libs
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
 Description: Independent JPEG Group's JPEG runtime library
  The Independent JPEG Group's JPEG library is a library for handling
  JPEG files.
@@ -32,6 +34,7 @@
 Architecture: any
 Section: debug
 Priority: extra
+Multi-Arch: same
 Description: Development files for the IJG JPEG library
  The Independent JPEG Group's JPEG library is a library for handling
  JPEG files.
diff -Nru libjpeg8-8c/debian/libjpeg8-dev.files libjpeg8-8c/debian/libjpeg8-dev.files
--- libjpeg8-8c/debian/libjpeg8-dev.files	2011-07-07 10:42:49.000000000 +0200
+++ libjpeg8-8c/debian/libjpeg8-dev.files	2011-07-10 14:57:37.000000000 +0200
@@ -1,3 +1,3 @@
 usr/include
-usr/lib/libjpeg.a
-usr/lib/libjpeg.so
+usr/lib/*/libjpeg.a
+usr/lib/*/libjpeg.so
diff -Nru libjpeg8-8c/debian/libjpeg8.files libjpeg8-8c/debian/libjpeg8.files
--- libjpeg8-8c/debian/libjpeg8.files	2011-02-06 16:54:10.000000000 +0100
+++ libjpeg8-8c/debian/libjpeg8.files	2011-07-10 14:57:42.000000000 +0200
@@ -1,2 +1,2 @@
-/usr/lib/libjpeg.so.8.3.0
-/usr/lib/libjpeg.so.8
+/usr/lib/*/libjpeg.so.8.3.0
+/usr/lib/*/libjpeg.so.8
diff -Nru libjpeg8-8c/debian/rules libjpeg8-8c/debian/rules
--- libjpeg8-8c/debian/rules	2011-07-07 15:07:35.000000000 +0200
+++ libjpeg8-8c/debian/rules	2011-07-10 14:54:51.000000000 +0200
@@ -6,6 +6,7 @@
 
 export DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 export CFLAGS=-D_REENTRANT -g -Wall -Wno-main
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -22,7 +23,7 @@
 	./configure --prefix=/usr --mandir=/usr/share/man \
 	 --enable-static --enable-shared \
 	 --disable-silent-rules \
-	 --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) 
+	 --build=$(DEB_BUILD_GNU_TYPE) --host=$(DEB_HOST_GNU_TYPE) --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) 
 	$(MAKE)
 ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 	$(MAKE) check
@@ -62,7 +63,7 @@
 	dh_compress 
 	dh_fixperms 
 	dh_installdeb 
-	dh_shlibdeps -l`pwd`/debian/libjpeg8/usr/lib 
+	dh_shlibdeps -l`pwd`/debian/libjpeg8/usr/lib/$(DEB_HOST_MULTIARCH)
 	dh_gencontrol 
 	dh_md5sums 
 	dh_builddeb