r11344 - in /desktop/unstable/gnome-vfs2/debian: changelog patches/99_ltmain_as-needed.patch patches/series

[joss at users.alioth.debian.org]

Author: joss
Date: Wed Jun  6 22:03:15 2007
New Revision: 11344

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=11344
Log:
* libgnomevfs2-common.preinst, libgnomevfs2-extra.preinst: use
* 99_ltmain_as-needed.patch: get --as-needed back to work.

Added:
    desktop/unstable/gnome-vfs2/debian/patches/99_ltmain_as-needed.patch
Modified:
    desktop/unstable/gnome-vfs2/debian/changelog
    desktop/unstable/gnome-vfs2/debian/patches/series

Modified: desktop/unstable/gnome-vfs2/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/changelog?rev=11344&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/changelog (original)
+++ desktop/unstable/gnome-vfs2/debian/changelog Wed Jun  6 22:03:15 2007
@@ -1,9 +1,10 @@
 gnome-vfs2 (1:2.18.1-3) UNRELEASED; urgency=low
 
-  * libgnomevfs2-common.preinst, libgnomevfs2-extra.preinst: use 
+  * libgnomevfs2-common.preinst, libgnomevfs2-extra.preinst: use
     dpkg-query instead of parsing the status file directly.
-
- -- Josselin Mouette <joss at debian.org>  Fri,  1 Jun 2007 09:32:31 +0200
+  * 99_ltmain_as-needed.patch: get --as-needed back to work.
+
+ -- Josselin Mouette <joss at debian.org>  Thu, 07 Jun 2007 00:03:09 +0200
 
 gnome-vfs2 (1:2.18.1-2) unstable; urgency=low
 

Added: desktop/unstable/gnome-vfs2/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/patches/99_ltmain_as-needed.patch?rev=11344&op=file
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/patches/99_ltmain_as-needed.patch (added)
+++ desktop/unstable/gnome-vfs2/debian/patches/99_ltmain_as-needed.patch Wed Jun  6 22:03:15 2007
@@ -1,0 +1,32 @@
+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 @@
+ 	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=
+@@ -2124,6 +2129,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)
+ 	  if test "$linkmode,$pass" = "prog,link"; then
+ 	    compile_deplibs="$deplib $compile_deplibs"

Modified: desktop/unstable/gnome-vfs2/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gnome-vfs2/debian/patches/series?rev=11344&op=diff
==============================================================================
--- desktop/unstable/gnome-vfs2/debian/patches/series (original)
+++ desktop/unstable/gnome-vfs2/debian/patches/series Wed Jun  6 22:03:15 2007
@@ -13,3 +13,4 @@
 20_dont_register_keys_for_gaim.patch
 22_ignore_inaccessible_volumes.patch
 30_nfs4.patch
+99_ltmain_as-needed.patch