r14162 - in /desktop/unstable/metacity/debian: changelog patches/99_ltmain_as-needed.patch

[slomo at users.alioth.debian.org]

Author: slomo
Date: Sat Jan 12 06:41:04 2008
New Revision: 14162

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14162
Log:
* 99_ltmain_as-needed.patch: Updated to apply cleanly again.

Modified:
    desktop/unstable/metacity/debian/changelog
    desktop/unstable/metacity/debian/patches/99_ltmain_as-needed.patch

Modified: desktop/unstable/metacity/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/changelog?rev=14162&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/changelog (original)
+++ desktop/unstable/metacity/debian/changelog Sat Jan 12 06:41:04 2008
@@ -7,6 +7,7 @@
   [ Sebastian Dröge ]
   * New upstream bugfix release.
   * Update Standards-Version to 3.7.3, no additional changes needed.
+  * 99_ltmain_as-needed.patch: Updated to apply cleanly again.
 
  -- Sebastian Dröge <slomo at debian.org>  Sat, 12 Jan 2008 07:27:20 +0100
 

Modified: desktop/unstable/metacity/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/metacity/debian/patches/99_ltmain_as-needed.patch?rev=14162&op=diff
==============================================================================
--- desktop/unstable/metacity/debian/patches/99_ltmain_as-needed.patch (original)
+++ desktop/unstable/metacity/debian/patches/99_ltmain_as-needed.patch Sat Jan 12 06:41:04 2008
@@ -1,8 +1,6 @@
-Index: nautilus-2.18.1/ltmain.sh
-===================================================================
---- nautilus-2.18.1.orig/ltmain.sh	2006-07-13 09:12:13.000000000 +0200
-+++ nautilus-2.18.1/ltmain.sh	2007-06-06 23:36:38.899175453 +0200
-@@ -1784,6 +1784,11 @@
+--- ltmain.sh.old	2007-10-09 07:38:25.000000000 +0200
++++ ltmain.sh	2007-10-09 07:39:25.000000000 +0200
+@@ -1794,6 +1794,11 @@
  	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
  	;;
  
@@ -10,11 +8,11 @@
 +	deplibs="$deplibs $arg"
 +	continue
 +	;;
-+      
++
        -Wl,*)
  	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
  	arg=
-@@ -2124,6 +2129,15 @@
+@@ -2137,6 +2142,15 @@
  	lib=
  	found=no
  	case $deplib in
@@ -27,6 +25,6 @@
 +	  fi
 +	  continue
 +	  ;;
- 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
+ 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
  	  if test "$linkmode,$pass" = "prog,link"; then
  	    compile_deplibs="$deplib $compile_deplibs"