Control: tags 777070 + pending

Dear maintainer,

this issue prevents libavformat-ffmpeg56 from being co-installable so I've
prepared an NMU for game-music-emu (versioned as 0.5.5-2.1) and uploaded it to
DELAYED/5. Please feel free to tell me if I should delay it longer.

Cheers
-- 
Sebastian Ramacher
diff -Nru game-music-emu-0.5.5/debian/changelog game-music-emu-0.5.5/debian/changelog
--- game-music-emu-0.5.5/debian/changelog	2010-03-22 14:32:36.000000000 +0100
+++ game-music-emu-0.5.5/debian/changelog	2015-07-22 23:59:15.000000000 +0200
@@ -1,3 +1,15 @@
+game-music-emu (0.5.5-2.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Add multi-arch support based on a patch by Francois Gouget (Closes:
+    #777070)
+    + debian/control: Bump B-D on debhelper to (>= 9) and add M-A: same.
+    + debian/compat: Bump to 9.
+    + debian/libgme0.install, debian/libgme-dev.install: Update for new paths.
+    + debian/rules: Move files to multi-arch location.
+
+ -- Sebastian Ramacher <sramac...@debian.org>  Wed, 22 Jul 2015 23:59:08 +0200
+
 game-music-emu (0.5.5-2) unstable; urgency=low
 
   * debian/control,
diff -Nru game-music-emu-0.5.5/debian/compat game-music-emu-0.5.5/debian/compat
--- game-music-emu-0.5.5/debian/compat	2010-03-22 14:29:21.000000000 +0100
+++ game-music-emu-0.5.5/debian/compat	2015-02-04 12:19:24.000000000 +0100
@@ -1 +1 @@
-7
+9
diff -Nru game-music-emu-0.5.5/debian/control game-music-emu-0.5.5/debian/control
--- game-music-emu-0.5.5/debian/control	2010-03-22 14:34:42.000000000 +0100
+++ game-music-emu-0.5.5/debian/control	2015-07-22 23:38:01.000000000 +0200
@@ -2,14 +2,16 @@
 Section: sound
 Priority: optional
 Maintainer: Sebastian Dröge <sl...@debian.org>
-Build-Depends: debhelper (>= 7),
+Build-Depends: debhelper (>= 9),
                cmake (>= 2.6.0)
 Standards-Version: 3.8.4
 Homepage: http://code.google.com/p/game-music-emu
 
 Package: libgme0
 Architecture: any
+Multi-Arch: same
 Section: libs
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: Playback library for video game music files - shared library
@@ -30,6 +32,7 @@
 
 Package: libgme-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: libgme0 (= ${binary:Version}),
          ${misc:Depends}
diff -Nru game-music-emu-0.5.5/debian/libgme0.install game-music-emu-0.5.5/debian/libgme0.install
--- game-music-emu-0.5.5/debian/libgme0.install	2010-03-22 14:20:44.000000000 +0100
+++ game-music-emu-0.5.5/debian/libgme0.install	2015-07-22 23:38:38.000000000 +0200
@@ -1 +1 @@
-debian/tmp/usr/lib/libgme.so.* /usr/lib
+debian/tmp/usr/lib/*/libgme.so.*
diff -Nru game-music-emu-0.5.5/debian/libgme-dev.install game-music-emu-0.5.5/debian/libgme-dev.install
--- game-music-emu-0.5.5/debian/libgme-dev.install	2010-03-22 14:20:44.000000000 +0100
+++ game-music-emu-0.5.5/debian/libgme-dev.install	2015-07-22 23:38:44.000000000 +0200
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/libgme.so
+debian/tmp/usr/lib/*/libgme.so
 debian/tmp/usr/include/gme/gme.h
diff -Nru game-music-emu-0.5.5/debian/rules game-music-emu-0.5.5/debian/rules
--- game-music-emu-0.5.5/debian/rules	2010-03-22 14:39:46.000000000 +0100
+++ game-music-emu-0.5.5/debian/rules	2015-07-22 23:51:31.000000000 +0200
@@ -1,8 +1,15 @@
 #!/usr/bin/make -f
 
+DEB_HOST_MULTIARCH=$(shell dpkg-architecture -qDEB_HOST_MULTIARCH) 
+
 %:
 	dh $@
 
+override_dh_auto_install:
+	dh_auto_install
+	mkdir debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
+	mv debian/tmp/usr/lib/libgme.so* debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
+
 override_dh_makeshlibs:
 	dh_makeshlibs -- -c4
 

Attachment: signature.asc
Description: Digital signature

Reply via email to