Package: gst-plugins-base0.10 Version: 0.10.35-1 Followup-For: Bug #647485 User: ubuntu-de...@lists.ubuntu.com Usertags: origin-ubuntu precise ubuntu-patch
Hi folks, The patch included in this bug seems to have been a patch for the gstreamer0.10 source package by mistake. Please find attached a patch for gst-plugins-base0.10. Note that this brings an added versioned runtime dependency on libgstreamer0.10-0, to ensure that the plugins are not upgraded without a library that can find them. As a result, this patch is dependent on the patch from bug #647481, and the versioned dependency should match whatever version actually introduces multiarch support in gstreamer0.10. (The current version number used in the patch for this is speculative.) It should actually also have a build-dependency on the necessary version of dh_gstscancodecs that knows to look in the multiarch directory. Unfortunately I overlooked this detail when preparing the patch I sent to bug #647481; I'll prepare an updated patch for gstreamer and send it on ASAP. -- 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/ slanga...@ubuntu.com vor...@debian.org
=== modified file 'debian/build-deps' --- debian/build-deps 2011-05-14 11:46:16 +0000 +++ debian/build-deps 2011-12-09 16:50:46 +0000 @@ -3,8 +3,8 @@ autotools-dev dh-autoreconf autopoint -cdbs (>= 0.4.20) -debhelper (>= 7) +cdbs (>= 0.4.93~) +debhelper (>= 8.1.3~) gnome-pkg-tools (>= 0.7) pkg-config (>= 0.11.0) libxv-dev (>= 6.8.2.dfsg.1-3) === modified file 'debian/build-deps.in' --- debian/build-deps.in 2011-05-14 11:46:16 +0000 +++ debian/build-deps.in 2011-12-09 16:49:28 +0000 @@ -3,8 +3,8 @@ autotools-dev dh-autoreconf autopoint -cdbs (>= 0.4.20) -debhelper (>= 7) +cdbs (>= 0.4.93~) +debhelper (>= 8.1.3~) gnome-pkg-tools (>= 0.7) pkg-config (>= 0.11.0) libxv-dev (>= 6.8.2.dfsg.1-3) === modified file 'debian/compat' --- debian/compat 2010-09-09 11:04:17 +0000 +++ debian/compat 2011-12-09 21:55:01 +0000 @@ -1 +1 @@ -7 +9 === modified file 'debian/control' --- debian/control 2011-06-23 09:37:32 +0000 +++ debian/control 2011-12-10 01:02:45 +0000 @@ -6,13 +6,14 @@ Sebastien Bacher <seb...@debian.org>, Sebastian Dröge <sl...@debian.org>, Sjoerd Simons <sjo...@debian.org> -Build-Depends: libgstreamer0.10-dev (>= 0.10.34), libasound2-dev (>= 0.9.0) [linux-any] , libgudev-1.0-dev (>= 143) [linux-any], autotools-dev, dh-autoreconf, autopoint, cdbs (>= 0.4.20), debhelper (>= 7), gnome-pkg-tools (>= 0.7), pkg-config (>= 0.11.0), libxv-dev (>= 6.8.2.dfsg.1-3), libxt-dev (>= 6.8.2.dfsg.1-3), libvorbis-dev (>= 1.0.0-2), libcdparanoia-dev (>= 3.10.2) [!hurd-i386], libgnomevfs2-dev (>= 1:2.20.0-2), liborc-0.4-dev (>= 1:0.4.11), libpango1.0-dev (>= 1.16.0), libtheora-dev (>= 1.1), libglib2.0-dev (>= 2.22), libxml2-dev (>= 2.4.23), zlib1g-dev (>= 1:1.1.4), libvisual-0.4-dev (>= 0.4.0), gstreamer-tools (>= 0.10.30), dpkg-dev (>= 1.15.1), iso-codes, libgtk2.0-dev (>= 2.12.0), libglib2.0-doc, gstreamer0.10-doc, libgirepository1.0-dev (>= 0.9.12-4~), gobject-introspection (>= 0.9.12-4~), gir1.2-glib-2.0, gir1.2-freedesktop, gir1.2-gstreamer-0.10 +Build-Depends: libgstreamer0.10-dev (>= 0.10.34), libasound2-dev (>= 0.9.0) [linux-any] , libgudev-1.0-dev (>= 143) [linux-any], autotools-dev, dh-autoreconf, autopoint, cdbs (>= 0.4.93~), debhelper (>= 8.1.3~), gnome-pkg-tools (>= 0.7), pkg-config (>= 0.11.0), libxv-dev (>= 6.8.2.dfsg.1-3), libxt-dev (>= 6.8.2.dfsg.1-3), libvorbis-dev (>= 1.0.0-2), libcdparanoia-dev (>= 3.10.2) [!hurd-i386], libgnomevfs2-dev (>= 1:2.20.0-2), liborc-0.4-dev (>= 1:0.4.11), libpango1.0-dev (>= 1.16.0), libtheora-dev (>= 1.1), libglib2.0-dev (>= 2.22), libxml2-dev (>= 2.4.23), zlib1g-dev (>= 1:1.1.4), libvisual-0.4-dev (>= 0.4.0), gstreamer-tools (>= 0.10.30), dpkg-dev (>= 1.15.1), iso-codes, libgtk2.0-dev (>= 2.12.0), libglib2.0-doc, gstreamer0.10-doc, libgirepository1.0-dev (>= 0.9.12-4~), gobject-introspection (>= 0.9.12-4~), gir1.2-glib-2.0, gir1.2-freedesktop, gir1.2-gstreamer-0.10 Build-Depends-Indep: gtk-doc-tools Standards-Version: 3.8.4 Homepage: http://gstreamer.freedesktop.org Package: gstreamer0.10-plugins-base-apps Architecture: any +Multi-Arch: foreign Section: utils Depends: ${shlibs:Depends}, ${misc:Depends}, @@ -48,7 +49,9 @@ Package: libgstreamer-plugins-base0.10-0 Architecture: any +Multi-Arch: same Section: libs +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, iso-codes @@ -94,9 +97,11 @@ Package: gstreamer0.10-alsa Architecture: linux-any +Multi-Arch: same Section: libs Depends: ${misc:Depends}, ${shlibs:Depends}, + libgstreamer0.10-0 (>= 0.10.35-2), libgstreamer-plugins-base0.10-0 (>= 0.10.35) Recommends: alsa-base (>= 0.9.0) Suggests: alsa-utils (>= 0.9.0) @@ -120,9 +125,11 @@ Package: gstreamer0.10-gnomevfs Architecture: any +Multi-Arch: same Section: libs Depends: ${misc:Depends}, - ${shlibs:Depends} + ${shlibs:Depends}, + libgstreamer0.10-0 (>= 0.10.35-2) Recommends: libgnomevfs2-extra XB-GStreamer-Version: ${gstreamer:Version} XB-GStreamer-Elements: ${gstreamer:Elements} @@ -144,9 +151,11 @@ Package: gstreamer0.10-plugins-base Architecture: any +Multi-Arch: same Section: libs Depends: ${misc:Depends}, ${shlibs:Depends}, + libgstreamer0.10-0 (>= 0.10.35-2), libgstreamer-plugins-base0.10-0 (>= 0.10.35) Suggests: gvfs Replaces: gstreamer0.10-plugins-bad (<< 0.10.3+cvs20060814-0ubuntu4) @@ -194,9 +203,11 @@ Package: gstreamer0.10-x Architecture: any +Multi-Arch: same Section: libs Depends: ${misc:Depends}, ${shlibs:Depends}, + libgstreamer0.10-0 (>= 0.10.35-2), libgstreamer-plugins-base0.10-0 (>= 0.10.35) XB-GStreamer-Version: ${gstreamer:Version} XB-GStreamer-Elements: ${gstreamer:Elements} === modified file 'debian/control.in' --- debian/control.in 2011-05-14 11:46:16 +0000 +++ debian/control.in 2011-12-10 01:02:45 +0000 @@ -13,6 +13,7 @@ Package: @GST_PKGNAME@-plugins-base-apps Architecture: any +Multi-Arch: foreign Section: utils Depends: ${shlibs:Depends}, ${misc:Depends}, @@ -48,7 +49,9 @@ Package: @GST_PLUGINS_BASE_LIB@ Architecture: any +Multi-Arch: same Section: libs +Pre-Depends: ${misc:Pre-Depends} Depends: ${misc:Depends}, ${shlibs:Depends}, iso-codes @@ -94,9 +97,11 @@ Package: @GST_PKGNAME@-alsa Architecture: linux-any +Multi-Arch: same Section: libs Depends: ${misc:Depends}, ${shlibs:Depends}, + libgstreamer0.10-0 (>= 0.10.35-2), @GST_PLUGINS_BASE_LIB@ (>= @GST_VERSION@) Recommends: alsa-base (>= 0.9.0) Suggests: alsa-utils (>= 0.9.0) @@ -120,9 +125,11 @@ Package: @GST_PKGNAME@-gnomevfs Architecture: any +Multi-Arch: same Section: libs Depends: ${misc:Depends}, - ${shlibs:Depends} + ${shlibs:Depends}, + libgstreamer0.10-0 (>= 0.10.35-2) Recommends: libgnomevfs2-extra XB-GStreamer-Version: ${gstreamer:Version} XB-GStreamer-Elements: ${gstreamer:Elements} @@ -144,9 +151,11 @@ Package: @GST_PKGNAME@-plugins-base Architecture: any +Multi-Arch: same Section: libs Depends: ${misc:Depends}, ${shlibs:Depends}, + libgstreamer0.10-0 (>= 0.10.35-2), @GST_PLUGINS_BASE_LIB@ (>= @GST_VERSION@) Suggests: gvfs Replaces: gstreamer0.10-plugins-bad (<< 0.10.3+cvs20060814-0ubuntu4) @@ -194,9 +203,11 @@ Package: @GST_PKGNAME@-x Architecture: any +Multi-Arch: same Section: libs Depends: ${misc:Depends}, ${shlibs:Depends}, + libgstreamer0.10-0 (>= 0.10.35-2), @GST_PLUGINS_BASE_LIB@ (>= @GST_VERSION@) XB-GStreamer-Version: ${gstreamer:Version} XB-GStreamer-Elements: ${gstreamer:Elements} === modified file 'debian/gir1.2-gst-plugins-base.install' --- debian/gir1.2-gst-plugins-base.install 2010-12-14 22:09:46 +0000 +++ debian/gir1.2-gst-plugins-base.install 2011-12-09 22:13:43 +0000 @@ -1 +1,2 @@ -debian/tmp/usr/lib/girepository-* +debian/tmp/usr/lib/*/girepository-* /usr/lib + === modified file 'debian/gstreamer-alsa.install' --- debian/gstreamer-alsa.install 2007-08-03 21:39:38 +0000 +++ debian/gstreamer-alsa.install 2011-12-09 21:57:41 +0000 @@ -1 +1 @@ -debian/tmp/usr/lib/gstreamer-@GST_ABI@/libgstalsa.so +debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstalsa.so === modified file 'debian/gstreamer-gnomevfs.install' --- debian/gstreamer-gnomevfs.install 2007-08-03 21:39:38 +0000 +++ debian/gstreamer-gnomevfs.install 2011-12-09 21:57:41 +0000 @@ -1 +1 @@ -debian/tmp/usr/lib/gstreamer-@GST_ABI@/libgstgnomevfs.so +debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstgnomevfs.so === modified file 'debian/gstreamer-plugins-base.install' --- debian/gstreamer-plugins-base.install 2011-05-14 11:46:16 +0000 +++ debian/gstreamer-plugins-base.install 2011-12-09 21:57:41 +0000 @@ -1,25 +1,25 @@ -debian/tmp/usr/lib/gstreamer-@GST_ABI@/libgstadder.so -debian/tmp/usr/lib/gstreamer-@GST_ABI@/libgstapp.so -debian/tmp/usr/lib/gstreamer-@GST_ABI@/libgstaudioconvert.so -debian/tmp/usr/lib/gstreamer-@GST_ABI@/libgstaudiorate.so -debian/tmp/usr/lib/gstreamer-@GST_ABI@/libgstaudioresample.so -debian/tmp/usr/lib/gstreamer-@GST_ABI@/libgstaudiotestsrc.so +debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstadder.so +debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstapp.so +debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstaudioconvert.so +debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstaudiorate.so +debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstaudioresample.so +debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstaudiotestsrc.so @cdparanoia@ -debian/tmp/usr/lib/gstreamer-@GST_ABI@/libgstdecodebin.so -debian/tmp/usr/lib/gstreamer-@GST_ABI@/libgstdecodebin2.so -debian/tmp/usr/lib/gstreamer-@GST_ABI@/libgstencodebin.so -debian/tmp/usr/lib/gstreamer-@GST_ABI@/libgstffmpegcolorspace.so -debian/tmp/usr/lib/gstreamer-@GST_ABI@/libgstgdp.so -debian/tmp/usr/lib/gstreamer-@GST_ABI@/libgstgio.so -debian/tmp/usr/lib/gstreamer-@GST_ABI@/libgstlibvisual.so -debian/tmp/usr/lib/gstreamer-@GST_ABI@/libgstogg.so -debian/tmp/usr/lib/gstreamer-@GST_ABI@/libgstplaybin.so -debian/tmp/usr/lib/gstreamer-@GST_ABI@/libgstsubparse.so -debian/tmp/usr/lib/gstreamer-@GST_ABI@/libgsttcp.so -debian/tmp/usr/lib/gstreamer-@GST_ABI@/libgsttheora.so -debian/tmp/usr/lib/gstreamer-@GST_ABI@/libgsttypefindfunctions.so -debian/tmp/usr/lib/gstreamer-@GST_ABI@/libgstvideorate.so -debian/tmp/usr/lib/gstreamer-@GST_ABI@/libgstvideoscale.so -debian/tmp/usr/lib/gstreamer-@GST_ABI@/libgstvideotestsrc.so -debian/tmp/usr/lib/gstreamer-@GST_ABI@/libgstvolume.so -debian/tmp/usr/lib/gstreamer-@GST_ABI@/libgstvorbis.so +debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstdecodebin.so +debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstdecodebin2.so +debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstencodebin.so +debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstffmpegcolorspace.so +debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstgdp.so +debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstgio.so +debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstlibvisual.so +debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstogg.so +debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstplaybin.so +debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstsubparse.so +debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgsttcp.so +debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgsttheora.so +debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgsttypefindfunctions.so +debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstvideorate.so +debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstvideoscale.so +debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstvideotestsrc.so +debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstvolume.so +debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstvorbis.so === modified file 'debian/gstreamer-x.install' --- debian/gstreamer-x.install 2007-08-03 21:39:38 +0000 +++ debian/gstreamer-x.install 2011-12-09 21:57:41 +0000 @@ -1,3 +1,3 @@ -debian/tmp/usr/lib/gstreamer-@GST_ABI@/libgstpango.so -debian/tmp/usr/lib/gstreamer-@GST_ABI@/libgstximagesink.so -debian/tmp/usr/lib/gstreamer-@GST_ABI@/libgstxvimagesink.so +debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstpango.so +debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstximagesink.so +debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/libgstxvimagesink.so === modified file 'debian/libgstreamer-plugins-base-dev.install' --- debian/libgstreamer-plugins-base-dev.install 2009-09-12 12:56:53 +0000 +++ debian/libgstreamer-plugins-base-dev.install 2011-12-09 21:57:41 +0000 @@ -1,4 +1,4 @@ debian/tmp/usr/include/gstreamer-@GST_ABI@/gst/*/*.h -debian/tmp/usr/lib/*.so -debian/tmp/usr/lib/pkgconfig/*.pc +debian/tmp/usr/lib/*/*.so +debian/tmp/usr/lib/*/pkgconfig/*.pc debian/tmp/usr/share/gir-* === modified file 'debian/libgstreamer-plugins-base.install' --- debian/libgstreamer-plugins-base.install 2009-10-20 12:12:05 +0000 +++ debian/libgstreamer-plugins-base.install 2011-12-09 21:57:41 +0000 @@ -1,14 +1,14 @@ -debian/tmp/usr/lib/libgstaudio-0.10.so.* -debian/tmp/usr/lib/libgstapp-0.10.so.* -debian/tmp/usr/lib/libgstpbutils-0.10.so.* -debian/tmp/usr/lib/libgstcdda-0.10.so.* -debian/tmp/usr/lib/libgstfft-0.10.so.* -debian/tmp/usr/lib/libgstinterfaces-0.10.so.* -debian/tmp/usr/lib/libgstnetbuffer-0.10.so.* -debian/tmp/usr/lib/libgstriff-0.10.so.* -debian/tmp/usr/lib/libgstrtp-0.10.so.* -debian/tmp/usr/lib/libgstrtsp-0.10.so.* -debian/tmp/usr/lib/libgstsdp-0.10.so.* -debian/tmp/usr/lib/libgsttag-0.10.so.* -debian/tmp/usr/lib/libgstvideo-0.10.so.* +debian/tmp/usr/lib/*/libgstaudio-0.10.so.* +debian/tmp/usr/lib/*/libgstapp-0.10.so.* +debian/tmp/usr/lib/*/libgstpbutils-0.10.so.* +debian/tmp/usr/lib/*/libgstcdda-0.10.so.* +debian/tmp/usr/lib/*/libgstfft-0.10.so.* +debian/tmp/usr/lib/*/libgstinterfaces-0.10.so.* +debian/tmp/usr/lib/*/libgstnetbuffer-0.10.so.* +debian/tmp/usr/lib/*/libgstriff-0.10.so.* +debian/tmp/usr/lib/*/libgstrtp-0.10.so.* +debian/tmp/usr/lib/*/libgstrtsp-0.10.so.* +debian/tmp/usr/lib/*/libgstsdp-0.10.so.* +debian/tmp/usr/lib/*/libgsttag-0.10.so.* +debian/tmp/usr/lib/*/libgstvideo-0.10.so.* debian/tmp/usr/share/locale === modified file 'debian/rules' --- debian/rules 2011-05-14 11:46:16 +0000 +++ debian/rules 2011-12-09 22:16:55 +0000 @@ -67,7 +67,7 @@ plugins-base-doc.install \ ifneq ($(DEB_HOST_ARCH_OS),hurd) -cdparanoia := debian/tmp/usr/lib/gstreamer-$(gst_abi)/libgstcdparanoia.so +cdparanoia := debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-$(gst_abi)/libgstcdparanoia.so endif # Let's decide the package name and url depending on the distribution @@ -140,6 +140,7 @@ --enable-DEBUG \ --enable-debug \ --enable-experimental \ + --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \ --with-package-name=$(GST_PACKAGE_NAME) \ --with-package-origin=$(GST_PACKAGE_ORIGIN) \ --with-install-plugins-helper="/usr/bin/gstreamer-codec-install" @@ -167,9 +168,9 @@ binary-post-install/$(gst_pkgname)-plugins-base-apps:: dh_perl -d -DEB_DH_MAKESHLIBS_ARGS_$(gst_plugins_base_lib) += -X "/usr/lib/gstreamer-$(gst_abi)" -V $(gst_plugins_base_lib_dep) -- -c4 +DEB_DH_MAKESHLIBS_ARGS_$(gst_plugins_base_lib) += -X "/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-$(gst_abi)" -V $(gst_plugins_base_lib_dep) -- -c4 DEB_INSTALL_DOCS_ALL += debian/README.Debian NEWS -DEB_SHLIBDEPS_INCLUDE += debian/libgstreamer-plugins-base$(gst_deb_abi)/usr/lib +DEB_SHLIBDEPS_INCLUDE += debian/libgstreamer-plugins-base$(gst_deb_abi)/usr/lib/$(DEB_HOST_MULTIARCH) # Disable inclusion of large upstream ChangeLog DEB_INSTALL_CHANGELOGS_ALL := @@ -181,7 +182,7 @@ common-binary-fixup-arch:: mkdir -p $(CURDIR)/fake-home HOME=$(CURDIR)/fake-home \ - LD_LIBRARY_PATH=debian/libgstreamer-plugins-base0.10-0/usr/lib:$(LD_LIBRARY_PATH) \ + LD_LIBRARY_PATH=debian/libgstreamer-plugins-base0.10-0/usr/lib/$(DEB_HOST_MULTIARCH):$(LD_LIBRARY_PATH) \ dh_gstscancodecs HOME=$(CURDIR)/fake-home \ dh_girepository -pgir1.2-gst-plugins-base-$(gst_abi)