[Pkg-gstreamer-commits] [gst-plugins-base0.10] 01/04: Imported Debian patch 0.10.36-1.2

[Iain Lane]

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

laney pushed a commit to branch master
in repository gst-plugins-base0.10.

commit 4b84e534ac93d03e327da4279c9125ad0a4f4142
Author: Aurelien Jarno <aurel32 at debian.org>
Date:   Thu Aug 28 21:03:53 2014 +0200

    Imported Debian patch 0.10.36-1.2
---
 debian/changelog                         | 11 +++++++++++
 debian/patches/99_ltmain_as-needed.patch | 32 --------------------------------
 debian/patches/series                    |  1 -
 debian/rules                             |  4 +---
 4 files changed, 12 insertions(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1f77fa4..e55609f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+gst-plugins-base0.10 (0.10.36-1.2) unstable; urgency=medium
+
+  * Non-maintainer upload with maintainer permission.
+    + debian/rules: also run libtoolize as part of dh-autoreconf (Closes:
+    #759532).
+    + patches/99_ltmain_as-needed.patch: remove as dh-autreconf will
+    regenerate this file with -Wl,--as-needed which is now the default in
+    Debian.
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Thu, 28 Aug 2014 21:03:53 +0200
+
 gst-plugins-base0.10 (0.10.36-1.1) unstable; urgency=low
 
   * Non-maintainer upload.
diff --git a/debian/patches/99_ltmain_as-needed.patch b/debian/patches/99_ltmain_as-needed.patch
deleted file mode 100644
index efe6565..0000000
--- a/debian/patches/99_ltmain_as-needed.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-Index: gst-plugins-base0.10-0.10.36/ltmain.sh
-===================================================================
---- gst-plugins-base0.10-0.10.36.orig/ltmain.sh	2012-12-04 11:22:23.710301877 +0100
-+++ gst-plugins-base0.10-0.10.36/ltmain.sh	2012-12-04 11:23:37.102314806 +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 9463cbb..6022448 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 10_gnome-vfs-dav-url.patch
 98_fix-ogg-flac-transition.patch
-99_ltmain_as-needed.patch
diff --git a/debian/rules b/debian/rules
index ec4b4bc..be90fa6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,13 +3,11 @@
 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
 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
 # 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/gst-plugins-base0.10.git