Changeset 3520

Timestamp:

04/09/08 10:42:44 (5 years ago)

Author:

alanbach-guest

Message:

• New upstream bugfix release
  • dropped 01_gedit-bugreport-location.patch,

merged upstream

• refreshed 99_ltmain_as-needed.patch

Location:

pkg/viola/main/gedit/trunk/debian

Files:

• changelog (modified) (1 diff)
• patches/01_gedit-bugreport-location.patch (deleted)
• patches/99_ltmain_as-needed.patch (modified) (2 diffs)

pkg/viola/main/gedit/trunk/debian/changelog

@@ +1 @@
+gedit (2.22.1-parsix1) unstable; urgency=low
+
+  * New upstream bugfix release
+    -  dropped 01_gedit-bugreport-location.patch, 
+       merged upstream
+    - refreshed 99_ltmain_as-needed.patch 
+
+ -- Alan Baghumian <alan@technotux.org>  Wed, 09 Apr 2008 10:40:28 +0200
+
 gedit (2.22.0-parsix2) unstable; urgency=low
 

pkg/viola/main/gedit/trunk/debian/patches/99_ltmain_as-needed.patch

@@ -1 @@
-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 @@
+diff -urN gedit-2.22.1/ltmain.sh gedit-2.22.1.new/ltmain.sh
+--- gedit-2.22.1/ltmain.sh      2008-02-08 01:54:46.000000000 +0100
++++ gedit-2.22.1.new/ltmain.sh  2008-04-09 10:38:23.000000000 +0200
+@@ -1807,6 +1807,11 @@
         arg=`$echo "X$arg" | $Xsed -e "s/^ //"`
         ;;
@@ -15 +14 @@
         args=`$echo "X$arg" | $Xsed -e "$sed_quote_subst" -e 's/^-Wl,//'`
         arg=
-@@ -2124,6 +2129,15 @@
+@@ -2150,6 +2155,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"