[Pkg-gstreamer-commits] [gstreamer1.0] 01/01: Run libtoolize in autoreconf. Drop ltmain-as-needed patch and use dh_autoreconf --as-needed.
Iain Lane
laney at moszumanska.debian.org
Thu Jan 9 16:57:17 UTC 2014
This is an automated email from the git hooks/post-receive script.
laney pushed a commit to branch master
in repository gstreamer1.0.
commit 540c0cc8047b52ff522e2675559a4b18620abc5d
Author: Iain Lane <laney at debian.org>
Date: Thu Jan 9 16:35:06 2014 +0000
Run libtoolize in autoreconf. Drop ltmain-as-needed patch and use dh_autoreconf --as-needed.
---
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(-)
diff --git a/debian/changelog b/debian/changelog
index 1d8ada6..285e49d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+gstreamer1.0 (1.2.2-2) UNRELEASED; urgency=medium
+
+ * Run libtoolize in autoreconf. Drop ltmain-as-needed patch and use
+ dh_autoreconf --as-needed.
+
+ -- Iain Lane <laney at debian.org> Thu, 09 Jan 2014 16:34:23 +0000
+
gstreamer1.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 4485fb8..5aab7dd 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/autotools.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/gstreamer1.0.git
More information about the Pkg-gstreamer-commits
mailing list