Bug#650990: smpeg: multiarch support for libsmpeg*

[Vagrant Cascadian]

Package: smpeg
Version: 0.4.5+cvs20030824-3
Severity: wishlist

please consider applying the following patch, which adds multiarch support for 
libsmpeg0 and libsmpeg-dev.

thanks!

live well,
  vagrant


diff -Nru smpeg-0.4.5+cvs20030824/debian/control smpeg-0.4.5+cvs20030824/debian/control
--- smpeg-0.4.5+cvs20030824/debian/control	2011-12-02 05:01:32.000000000 -0800
+++ smpeg-0.4.5+cvs20030824/debian/control	2011-12-04 13:52:49.000000000 -0800
@@ -3,7 +3,7 @@
 Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>
 Section: libs
 Priority: optional
-Build-Depends: debhelper (>= 5),
+Build-Depends: debhelper (>= 8.1.3~),
                libsdl1.2-dev (>= 1.2.2-3.1),
                libgtk2.0-dev,
                libglib2.0-dev
@@ -16,6 +16,7 @@
 Package: libsmpeg0
 Architecture: any
 Section: libs
+Pre-Depends: multiarch-support
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Conflicts: smpeg,
diff -Nru smpeg-0.4.5+cvs20030824/debian/libsmpeg0.files smpeg-0.4.5+cvs20030824/debian/libsmpeg0.files
--- smpeg-0.4.5+cvs20030824/debian/libsmpeg0.files	2011-12-02 05:01:32.000000000 -0800
+++ smpeg-0.4.5+cvs20030824/debian/libsmpeg0.files	2011-12-04 13:38:39.000000000 -0800
@@ -1,2 +1,2 @@
-usr/lib/libsmpeg-0.4.so.0.1.4
-usr/lib/libsmpeg-0.4.so.0
+usr/lib/*/libsmpeg-0.4.so.0.1.4
+usr/lib/*/libsmpeg-0.4.so.0
diff -Nru smpeg-0.4.5+cvs20030824/debian/libsmpeg-dev.files smpeg-0.4.5+cvs20030824/debian/libsmpeg-dev.files
--- smpeg-0.4.5+cvs20030824/debian/libsmpeg-dev.files	2011-12-02 05:01:32.000000000 -0800
+++ smpeg-0.4.5+cvs20030824/debian/libsmpeg-dev.files	2011-12-04 13:38:50.000000000 -0800
@@ -1,5 +1,5 @@
 usr/bin/smpeg-config
 usr/include
-usr/lib/libsmpeg.a
-usr/lib/libsmpeg.so
+usr/lib/*/libsmpeg.a
+usr/lib/*/libsmpeg.so
 usr/share/aclocal/smpeg.m4
diff -Nru smpeg-0.4.5+cvs20030824/debian/rules smpeg-0.4.5+cvs20030824/debian/rules
--- smpeg-0.4.5+cvs20030824/debian/rules	2011-12-02 05:01:32.000000000 -0800
+++ smpeg-0.4.5+cvs20030824/debian/rules	2011-12-04 13:35:49.000000000 -0800
@@ -6,6 +6,7 @@
 
 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)
 
 # Handle DEB_BUILD_OPTIONS
 CFLAGS = -Wall -g
@@ -34,6 +35,7 @@
 	CFLAGS="$(CFLAGS)" CXXFLAGS="$(CFLAGS)" CXX=$(CXX) ./configure \
 	  --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 	  --prefix=/usr \
+	  --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 	  --enable-mmx=no \
 	  --enable-opengl-player=no
 
@@ -87,7 +89,7 @@
 	dh_fixperms
 #	dh_makeshlibs -V
 	dh_installdeb
-	dh_shlibdeps -ldebian/libsmpeg0/usr/lib
+	dh_shlibdeps -ldebian/libsmpeg0/usr/lib/$(DEB_HOST_MULTIARCH)
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb