[SCM] mjpegtools/master: patch ltmain.sh via autoreconf

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 147569696e2baeee73584b74254b12795b960a73
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sun Sep 2 11:36:17 2012 +0200

    patch ltmain.sh via autoreconf

diff --git a/debian/patches/02_as-needed.patch b/debian/patches/02_as-needed.patch
deleted file mode 100644
index 74fe032..0000000
--- a/debian/patches/02_as-needed.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: mjpegtools/ltmain.sh
-===================================================================
---- mjpegtools.orig/ltmain.sh	2011-04-30 23:56:13.000000000 +0700
-+++ mjpegtools/ltmain.sh	2011-05-01 01:07:19.991597501 +0700
-@@ -4716,6 +4716,11 @@
- 	arg=$func_stripname_result
- 	;;
- 
-+      -Wl,--as-needed)
-+	deplibs="$deplibs $arg"
-+	continue
-+	;;
-+
-       -Wl,*)
- 	func_stripname '-Wl,' '' "$arg"
- 	args=$func_stripname_result
-@@ -5067,6 +5072,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)
- 	  if test "$linkmode,$pass" = "prog,link"; then
- 	    compile_deplibs="$deplib $compile_deplibs"
diff --git a/debian/patches/series b/debian/patches/series
index 19d5901..053b6f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 01_debian-directory.patch
-02_as-needed.patch
 03_disable_optimization.patch
 04_manpage-syntax.patch
 05_ignore_videodev.h_error.patch
diff --git a/debian/rules b/debian/rules
index 9798176..d440f1b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,9 @@
 %:
 	dh $@ --parallel --with autoreconf,autotools_dev
 
+override_dh_autoreconf:
+	dh_autoreconf --as-needed
+
 override_dh_auto_configure:
 	dpkg-source --before-build .
 	dh_auto_configure -- --disable-simd-accel

-- 
mjpegtools packaging