diff options
| author | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2011-12-13 10:20:15 +0100 |
|---|---|---|
| committer | Sebastian Dröge <sebastian.droege@collabora.co.uk> | 2011-12-13 10:20:15 +0100 |
| commit | 540a86ff96822236d23cb05ff7abe0e288c63b28 (patch) | |
| tree | c83541c4925d6eb0869ad65835aa3c0ec9199e90 | |
| parent | 7710299184fcadf590b2dd08e7e59c1266a4e451 (diff) | |
Fix for multi-arch to look in the correct directoriesdebian/0.11.1-2
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rw-r--r-- | debian/dh_gstscancodecs | 14 |
3 files changed, 16 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index fc4d844..94b998d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,12 @@ -gstreamer0.11 (0.11.1-2) UNRELEASED; urgency=low +gstreamer0.11 (0.11.1-2) experimental; urgency=low * debian/control.in: + Build-depend on GLib 2.26. + * debian/dh_gstscancodecs: + + Fix for multi-arch to look in the correct directories. + Patch by YunQiang Su <wzssyqa@gmail.com>. - -- Sebastian Dröge <slomo@debian.org> Mon, 12 Dec 2011 13:05:03 +0100 + -- Sebastian Dröge <slomo@debian.org> Tue, 13 Dec 2011 10:11:55 +0100 gstreamer0.11 (0.11.1-1) experimental; urgency=low diff --git a/debian/control b/debian/control index bb316f1..83d7587 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Build-Depends: debhelper (>= 8.1.3~), autopoint, libxml2-dev (>= 2.6.0), zlib1g-dev (>= 1:1.1.4), - libglib2.0-dev (>= 2.24), + libglib2.0-dev (>= 2.26), libgmp3-dev, libgsl0-dev, pkg-config (>= 0.11.0), diff --git a/debian/dh_gstscancodecs b/debian/dh_gstscancodecs index 36791d0..ef6ad06 100644 --- a/debian/dh_gstscancodecs +++ b/debian/dh_gstscancodecs @@ -21,7 +21,8 @@ codecs, demultiplexers and other media-handling components for gstreamer-based applications. dh_gstscancodecs generates substitution variable for debian/control, -by scanning libraries /usr/lib/gstreamer-0.11/*.so. +by scanning libraries /usr/lib/gstreamer-0.11/*.so and +/usr/lib/$DEB_HOST_MULTIARCH/gstreamer-0.11/*.so. The generated substitution variables are @@ -68,7 +69,10 @@ The standard debhelper options are supported. 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-'; +$::pluginlibdirlegacy = '/usr/lib/gstreamer-'; foreach my $package (@{$dh{DOPACKAGES}}) { my $tmp = tmpdir($package); @@ -79,8 +83,10 @@ foreach my $package (@{$dh{DOPACKAGES}}) { delsubstvar($package, "gstreamer:Encoders"); delsubstvar($package, "gstreamer:Decoders"); - foreach my $sodir (glob "$tmp$::pluginlibdirprefix*") { - my $gstversion= substr($sodir, length("$tmp$::pluginlibdirprefix")); + foreach my $sodir (glob "$tmp$::pluginlibdirprefix* $tmp$::pluginlibdirlegacy*") { + my $gstversion = $sodir; + $gstversion =~ s/^$tmp$::pluginlibdirprefix//; + $gstversion =~ s/^$tmp$::pluginlibdirlegacy//; verbose_print("# gstreamer version $gstversion"); my (undef, $tmpfile) = File::Temp::tempfile("/tmp/".basename($0).".XXXX", UNLINK => 1); |