[SCM] vlc/master: Call dh_autoreconf with --as-needed and drop 052_as-needed.patch.
bdrung at users.alioth.debian.org
bdrung at users.alioth.debian.org
Fri Jul 8 22:21:39 UTC 2011
The following commit has been merged in the master branch:
commit 27ba48042d21ab15a1aef11753b3c383129950be
Author: Benjamin Drung <bdrung at debian.org>
Date: Sat Jul 9 00:21:35 2011 +0200
Call dh_autoreconf with --as-needed and drop 052_as-needed.patch.
diff --git a/debian/patches/052_as-needed.patch b/debian/patches/052_as-needed.patch
deleted file mode 100644
index c6e5895..0000000
--- a/debian/patches/052_as-needed.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: Fix incorrect argument reordering
-Bug-Debian: http://bugs.debian.org/347650
-
---- a/autotools/ltmain.sh
-+++ b/autotools/ltmain.sh
-@@ -5787,6 +5787,11 @@
- arg=$func_stripname_result
- ;;
-
-+ -Wl,--as-needed)
-+ deplibs="$deplibs $arg"
-+ continue
-+ ;;
-+
- -Wl,*)
- func_stripname '-Wl,' '' "$arg"
- args=$func_stripname_result
-@@ -6150,6 +6155,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/rules b/debian/rules
index d33c14a..54d04c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -138,6 +138,9 @@ endif
%:
dh $@ --parallel --with autoreconf
+override_dh_autoreconf:
+ dh_autoreconf --as-needed
+
override_dh_auto_clean:
[ ! -f debian/vlc-nox.install.bak ] || mv -f debian/vlc-nox.install.bak \
debian/vlc-nox.install
--
VLC media player packaging
More information about the pkg-multimedia-commits
mailing list