Package: sdl-image1.2
Version: 1.2.10-2.1
Severity: wishlist

Made it build for MultiArch
diff -Nru sdl-image1.2-1.2.10/debian/changelog sdl-image1.2-1.2.10/debian/changelog
--- sdl-image1.2-1.2.10/debian/changelog	2011-12-04 22:28:45.000000000 +0000
+++ sdl-image1.2-1.2.10/debian/changelog	2011-12-04 22:28:45.000000000 +0000
@@ -1,3 +1,10 @@
+sdl-image1.2 (1.2.10-2.2) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Building for multiarch 
+
+ -- Build User <[email protected]>  Sun, 04 Dec 2011 22:18:45 +0000
+
 sdl-image1.2 (1.2.10-2.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff -Nru sdl-image1.2-1.2.10/debian/control sdl-image1.2-1.2.10/debian/control
--- sdl-image1.2-1.2.10/debian/control	2011-12-04 22:28:45.000000000 +0000
+++ sdl-image1.2-1.2.10/debian/control	2011-12-04 22:28:45.000000000 +0000
@@ -3,13 +3,15 @@
 Priority: optional
 Maintainer: Debian SDL packages maintainers <[email protected]>
 Uploaders: Barry deFreese <[email protected]>, Aurelien Jarno <[email protected]>
-Build-Depends: debhelper (>= 5), libsdl1.2-dev (>= 1.2.10), libjpeg-dev, libpng12-dev, libtiff4-dev, zlib1g-dev
+Build-Depends: debhelper (>= 8.1.3~), libsdl1.2-dev (>= 1.2.10), libjpeg-dev, libpng12-dev, libtiff4-dev, zlib1g-dev
 Standards-Version: 3.8.3
 Homepage: http://www.libsdl.org/projects/SDL_image/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-sdl/unstable/sdl-image1.2
 
 Package: libsdl-image1.2
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: criticalmass (<< 0.97-2), libsdl-perl (<< 1.16-2), burgerspace (<< 1.6.1-1), armagetron (<< 0.1.4.9-5), libparagui1.0 (<= 0.1.0-1)
 Section: libs
diff -Nru sdl-image1.2-1.2.10/debian/libsdl-image1.2-dev.install sdl-image1.2-1.2.10/debian/libsdl-image1.2-dev.install
--- sdl-image1.2-1.2.10/debian/libsdl-image1.2-dev.install	2011-12-04 22:28:45.000000000 +0000
+++ sdl-image1.2-1.2.10/debian/libsdl-image1.2-dev.install	2011-12-04 22:28:45.000000000 +0000
@@ -1,5 +1,5 @@
 usr/include/SDL
-usr/lib/libSDL_image.a
-usr/lib/libSDL_image.la
-usr/lib/libSDL_image.so
-usr/lib/pkgconfig
+usr/lib/*/libSDL_image.a
+usr/lib/*/libSDL_image.la
+usr/lib/*/libSDL_image.so
+usr/lib/*/pkgconfig
diff -Nru sdl-image1.2-1.2.10/debian/libsdl-image1.2.install sdl-image1.2-1.2.10/debian/libsdl-image1.2.install
--- sdl-image1.2-1.2.10/debian/libsdl-image1.2.install	2011-12-04 22:28:45.000000000 +0000
+++ sdl-image1.2-1.2.10/debian/libsdl-image1.2.install	2011-12-04 22:28:45.000000000 +0000
@@ -1 +1 @@
-usr/lib/libSDL_image-1.2*
+usr/lib/*/libSDL_image-1.2*
diff -Nru sdl-image1.2-1.2.10/debian/rules sdl-image1.2-1.2.10/debian/rules
--- sdl-image1.2-1.2.10/debian/rules	2011-12-04 22:28:45.000000000 +0000
+++ sdl-image1.2-1.2.10/debian/rules	2011-12-04 22:28:45.000000000 +0000
@@ -4,6 +4,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)
 
 CFLAGS=-g -Wall
 
@@ -22,6 +23,7 @@
 
 	LDFLAGS=-lpthread CFLAGS="$(CFLAGS)" ./configure \
 		--prefix=/usr \
+		--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
 		--disable-jpg-shared \
@@ -49,7 +51,7 @@
 	dh_installdirs
 
 	$(MAKE) install prefix=`pwd`/debian/tmp/usr
-	for file in debian/tmp/usr/lib/*.la; do \
+	for file in debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/*.la; do \
 		sed -i "/dependency_libs/ s/'.*'/''/" $$file ; \
 	done
 

Reply via email to