r16107 - 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: Thu May 29 08:07:17 2008
New Revision: 16107

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=16107
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=16107&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/changelog (original)
+++ desktop/unstable/gedit/debian/changelog Thu May 29 08:07:17 2008
@@ -1,6 +1,9 @@
 gedit (2.22.3-1) unstable; urgency=low
 
-  * New upstream bugfix release.
+  * 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>  Thu, 29 May 2008 09:52:41 +0200
 

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=16107&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/patches/01_gedit-bugreport-location.patch (original)
+++ desktop/unstable/gedit/debian/patches/01_gedit-bugreport-location.patch Thu May 29 08:07:17 2008
@@ -11,6 +11,6 @@
 @@ -14,4 +14,4 @@
  X-GNOME-Bugzilla-Product=gedit
  X-GNOME-Bugzilla-Component=general
- X-GNOME-Bugzilla-Version=2.22.1
--X-GNOME-Bugzilla-ExtraInfoScript=/usr/libexec/gedit-2/gedit-bugreport.sh
+ X-GNOME-Bugzilla-Version=2.22.3
+-X-GNOME-Bugzilla-ExtraInfoScript=/opt/gnome/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=16107&op=diff
==============================================================================
--- desktop/unstable/gedit/debian/patches/99_ltmain_as-needed.patch (original)
+++ desktop/unstable/gedit/debian/patches/99_ltmain_as-needed.patch Thu May 29 08:07:17 2008
@@ -1,6 +1,8 @@
---- 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 @@
+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/^ //"`
  	;;
  
@@ -8,11 +10,11 @@
 +	deplibs="$deplibs $arg"
 +	continue
 +	;;
-+
++      
        -Wl,*)
  	args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
  	arg=
-@@ -2137,6 +2142,15 @@
+@@ -2124,6 +2129,15 @@
  	lib=
  	found=no
  	case $deplib in
@@ -25,6 +27,6 @@
 +	  fi
 +	  continue
 +	  ;;
- 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+ 	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe)
  	  if test "$linkmode,$pass" = "prog,link"; then
  	    compile_deplibs="$deplib $compile_deplibs"