diff -Nru gst-plugins-base0.10-0.10.36/debian/changelog gst-plugins-base0.10-0.10.36/debian/changelog --- gst-plugins-base0.10-0.10.36/debian/changelog 2012-12-11 08:08:31.000000000 +0000 +++ gst-plugins-base0.10-0.10.36/debian/changelog 2013-12-16 08:54:26.000000000 +0000 @@ -1,3 +1,11 @@ +gst-plugins-base0.10 (0.10.36-1.1ubuntu2) trusty; urgency=medium + + * Don't bypass libtoolize when calling dh-autoreconf; and drop + debian/patches/99_ltmain_as-needed.patch, we no longer need to patch + ltmain.sh. + + -- Steve Langasek Mon, 16 Dec 2013 00:54:25 -0800 + gst-plugins-base0.10 (0.10.36-1.1ubuntu1) raring; urgency=low * Merge from Debian unstable. Remaining changes: diff -Nru gst-plugins-base0.10-0.10.36/debian/patches/99_ltmain_as-needed.patch gst-plugins-base0.10-0.10.36/debian/patches/99_ltmain_as-needed.patch --- gst-plugins-base0.10-0.10.36/debian/patches/99_ltmain_as-needed.patch 2012-12-11 08:08:31.000000000 +0000 +++ gst-plugins-base0.10-0.10.36/debian/patches/99_ltmain_as-needed.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,32 +0,0 @@ -Index: gst-plugins-base0.10-0.10.36/ltmain.sh -=================================================================== ---- gst-plugins-base0.10-0.10.36.orig/ltmain.sh 2012-12-04 11:22:23.710301877 +0100 -+++ gst-plugins-base0.10-0.10.36/ltmain.sh 2012-12-04 11:23:37.102314806 +0100 -@@ -5800,6 +5800,11 @@ - arg=$func_stripname_result - ;; - -+ -Wl,--as-needed) -+ deplibs="$deplibs $arg" -+ continue -+ ;; -+ - -Wl,*) - func_stripname '-Wl,' '' "$arg" - args=$func_stripname_result -@@ -6163,6 +6168,15 @@ - lib= - found=no - case $deplib in -+ -Wl,--as-needed) -+ if test "$linkmode,$pass" = "prog,link"; then -+ compile_deplibs="$deplib $compile_deplibs" -+ finalize_deplibs="$deplib $finalize_deplibs" -+ else -+ deplibs="$deplib $deplibs" -+ fi -+ continue -+ ;; - -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \ - |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*) - if test "$linkmode,$pass" = "prog,link"; then diff -Nru gst-plugins-base0.10-0.10.36/debian/patches/series gst-plugins-base0.10-0.10.36/debian/patches/series --- gst-plugins-base0.10-0.10.36/debian/patches/series 2012-12-11 08:08:31.000000000 +0000 +++ gst-plugins-base0.10-0.10.36/debian/patches/series 2013-12-16 08:53:01.000000000 +0000 @@ -1,4 +1,3 @@ 10_gnome-vfs-dav-url.patch 98_fix-ogg-flac-transition.patch -99_ltmain_as-needed.patch git_timestamps_discard_issue.patch diff -Nru gst-plugins-base0.10-0.10.36/debian/rules gst-plugins-base0.10-0.10.36/debian/rules --- gst-plugins-base0.10-0.10.36/debian/rules 2012-12-11 08:07:27.000000000 +0000 +++ gst-plugins-base0.10-0.10.36/debian/rules 2013-12-16 08:53:51.000000000 +0000 @@ -3,13 +3,11 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/gnome.mk include /usr/share/cdbs/1/rules/utils.mk --include /usr/share/cdbs/1/rules/autoreconf.mk +include /usr/share/cdbs/1/rules/autoreconf.mk include /usr/share/gnome-pkg-tools/1/rules/clean-la.mk export HOME=$(CURDIR)/fake-home -# make autoreconf not call libtoolize since we ship a patch for ltmain.sh -export LIBTOOLIZE=true # make autoreconf not call autopoint since we ship a patch for po/Makefile.in.in export AUTOPOINT=true