[Pkg-sdl-commits] [SCM] Debian packaging of SDL 1.3 branch, master, updated. debian/1.3.0_20111204-1-11-g5266540

[Sam Hocevar]

The following commit has been merged in the master branch:
commit 5266540c6f4f8c4b1318f04f6d8a05d78ad3e255
Author: Sam Hocevar <sam at hocevar.net>
Date:   Fri May 18 01:19:39 2012 +0200

    debian/rules: add multiarch support (Closes: #669364).

diff --git a/debian/changelog b/debian/changelog
index e8500b3..19976f0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-libsdl2 (2.0~20120220c-1) UNRELEASED; urgency=low
+libsdl2 (2.0~20120220c-1) experimental; urgency=low
 
   * Upstream version was renamed to 2.0 (Closes: #669367).
   * New upstream snapshot (Closes: #671506).
   * This package no longer conflicts with libsdl-1.2.
+  * debian/rules: add multiarch support (Closes: #669364).
 
   * debian/patches/fix_joystick_misc_axes.diff: fix a joystick remapping
     bug causing some axes to malfunction.
diff --git a/debian/control b/debian/control
index a62d969..ac8587f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian SDL packages maintainers <pkg-sdl-maintainers at lists.alioth.de
 Uploaders: Barry deFreese <bdefreese at debian.org>, Sam Hocevar <sho at debian.org>
 Standards-Version: 3.9.3
 Build-Depends: dpkg (>= 1.13.2),
-               debhelper (>= 5.0),
+               debhelper (>= 8.1.3~),
                quilt,
                libx11-dev,
                libxext-dev,
@@ -25,7 +25,9 @@ Homepage: http://www.libsdl.org/
 
 Package: libsdl2-2.0-0
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Multi-Arch: same
 Conflicts: libsdl-1.3-0
 Replaces: libsdl-1.3-0
 Description: Simple DirectMedia Layer
diff --git a/debian/libsdl2-2.0-0.install b/debian/libsdl2-2.0-0.install
index 093956b..3de3b10 100644
--- a/debian/libsdl2-2.0-0.install
+++ b/debian/libsdl2-2.0-0.install
@@ -1 +1 @@
-usr/lib/*.so.*
+usr/lib/*/*.so.*
diff --git a/debian/libsdl2-dev.install b/debian/libsdl2-dev.install
index 5d9b6fb..da75b91 100644
--- a/debian/libsdl2-dev.install
+++ b/debian/libsdl2-dev.install
@@ -1,7 +1,7 @@
 usr/include/SDL2
-usr/lib/*.a
-usr/lib/*.so
-usr/lib/*.la
-usr/lib/pkgconfig
+usr/lib/*/*.a
+usr/lib/*/*.so
+usr/lib/*/*.la
+usr/lib/*/pkgconfig
 usr/bin/sdl2-config
 usr/share/aclocal/*
diff --git a/debian/rules b/debian/rules
index d5f0954..373036b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,7 @@ DEB_BUILD_GNU_TYPE	?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 export DEB_HOST_GNU_TYPE
 export DEB_BUILD_GNU_TYPE
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 confflags = --prefix=/usr
 confflags += --disable-rpath --enable-sdl-dlopen --disable-loadso \
@@ -39,6 +40,7 @@ udeb_confflags = --enable-video-directfb \
 		 --disable-video-gem --disable-video-caca \
 		 --disable-audio \
 		 --disable-oss --disable-alsa --disable-pulseaudio
+confflags += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)
 
 ifeq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
   confflags += --build $(DEB_HOST_GNU_TYPE)
@@ -128,8 +130,8 @@ binary-arch: build install
 	dh_installman -plibsdl2-dev debian/sdl2-config.1
 	dh_installchangelogs
 	dh_install --sourcedir=debian/tmp
-	sed -i -e "s/^dependency_libs=.*/dependency_libs=''/" debian/libsdl2-dev/usr/lib/libSDL2.la
-	dh_install --sourcedir=builddir/udeb/ -plibsdl2-2.0-0-udeb build/.libs/*.so.* usr/lib/;
+	sed -i -e "s/^dependency_libs=.*/dependency_libs=''/" debian/libsdl2-dev/usr/lib/$(DEB_HOST_MULTIARCH)/libSDL2.la
+	dh_install --sourcedir=builddir/udeb/ -plibsdl2-2.0-0-udeb build/.libs/*.so.* usr/lib/$(DEB_HOST_MULTIARCH)/;
 	rm -rf debian/libsdl2-2.0-0/usr/include
 	dh_strip
 	dh_compress

-- 
Debian packaging of SDL 1.3