[Pkg-cli-libs-commits] r3615 - in /packages/gtk-sharp2/branches/2.10.X/debian: changelog patches/00list patches/99_ltmain_as-needed.dpatch patches/avoid_boxing_r96364.dpatch

[slomo at users.alioth.debian.org]

Author: slomo
Date: Fri Feb 29 05:54:39 2008
New Revision: 3615

URL: http://svn.debian.org/wsvn/pkg-cli-libs/?sc=1&rev=3615
Log:
* New upstream bugfix release:
  + debian/patches/avoid_boxing_r96364.dpatch:
    - Dropped, merged upstream.
  + debian/patches/99_ltmain_as-needed.dpatch:
    - Updated to apply cleanly again.

Removed:
    packages/gtk-sharp2/branches/2.10.X/debian/patches/avoid_boxing_r96364.dpatch
Modified:
    packages/gtk-sharp2/branches/2.10.X/debian/changelog
    packages/gtk-sharp2/branches/2.10.X/debian/patches/00list
    packages/gtk-sharp2/branches/2.10.X/debian/patches/99_ltmain_as-needed.dpatch

Modified: packages/gtk-sharp2/branches/2.10.X/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gtk-sharp2/branches/2.10.X/debian/changelog?rev=3615&op=diff
==============================================================================
--- packages/gtk-sharp2/branches/2.10.X/debian/changelog (original)
+++ packages/gtk-sharp2/branches/2.10.X/debian/changelog Fri Feb 29 05:54:39 2008
@@ -1,3 +1,13 @@
+gtk-sharp2 (2.10.4-1) unstable; urgency=low
+
+  * New upstream bugfix release:
+    + debian/patches/avoid_boxing_r96364.dpatch:
+      - Dropped, merged upstream.
+    + debian/patches/99_ltmain_as-needed.dpatch:
+      - Updated to apply cleanly again.
+
+ -- Sebastian Dröge <slomo at debian.org>  Fri, 29 Feb 2008 06:34:08 +0100
+
 gtk-sharp2 (2.10.2-6) unstable; urgency=low
 
   * debian/patches/avoid_boxing_r96364.dpatch:

Modified: packages/gtk-sharp2/branches/2.10.X/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gtk-sharp2/branches/2.10.X/debian/patches/00list?rev=3615&op=diff
==============================================================================
--- packages/gtk-sharp2/branches/2.10.X/debian/patches/00list (original)
+++ packages/gtk-sharp2/branches/2.10.X/debian/patches/00list Fri Feb 29 05:54:39 2008
@@ -1,4 +1,3 @@
 01_glue-locations
 02_missing_dllmaps
-avoid_boxing_r96364
 99_ltmain_as-needed

Modified: packages/gtk-sharp2/branches/2.10.X/debian/patches/99_ltmain_as-needed.dpatch
URL: http://svn.debian.org/wsvn/pkg-cli-libs/packages/gtk-sharp2/branches/2.10.X/debian/patches/99_ltmain_as-needed.dpatch?rev=3615&op=diff
==============================================================================
--- packages/gtk-sharp2/branches/2.10.X/debian/patches/99_ltmain_as-needed.dpatch (original)
+++ packages/gtk-sharp2/branches/2.10.X/debian/patches/99_ltmain_as-needed.dpatch Fri Feb 29 05:54:39 2008
@@ -2,11 +2,9 @@
 
 @DPATCH@
 
-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 @@
+--- gtk-sharp/ltmain.sh.old	2008-02-29 06:36:13.000000000 +0100
++++ gtk-sharp/ltmain.sh	2008-02-29 06:36:48.000000000 +0100
+@@ -1794,6 +1794,11 @@
  	arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
  	;;
  
@@ -14,11 +12,11 @@
 +	deplibs="$deplibs $arg"
 +	continue
 +	;;
-+      
++
        -Wl,*)
  	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
  	arg=
-@@ -2124,6 +2129,15 @@
+@@ -2134,6 +2139,15 @@
  	lib=
  	found=no
  	case $deplib in
@@ -31,6 +29,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"