[Pkg-gstreamer-commits] [gst-plugins-base1.0] 04/04: Run libtoolize in autoreconf. Drop ltmain-as-needed patch and use dh_autoreconf --as-needed

[Sebastian Dröge]

This is an automated email from the git hooks/post-receive script.

slomo pushed a commit to branch master
in repository gst-plugins-base1.0.

commit d404f322843909a91d4cb56ba38f80813a45cdac
Author: Sebastian Dröge <sebastian at centricular.com>
Date:   Sun Feb 9 11:18:05 2014 +0100

    Run libtoolize in autoreconf. Drop ltmain-as-needed patch and use dh_autoreconf --as-needed
---
 debian/changelog                         |  3 +++
 debian/patches/99_ltmain_as-needed.patch | 32 --------------------------------
 debian/patches/series                    |  1 -
 debian/rules                             |  6 +++---
 4 files changed, 6 insertions(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8ca44fe..23e9d2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,9 @@ gst-plugins-base1.0 (1.2.3-1) unstable; urgency=medium
   * New upstream bugfix release:
     + debian/libgstreamer-plugins-base.symbols:
       - Add new symbol.
+  * debian/rules:
+    + Run libtoolize in autoreconf. Drop ltmain-as-needed patch
+      and use dh_autoreconf --as-needed.
 
  -- Sebastian Dröge <slomo at debian.org>  Sun, 09 Feb 2014 11:14:56 +0100
 
diff --git a/debian/patches/99_ltmain_as-needed.patch b/debian/patches/99_ltmain_as-needed.patch
deleted file mode 100644
index 73f5f2f..0000000
--- 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 2497acb..e69de29 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +0,0 @@
-99_ltmain_as-needed.patch
diff --git a/debian/rules b/debian/rules
index f13b5b2..b136eda 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,13 +3,13 @@
 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
+DEB_DH_AUTORECONF_ARGS += --as-needed
+
 # make autoreconf not call autopoint since we ship a patch for po/Makefile.in.in
 export AUTOPOINT=true
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gstreamer/gst-plugins-base1.0.git