Bug#646314: NMU diff for libtheora/1.1.1+dfsg.1-3.1

[Bastian Blank]

Attached is the NMU diff for libtheora/1.1.1+dfsg.1-3.1.

Bastian

-- 
Where there's no emotion, there's no motive for violence.
		-- Spock, "Dagger of the Mind", stardate 2715.1
-------------- next part --------------
diff -u libtheora-1.1.1+dfsg.1/debian/changelog libtheora-1.1.1+dfsg.1/debian/changelog
--- libtheora-1.1.1+dfsg.1/debian/changelog
+++ libtheora-1.1.1+dfsg.1/debian/changelog
@@ -1,3 +1,15 @@
+libtheora (1.1.1+dfsg.1-3.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Support multi-arch: (closes: #646314)
+    - Build-depend against newer debhelper.
+    - Use debhelper compat level 9, fix invocation.
+    - Mark libtheora-bin as foreign.
+    - Mark libtheora0, libtheora-dev and libtheora-dbg as same.
+    - Adjust installation directories.
+
+ -- Bastian Blank <waldi at debian.org>  Fri, 11 May 2012 14:33:27 +0000
+
 libtheora (1.1.1+dfsg.1-3) unstable; urgency=low
 
   * Need to patch configure for hurd support as well (Closes: #555670).
diff -u libtheora-1.1.1+dfsg.1/debian/libtheora0.install libtheora-1.1.1+dfsg.1/debian/libtheora0.install
--- libtheora-1.1.1+dfsg.1/debian/libtheora0.install
+++ libtheora-1.1.1+dfsg.1/debian/libtheora0.install
@@ -1,6 +1,6 @@
-debian/tmp/usr/lib/libtheora.so.0
-debian/tmp/usr/lib/libtheora.so.0.*
-debian/tmp/usr/lib/libtheoradec.so.1
-debian/tmp/usr/lib/libtheoradec.so.1.*
-debian/tmp/usr/lib/libtheoraenc.so.1
-debian/tmp/usr/lib/libtheoraenc.so.1.*
+usr/lib/*/libtheora.so.0
+usr/lib/*/libtheora.so.0.*
+usr/lib/*/libtheoradec.so.1
+usr/lib/*/libtheoradec.so.1.*
+usr/lib/*/libtheoraenc.so.1
+usr/lib/*/libtheoraenc.so.1.*
diff -u libtheora-1.1.1+dfsg.1/debian/compat libtheora-1.1.1+dfsg.1/debian/compat
--- libtheora-1.1.1+dfsg.1/debian/compat
+++ libtheora-1.1.1+dfsg.1/debian/compat
@@ -1 +1 @@
-7
+9
diff -u libtheora-1.1.1+dfsg.1/debian/libtheora-dev.install libtheora-1.1.1+dfsg.1/debian/libtheora-dev.install
--- libtheora-1.1.1+dfsg.1/debian/libtheora-dev.install
+++ libtheora-1.1.1+dfsg.1/debian/libtheora-dev.install
@@ -5,12 +5,9 @@
-debian/tmp/usr/lib/libtheora.a
-debian/tmp/usr/lib/libtheora.la
-debian/tmp/usr/lib/libtheora.so
-debian/tmp/usr/lib/libtheoradec.a
-debian/tmp/usr/lib/libtheoradec.la
-debian/tmp/usr/lib/libtheoradec.so
-debian/tmp/usr/lib/libtheoraenc.a
-debian/tmp/usr/lib/libtheoraenc.la
-debian/tmp/usr/lib/libtheoraenc.so
-debian/tmp/usr/lib/pkgconfig/theora.pc
-debian/tmp/usr/lib/pkgconfig/theoradec.pc
-debian/tmp/usr/lib/pkgconfig/theoraenc.pc
+usr/lib/*/libtheora.a
+usr/lib/*/libtheora.so
+usr/lib/*/libtheoradec.a
+usr/lib/*/libtheoradec.so
+usr/lib/*/libtheoraenc.a
+usr/lib/*/libtheoraenc.so
+usr/lib/*/pkgconfig/theora.pc
+usr/lib/*/pkgconfig/theoradec.pc
+usr/lib/*/pkgconfig/theoraenc.pc
diff -u libtheora-1.1.1+dfsg.1/debian/rules libtheora-1.1.1+dfsg.1/debian/rules
--- libtheora-1.1.1+dfsg.1/debian/rules
+++ libtheora-1.1.1+dfsg.1/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh --with quilt $@
+	dh $@ --with quilt
 
 override_dh_strip:
 	dh_strip --dbg-package=libtheora-dbg
diff -u libtheora-1.1.1+dfsg.1/debian/control libtheora-1.1.1+dfsg.1/debian/control
--- libtheora-1.1.1+dfsg.1/debian/control
+++ libtheora-1.1.1+dfsg.1/debian/control
@@ -3,13 +3,15 @@
 Priority: optional
 Maintainer: Debian Xiph.org Maintainers <pkg-xiph-maint at lists.alioth.debian.org>
 Uploaders: John Francesco Ferlito <johnf at inodes.org>
-Build-Depends: debhelper (>= 7.0.50~), autotools-dev, cdbs, devscripts, doxygen, graphviz, libogg-dev, libsdl1.2-dev, libvorbis-dev, python, libtool, automake, quilt, dpkg (>= 1.14.8), libpng12-dev, pkg-config, transfig, texlive-latex-base, texlive-latex-extra, texlive-latex-recommended, ghostscript
+Build-Depends: debhelper (>> 9), autotools-dev, cdbs, devscripts, doxygen, graphviz, libogg-dev, libsdl1.2-dev, libvorbis-dev, python, libtool, automake, quilt, dpkg (>= 1.14.8), libpng12-dev, pkg-config, transfig, texlive-latex-base, texlive-latex-extra, texlive-latex-recommended, ghostscript
 Standards-Version: 3.8.3
 Vcs-Bzr: http://bzr.debian.org/bzr/pkg-xiph/libtheora
 Homepage: http://www.theora.org/
 
 Package: libtheora0
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: The Theora Video Compression Codec
  Theora is an open video codec being developed by the Xiph.org Foundation as
@@ -19,6 +21,7 @@
 
 Package: libtheora-dev
 Architecture: any
+Multi-Arch: same
 Section: libdevel
 Depends: ${misc:Depends}, libtheora0 (= ${binary:Version}), libogg-dev
 Description: The Theora Video Compression Codec (development files)
@@ -42,6 +45,7 @@
 Package: libtheora-bin
 Architecture: any
 Section: utils
+Multi-Arch: foreign
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: The Theora Video Compression Codec (example encoder, decoder)
  Theora is a fully open, non-proprietary, patent-and-royalty-free,
@@ -54,6 +58,7 @@
 Section: debug
 Priority: extra
 Architecture: any
+Multi-Arch: same
 Depends: libtheora0 (= ${binary:Version}), ${misc:Depends}
 Description: The Theora Video Compression Codec (debug)
  Theora is a fully open, non-proprietary, patent-and-royalty-free,