[SCM] LibASS packaging branch, master, updated. debian/0.9.6-1-15-gf0cb87c

[xtophe-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 012cf003e4f0653cd1990429d3a561705ba6d884
Author: Christophe Mutricy <xtophe at videolan.org>
Date:   Fri Aug 21 20:43:24 2009 +0100

    Add -Wl,--as-needed to debian/rules and the necessary patch for ltmain.sh

diff --git a/debian/patches/052_as-needed.diff b/debian/patches/052_as-needed.diff
new file mode 100644
index 0000000..60d2d25
--- /dev/null
+++ b/debian/patches/052_as-needed.diff
@@ -0,0 +1,35 @@
+Patch originally taken from the BTS #347650 and then adapted for 
+later libtool version
+
+Index: libass/ltmain.sh
+===================================================================
+--- libass.orig/ltmain.sh	2009-08-21 00:30:16.000000000 +0100
++++ libass/ltmain.sh	2009-08-21 20:09:25.000000000 +0100
+@@ -1807,6 +1807,11 @@
+ 	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
+ 	;;
+ 
++      -Wl,--as-needed)
++	deplibs="$deplibs $arg"
++	continue
++	;;
++
+       -Wl,*)
+ 	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
+ 	arg=
+@@ -2150,6 +2155,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 5e1d119..34689e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 # Patch series for quilt
+052_as-needed.diff
diff --git a/debian/rules b/debian/rules
index ee67c0a..cae0c68 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ CONFFLAGS = $(CROSS)
 CONFFLAGS += --prefix=/usr --mandir=\$${prefix}/share/man 
 CONFFLAGS += --infodir=\$${prefix}/share/info 
 CONFFLAGS += --enable-maintainer-mode
-CONFFLAGS += CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" LIBS="-lm"
+CONFFLAGS += CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs -Wl,--as-needed" LIBS="-lm"
 
 config.status: $(QUILT_STAMPFN) configure
 	dh_testdir

-- 
LibASS packaging