Package: gstreamer0.10
Version: 0.10.35-1
I multiarch it and test it on Ubuntu 11.10, it works well.
And another several package also multiarched.
And I will file bugs for them.
--
YunQiang Su
diff -ur debian/changelog gstreamer0.10-0.10.35/debian/changelog
--- debian/changelog 2011-06-23 14:50:08.000000000 +0800
+++ gstreamer0.10-0.10.35/debian/changelog 2011-11-02 12:39:57.441011417 +0800
@@ -1,3 +1,10 @@
+gstreamer0.10 (0.10.35-2~deepin9) oneiric; urgency=low
+
+ * Multiarch it.
+ * Modify search directory of dh_gstscancodecs.
+
+ -- YunQiang Su <wzss...@gmail.com> Sat, 29 Oct 2011 17:08:39 +0800
+
gstreamer0.10 (0.10.35-1) unstable; urgency=low
* New upstream bugfix release, "Nuclear Fission".
diff -ur debian/compat gstreamer0.10-0.10.35/debian/compat
--- debian/compat 2011-05-10 21:41:23.000000000 +0800
+++ gstreamer0.10-0.10.35/debian/compat 2011-10-29 17:14:28.597846316 +0800
@@ -1 +1 @@
-7
+9
diff -ur debian/control gstreamer0.10-0.10.35/debian/control
--- debian/control 2011-05-10 21:48:11.000000000 +0800
+++ gstreamer0.10-0.10.35/debian/control 2011-10-30 03:28:23.616501313 +0800
@@ -6,8 +6,8 @@
Sebastien Bacher <seb...@debian.org>,
Sebastian Dröge <sl...@debian.org>,
Sjoerd Simons <sjo...@debian.org>
-Build-Depends: debhelper (>= 7),
- cdbs (>= 0.4.20),
+Build-Depends: debhelper (>= 8.1.3),
+ cdbs (>= 0.4.93),
gnome-pkg-tools (>= 0.7),
autotools-dev,
dh-autoreconf,
@@ -39,7 +39,7 @@
netpbm,
libxml2-doc,
libglib2.0-doc
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
Homepage: http://gstreamer.freedesktop.org
Package: libgstreamer0.10-0
@@ -47,6 +47,8 @@
Section: libs
Depends: ${shlibs:Depends},
${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Suggests: gstreamer0.10-tools,
gstreamer0.10-plugins-base
Conflicts: libgstreamer-plugins-base0.10-0 (<< 0.10.11cvs20070110-0ubuntu5),
@@ -134,7 +136,7 @@
Depends: ${shlibs:Depends},
${misc:Depends},
pkg-config,
- libgstreamer0.10-0 (>= 0.10.33)
+ libgstreamer0.10-0 (>= 0.10.35)
Suggests: gstreamer0.10-plugins-base
Description: Tools for use with GStreamer
GStreamer is a streaming media framework, based on graphs of filters
diff -ur debian/control.in gstreamer0.10-0.10.35/debian/control.in
--- debian/control.in 2011-05-10 21:41:23.000000000 +0800
+++ gstreamer0.10-0.10.35/debian/control.in 2011-10-30 03:28:11.272440109 +0800
@@ -6,8 +6,8 @@
Sebastien Bacher <seb...@debian.org>,
Sebastian Dröge <sl...@debian.org>,
Sjoerd Simons <sjo...@debian.org>
-Build-Depends: debhelper (>= 7),
- cdbs (>= 0.4.20),
+Build-Depends: debhelper (>= 8.1.3),
+ cdbs (>= 0.4.93),
gnome-pkg-tools (>= 0.7),
autotools-dev,
dh-autoreconf,
@@ -39,7 +39,7 @@
netpbm,
libxml2-doc,
libglib2.0-doc
-Standards-Version: 3.8.4
+Standards-Version: 3.9.2
Homepage: http://gstreamer.freedesktop.org
Package: @GST_LIB@
@@ -47,6 +47,8 @@
Section: libs
Depends: ${shlibs:Depends},
${misc:Depends}
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
Suggests: @GST_PKGNAME@-tools,
@GST_PKGNAME@-plugins-base
Conflicts: libgstreamer-plugins-base0.10-0 (<< 0.10.11cvs20070110-0ubuntu5),
diff -ur debian/dh_gstscancodecs gstreamer0.10-0.10.35/debian/dh_gstscancodecs
--- debian/dh_gstscancodecs 2011-05-10 21:41:23.000000000 +0800
+++ gstreamer0.10-0.10.35/debian/dh_gstscancodecs 2011-11-02 12:39:34.512897721 +0800
@@ -21,7 +21,7 @@
gstreamer-based applications.
dh_gstscancodecs generates substitution variable for debian/control,
-by scanning libraries /usr/lib/gstreamer-0.10/*.so.
+by scanning libraries /usr/lib/$deb_host_multiarch/gstreamer-0.10/*.so.
The generated substitution variables are
@@ -68,7 +68,9 @@
init();
-$::pluginlibdirprefix = '/usr/lib/gstreamer-';
+my $deb_host_multiarch = `dpkg-architecture -qDEB_HOST_MULTIARCH`;
+chop $deb_host_multiarch;
+$::pluginlibdirprefix = '/usr/lib/'.$deb_host_multiarch.'/gstreamer-';
foreach my $package (@{$dh{DOPACKAGES}}) {
my $tmp = tmpdir($package);
diff -ur debian/gir1.2-gstreamer.install gstreamer0.10-0.10.35/debian/gir1.2-gstreamer.install
--- debian/gir1.2-gstreamer.install 2011-05-10 21:41:23.000000000 +0800
+++ gstreamer0.10-0.10.35/debian/gir1.2-gstreamer.install 2011-10-30 01:51:11.131579584 +0800
@@ -1 +1 @@
-debian/tmp/usr/lib/girepository-*
+debian/tmp/usr/lib/*/girepository-* usr/lib
diff -ur debian/libgstreamer-dev.install gstreamer0.10-0.10.35/debian/libgstreamer-dev.install
--- debian/libgstreamer-dev.install 2011-05-10 21:41:23.000000000 +0800
+++ gstreamer0.10-0.10.35/debian/libgstreamer-dev.install 2011-10-29 17:06:32.599485973 +0800
@@ -1,7 +1,7 @@
debian/tmp/usr/include
-debian/tmp/usr/lib/*.{a,la,so}
-debian/tmp/usr/lib/gstreamer-@GST_ABI@/*.{a,la}
-debian/tmp/usr/lib/pkgconfig
+debian/tmp/usr/lib/*/*.{a,la,so}
+debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/*.{a,la}
+debian/tmp/usr/lib/*/pkgconfig
debian/tmp/usr/share/aclocal
debian/tmp/usr/share/gir-*
debian/tmp/usr/bin/gst-codec-info-@GST_ABI@
diff -ur debian/libgstreamer.install gstreamer0.10-0.10.35/debian/libgstreamer.install
--- debian/libgstreamer.install 2011-05-10 21:41:23.000000000 +0800
+++ gstreamer0.10-0.10.35/debian/libgstreamer.install 2011-10-29 17:07:03.423638816 +0800
@@ -1,4 +1,4 @@
-debian/tmp/usr/lib/gstreamer-@GST_ABI@/*.so
-debian/tmp/usr/lib/gstreamer@GST_ABI@/gstreamer-@GST_ABI@/gst-plugin-scanner
-debian/tmp/usr/lib/*.so.*
+debian/tmp/usr/lib/*/gstreamer-@GST_ABI@/*.so
+debian/tmp/usr/lib/*/gstreamer@GST_ABI@/gstreamer-@GST_ABI@/gst-plugin-scanner
+debian/tmp/usr/lib/*/*.so.*
debian/tmp/usr/share/locale
diff -ur debian/rules gstreamer0.10-0.10.35/debian/rules
--- debian/rules 2011-05-10 21:41:23.000000000 +0800
+++ gstreamer0.10-0.10.35/debian/rules 2011-10-30 03:24:24.887317523 +0800
@@ -178,6 +178,8 @@
-rm -rf $(CURDIR)/fake-home
common_conf_flags = \
+ --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
+ --libexecdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)/$(gst_pkgname) \
--disable-failing-tests \
--disable-examples \
--enable-DEBUG \
@@ -208,9 +210,9 @@
mkdir -p debian/$(gst_pkgname)-doc/usr/share/lintian/overrides/
cp -a debian/$(gst_pkgname)-doc.lintian debian/$(gst_pkgname)-doc/usr/share/lintian/overrides/$(gst_pkgname)-doc
-DEB_DH_MAKESHLIBS_ARGS_$(gst_lib) += -X "/usr/lib/gstreamer-$(gst_abi)" -V $(gst_shlibs_dep) -- -c4
+DEB_DH_MAKESHLIBS_ARGS_$(gst_lib) += -X "/usr/lib/$(DEB_HOST_MULTIARCH)/gstreamer-$(gst_abi)" -V $(gst_shlibs_dep) -- -c4
DEB_INSTALL_DOCS_ALL += debian/README.Debian NEWS
-DEB_SHLIBDEPS_INCLUDE += debian/$(gst_lib)/usr/lib
+DEB_SHLIBDEPS_INCLUDE += debian/$(gst_lib)/usr/lib/$(DEB_HOST_MULTIARCH)
# override shlibs for libraries from this source before computing dependencies
# of packages generated from this source; we already have inter-dependencies
@@ -232,7 +234,7 @@
-rm -f debian/shlibs.local
install/$(gst_lib_dev)::
- gcc -o debian/tmp/usr/bin/gst-codec-info-0.10 debian/gst-codec-info.c $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) `pkg-config --libs --cflags glib-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0 libxml-2.0` debian/tmp/usr/lib/libgstreamer-0.10.so -Idebian/tmp/usr/include/gstreamer-0.10
+ gcc -o debian/tmp/usr/bin/gst-codec-info-0.10 debian/gst-codec-info.c $(CFLAGS) $(CPPFLAGS) $(LDFLAGS) `pkg-config --libs --cflags glib-2.0 gthread-2.0 gmodule-no-export-2.0 gobject-2.0 libxml-2.0` debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/libgstreamer-0.10.so -Idebian/tmp/usr/include/gstreamer-0.10
perldoc -o man debian/dh_gstscancodecs > debian/tmp/usr/share/man/man1/dh_gstscancodecs.1
.PHONY: maint
