From 3bee96440b365506da40854996667800336c8776 Mon Sep 17 00:00:00 2001
From: Iain Lane <laney@debian.org>
Date: Thu, 9 Jan 2014 17:56:04 +0000
Subject: Drop ltmain-as-needed and do the same with dh_autoreconf --as-needed.
 Thanks, Logan Rosen. (Closes: #734560)

---
 debian/changelog                         |  7 +++++++
 debian/patches/99_ltmain_as-needed.patch | 32 --------------------------------
 debian/patches/series                    |  1 -
 debian/rules                             |  6 +++---
 4 files changed, 10 insertions(+), 36 deletions(-)
 delete mode 100644 debian/patches/99_ltmain_as-needed.patch
 delete mode 100644 debian/patches/series

diff --git a/debian/changelog b/debian/changelog
index 72b1224..5bfa760 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gst-plugins-ugly1.0 (1.2.2-2) UNRELEASED; urgency=medium
+
+  * Drop ltmain-as-needed and do the same with dh_autoreconf --as-needed.
+    Thanks, Logan Rosen. (Closes: #734560) 
+
+ -- Iain Lane <laney@debian.org>  Thu, 09 Jan 2014 17:55:32 +0000
+
 gst-plugins-ugly1.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 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
deleted file mode 100644
index 2497acb..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-99_ltmain_as-needed.patch
diff --git a/debian/rules b/debian/rules
index 94f3b18..05db8c2 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
 
-- 
cgit v1.2.3