r15147 - in /desktop/experimental/libgnomeui/debian: changelog patches/99_ltmain_as-needed.patch

[slomo at users.alioth.debian.org]

Author: slomo
Date: Fri Mar 14 19:40:57 2008
New Revision: 15147

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

Modified:
    desktop/experimental/libgnomeui/debian/changelog
    desktop/experimental/libgnomeui/debian/patches/99_ltmain_as-needed.patch

Modified: desktop/experimental/libgnomeui/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomeui/debian/changelog?rev=15147&op=diff
==============================================================================
--- desktop/experimental/libgnomeui/debian/changelog (original)
+++ desktop/experimental/libgnomeui/debian/changelog Fri Mar 14 19:40:57 2008
@@ -12,6 +12,8 @@
       - Update shlibs >= 2.22.0 because of new API.
     + debian/libgnomeui-0.install:
       - Ship all file chooser backends, including the GIO one.
+    + debian/patches/99_ltmain_as-needed.patch:
+      - Updated to apply cleanly again.
   * debian/control.in:
     + Update Standards-Version to 3.7.3, no additional changes needed.
 

Modified: desktop/experimental/libgnomeui/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/libgnomeui/debian/patches/99_ltmain_as-needed.patch?rev=15147&op=diff
==============================================================================
--- desktop/experimental/libgnomeui/debian/patches/99_ltmain_as-needed.patch (original)
+++ desktop/experimental/libgnomeui/debian/patches/99_ltmain_as-needed.patch Fri Mar 14 19:40:57 2008
@@ -1,32 +1,30 @@
-diff -Nur libgnomeui-2.20.1.1/ltmain.sh libgnomeui-2.20.1.1.new/ltmain.sh
---- libgnomeui-2.20.1.1/ltmain.sh	2007-02-17 10:05:30.000000000 +0100
-+++ libgnomeui-2.20.1.1.new/ltmain.sh	2007-10-18 12:48:09.000000000 +0200
-@@ -1754,6 +1754,12 @@
+--- ltmain.sh	2007-08-14 18:43:36.000000000 +0100
++++ ltmain.sh.new	2007-12-20 12:07:00.000000000 +0000
+@@ -1793,6 +1793,11 @@
+ 	IFS="$save_ifs"
  	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
  	;;
- 
-+      -Wl,--as-needed)
++        
++       -Wl,--as-needed)
 +        deplibs="$deplibs $arg"
 +        continue
 +        ;;
-+      
-+
+ 
        -Wl,*)
  	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
- 	arg=
-@@ -2094,6 +2100,15 @@
+@@ -2137,6 +2142,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)
++        -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"