Bug#646314: Please transition libtheora for multiarch

[Steve Langasek]

Package: libtheora
Version: 1.1.1+dfsg.1-3
Severity: normal
Tags: patch
User: ubuntu-devel at lists.ubuntu.com
Usertags: origin-ubuntu precise ubuntu-patch

Dear maintainer,


In Ubuntu, the attached patch was applied to make libtheora compatible with
multiarch, as described at
<http://wiki.debian.org/Multiarch/Implementation>.

This is a priority for Ubuntu because libtheora0 is a dependency of
gstreamer0.10-plugins-base, needed by wine1.3; however, in Debian the wine
package doesn't appear to use gstreamer, so I don't know of any particular
urgency for this change.

The patch includes several related changes, explained here in the changelog
entry for the Ubuntu upload:

  * Build for multiarch.
  * List the dh sequence before the arguments, as required for debhelper
    compat level 9.
  * Since the .la files are moving anyway, drop them as there are no
    reverse-dependencies for the new location.

Thanks for considering the patch.

-- 
Steve Langasek                   Give me a lever long enough and a Free OS
Debian Developer                   to set it on, and I can move the world.
Ubuntu Developer                                    http://www.debian.org/
slangasek at ubuntu.com                                     vorlon at debian.org
-------------- next part --------------
=== modified file 'debian/compat'
--- debian/compat	2009-12-23 19:33:12 +0000
+++ debian/compat	2011-10-23 04:55:05 +0000
@@ -1 +1 @@
-7
+9

=== modified file 'debian/control'
--- debian/control	2009-12-23 19:33:12 +0000
+++ debian/control	2011-10-23 06:28:58 +0000
@@ -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 (>= 8.1.3~), 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)
@@ -54,6 +57,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,

=== modified file 'debian/libtheora-dev.install'
--- debian/libtheora-dev.install	2009-08-07 10:20:25 +0000
+++ debian/libtheora-dev.install	2011-10-23 06:25:26 +0000
@@ -2,15 +2,12 @@
 debian/tmp/usr/include/theora/codec.h
 debian/tmp/usr/include/theora/theoradec.h
 debian/tmp/usr/include/theora/theoraenc.h
-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

=== modified file 'debian/libtheora0.install'
--- debian/libtheora0.install	2009-09-26 12:13:07 +0000
+++ debian/libtheora0.install	2011-10-23 04:55:17 +0000
@@ -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.*

=== modified file 'debian/rules'
--- debian/rules	2009-12-23 19:33:12 +0000
+++ debian/rules	2011-10-23 06:15:38 +0000
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh --with quilt $@
+	dh $@ --with quilt
 
 override_dh_strip:
 	dh_strip --dbg-package=libtheora-dbg