r15604 - in /desktop/unstable/gedit/debian: changelog patches/01_gedit-bugreport-location.patch patches/99_ltmain_as-needed.patch

[slomo at users.alioth.debian.org]

Author: slomo
Date: Wed Apr  9 07:17:04 2008
New Revision: 15604

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=15604
Log:
New upstream bugfix release:
+ debian/patches/01_gedit-bugreport-location.patch,
debian/patches/99_ltmain_as-needed.patch:
- Updated to apply cleanly again.

Modified:
    desktop/unstable/gedit/debian/changelog
    desktop/unstable/gedit/debian/patches/01_gedit-bugreport-location.patch
    desktop/unstable/gedit/debian/patches/99_ltmain_as-needed.patch

Modified: desktop/unstable/gedit/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/changelog?rev=15604&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/changelog (original)
+++ desktop/unstable/gedit/debian/changelog Wed Apr  9 07:17:04 2008
@@ -1,3 +1,12 @@
+gedit (2.22.1-1) unstable; urgency=low
+
+  * New upstream bugfix release:
+    + debian/patches/01_gedit-bugreport-location.patch,
+      debian/patches/99_ltmain_as-needed.patch:
+      - Updated to apply cleanly again.
+
+ -- Sebastian Dröge <slomo at debian.org>  Wed, 09 Apr 2008 08:47:37 +0200
+
 gedit (2.22.0-1) unstable; urgency=low
 
   * New upstream stable release:

Modified: desktop/unstable/gedit/debian/patches/01_gedit-bugreport-location.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/patches/01_gedit-bugreport-location.patch?rev=15604&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/patches/01_gedit-bugreport-location.patch (original)
+++ desktop/unstable/gedit/debian/patches/01_gedit-bugreport-location.patch Wed Apr  9 07:17:04 2008
@@ -1,16 +1,16 @@
---- data/gedit.desktop.in.in	2008-03-17 00:38:41.000000000 +0100
-+++ data/gedit.desktop.in.in.old	2008-03-17 00:38:22.000000000 +0100
+--- data/gedit.desktop.in.in.old	2008-04-09 09:15:23.000000000 +0200
++++ data/gedit.desktop.in.in	2008-04-09 09:15:41.000000000 +0200
 @@ -14,4 +14,4 @@
  X-GNOME-Bugzilla-Product=gedit
  X-GNOME-Bugzilla-Component=general
  X-GNOME-Bugzilla-Version=@VERSION@
 -X-GNOME-Bugzilla-ExtraInfoScript=@FULL_LIBEXECDIR@/gedit-2/gedit-bugreport.sh
 +X-GNOME-Bugzilla-ExtraInfoScript=/usr/lib/gedit-2/gedit-bugreport.sh
---- data/gedit.desktop.in	2008-03-17 00:38:50.000000000 +0100
-+++ data/gedit.desktop.in.old	2008-03-17 00:38:24.000000000 +0100
+--- data/gedit.desktop.in.old	2008-04-09 09:15:26.000000000 +0200
++++ data/gedit.desktop.in	2008-04-09 09:15:39.000000000 +0200
 @@ -14,4 +14,4 @@
  X-GNOME-Bugzilla-Product=gedit
  X-GNOME-Bugzilla-Component=general
- X-GNOME-Bugzilla-Version=2.22.0
--X-GNOME-Bugzilla-ExtraInfoScript=/opt/gnome/libexec/gedit-2/gedit-bugreport.sh
+ X-GNOME-Bugzilla-Version=2.22.1
+-X-GNOME-Bugzilla-ExtraInfoScript=/usr/libexec/gedit-2/gedit-bugreport.sh
 +X-GNOME-Bugzilla-ExtraInfoScript=/usr/lib/gedit-2/gedit-bugreport.sh

Modified: desktop/unstable/gedit/debian/patches/99_ltmain_as-needed.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/gedit/debian/patches/99_ltmain_as-needed.patch?rev=15604&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/patches/99_ltmain_as-needed.patch (original)
+++ desktop/unstable/gedit/debian/patches/99_ltmain_as-needed.patch Wed Apr  9 07:17: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"