r1442 - in /experimental/vlc/debian/patches: 052_as-needed.diff 104_notify.diff

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

Author: xtophe-guest
Date: Sat Sep  6 16:17:17 2008
New Revision: 1442

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1442
Log:
Refresh patches

Modified:
    experimental/vlc/debian/patches/052_as-needed.diff
    experimental/vlc/debian/patches/104_notify.diff

Modified: experimental/vlc/debian/patches/052_as-needed.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/patches/052_as-needed.diff?rev=1442&op=diff
==============================================================================
--- experimental/vlc/debian/patches/052_as-needed.diff (original)
+++ experimental/vlc/debian/patches/052_as-needed.diff Sat Sep  6 16:17:17 2008
@@ -1,30 +1,32 @@
---- a/autotools/ltmain.sh.orig	2006-03-29 15:45:36.000000000 +0200
-+++ b/autotools/ltmain.sh	2006-03-29 16:39:30.000000000 +0200
-@@ -1754,6 +1754,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=
-@@ -2094,6 +2099,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"
+Index: vlc-0.9.1/autotools/ltmain.sh
+===================================================================
+--- vlc-0.9.1.orig/autotools/ltmain.sh	2008-04-29 22:21:21.000000000 +0200
++++ vlc-0.9.1/autotools/ltmain.sh	2008-09-04 00:46:24.000000000 +0200
+@@ -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"

Modified: experimental/vlc/debian/patches/104_notify.diff
URL: http://svn.debian.org/wsvn/pkg-multimedia/experimental/vlc/debian/patches/104_notify.diff?rev=1442&op=diff
==============================================================================
--- experimental/vlc/debian/patches/104_notify.diff (original)
+++ experimental/vlc/debian/patches/104_notify.diff Sat Sep  6 16:17:17 2008
@@ -1,8 +1,8 @@
-Index: vlc-debian/modules/misc/notify/notify.c
+Index: vlc-0.9.1/modules/misc/notify/notify.c
 ===================================================================
---- vlc-debian.orig/modules/misc/notify/notify.c	2008-06-01 00:46:01.000000000 +0200
-+++ vlc-debian/modules/misc/notify/notify.c	2008-06-01 11:38:57.000000000 +0200
-@@ -220,13 +220,7 @@
+--- vlc-0.9.1.orig/modules/misc/notify/notify.c	2008-08-25 23:40:43.000000000 +0200
++++ vlc-0.9.1/modules/misc/notify/notify.c	2008-09-04 00:46:24.000000000 +0200
+@@ -216,13 +216,7 @@
          free( psz_arturl );
      }
      else /* else we show state-of-the art logo */