[Pkg-gstreamer-commits] [orc] 07/10: Use dh-autoreconf to regenerate the autotools generated files during build.

[Sebastian Dröge]

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

slomo pushed a commit to branch master
in repository orc.

commit 4fede30deb970a2061298a999dea8bc1403c8aa3
Author: Sebastian Dröge <sebastian at centricular.com>
Date:   Mon Jun 23 09:52:00 2014 +0200

    Use dh-autoreconf to regenerate the autotools generated files during build.
---
 debian/changelog                         |  3 +++
 debian/control                           |  6 ++++++
 debian/patches/99_ltmain_as-needed.patch | 32 --------------------------------
 debian/patches/series                    |  1 -
 debian/rules                             |  3 +++
 5 files changed, 12 insertions(+), 33 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c4e92a7..7639cd4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 orc (1:0.4.20-1) unstable; urgency=medium
 
   * New upstream bugfix release.
+  * debian/rules,
+    debian/control:
+    + Use dh-autoreconf to regenerate the autotools generated files during build.
 
  -- Sebastian Dröge <slomo at debian.org>  Mon, 23 Jun 2014 09:45:42 +0200
 
diff --git a/debian/control b/debian/control
index 8253e62..c989f80 100644
--- a/debian/control
+++ b/debian/control
@@ -7,6 +7,12 @@ Uploaders: Sebastian Dröge <slomo at debian.org>,
 Build-Depends: autotools-dev,
                cdbs (>= 0.4.93~),
                debhelper (>= 9),
+               autotools-dev,
+               automake (>= 1.11),
+               autoconf (>= 2.68),
+               libtool (>= 2.2.6),
+               dh-autoreconf,
+               pkg-config,
                gtk-doc-tools
 Standards-Version: 3.9.3
 Homepage: http://code.entropywave.com/projects/orc/
diff --git a/debian/patches/99_ltmain_as-needed.patch b/debian/patches/99_ltmain_as-needed.patch
deleted file mode 100644
index 04d925a..0000000
--- a/debian/patches/99_ltmain_as-needed.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: orc/ltmain.sh
-===================================================================
---- orc.orig/ltmain.sh	2013-02-20 10:36:40.017902486 +0100
-+++ orc/ltmain.sh	2013-02-20 10:37:04.481902853 +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 --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 5351e73..715d2de 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,9 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/rules/utils.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/autoreconf.mk
+
+DEB_DH_AUTORECONF_ARGS += --as-needed
 
 DEB_DH_STRIP_ARGS := --dbg-package=liborc-0.4-0-dbg
 DEB_CONFIGURE_EXTRA_FLAGS := --enable-static --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gstreamer/orc.git