diff options
| author | Iain Lane <laney@debian.org> | 2014-01-09 17:37:23 +0000 |
|---|---|---|
| committer | Iain Lane <laney@debian.org> | 2014-01-09 17:47:14 +0000 |
| commit | b65044377b5231e6ad7380e5d6d8680ffd648c01 (patch) | |
| tree | e198e94a1df2979116f9c22cffa088465eafa1b5 | |
| parent | 09e07c05afff523c2d18f2da833decf3a7f335ef (diff) | |
Drop ltmain-as-needed patch and do the same with dh_autoreconf --as-needed.
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/patches/99_ltmain_as-needed.patch | 32 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 6 |
4 files changed, 10 insertions, 36 deletions
diff --git a/debian/changelog b/debian/changelog index 44d23138..ffe19096 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +gst-plugins-bad1.0 (1.2.2-2) UNRELEASED; urgency=medium + + * Drop ltmain-as-needed patch and do the same with dh_autoreconf + --as-needed. + + -- Iain Lane <laney@debian.org> Thu, 09 Jan 2014 17:30:53 +0000 + gst-plugins-bad1.0 (1.2.2-1) unstable; urgency=medium * New upstream bugfix release. diff --git a/debian/patches/99_ltmain_as-needed.patch b/debian/patches/99_ltmain_as-needed.patch deleted file mode 100644 index 73f5f2f6..00000000 --- a/debian/patches/99_ltmain_as-needed.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff --git a/ltmain.sh b/ltmain.sh -index c7d06c3..7bc27f2 100644 ---- a/ltmain.sh -+++ b/ltmain.sh -@@ -5800,6 +5800,11 @@ func_mode_link () - arg=$func_stripname_result - ;; - -+ -Wl,--as-needed) -+ deplibs="$deplibs $arg" -+ continue -+ ;; -+ - -Wl,*) - func_stripname '-Wl,' '' "$arg" - args=$func_stripname_result -@@ -6163,6 +6168,15 @@ func_mode_link () - 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 --git a/debian/patches/series b/debian/patches/series index d02a58f9..6d1fff2e 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1 @@ 01_fix-modplug-linking.patch -99_ltmain_as-needed.patch diff --git a/debian/rules b/debian/rules index 5a97d135..ad0b51e8 100755 --- a/debian/rules +++ b/debian/rules @@ -3,10 +3,10 @@ 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 + +DEB_DH_AUTORECONF_ARGS += --as-needed -# 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 |