r14576 - in /desktop/unstable/intltool/debian: changelog patches/60_makevars-continuations.patch

[lool at users.alioth.debian.org]

Author: lool
Date: Thu Feb 14 17:20:41 2008
New Revision: 14576

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=14576
Log:
* New patch, 60_makevars-continuations, unwraps variable definitions on
  multiple lines split with a trailing \; GNOME #516501.

Added:
    desktop/unstable/intltool/debian/patches/60_makevars-continuations.patch
Modified:
    desktop/unstable/intltool/debian/changelog

Modified: desktop/unstable/intltool/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/intltool/debian/changelog?rev=14576&op=diff
==============================================================================
--- desktop/unstable/intltool/debian/changelog (original)
+++ desktop/unstable/intltool/debian/changelog Thu Feb 14 17:20:41 2008
@@ -1,3 +1,10 @@
+intltool (0.37.0-2) unstable; urgency=low
+
+  * New patch, 60_makevars-continuations, unwraps variable definitions on
+    multiple lines split with a trailing \; GNOME #516501.
+
+ -- Loic Minier <lool at dooz.org>  Thu, 14 Feb 2008 18:14:55 +0100
+
 intltool (0.37.0-1) unstable; urgency=low
 
   * New upstream release with feature additions.

Added: desktop/unstable/intltool/debian/patches/60_makevars-continuations.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/intltool/debian/patches/60_makevars-continuations.patch?rev=14576&op=file
==============================================================================
--- desktop/unstable/intltool/debian/patches/60_makevars-continuations.patch (added)
+++ desktop/unstable/intltool/debian/patches/60_makevars-continuations.patch Thu Feb 14 17:20:41 2008
@@ -1,0 +1,16 @@
+GNOME #516501; unwraps variable definitions on multiple lines split with a
+trailing \
+
+Index: intltool-update.in.in
+===================================================================
+--- intltool-update.in.in (revision 716)
++++ intltool-update.in.in (working copy)
+@@ -1115,6 +1115,8 @@ sub FindPOTKeywords
+ 	close IN;
+     }
+ 
++    # unwrap lines split with a trailing \
++    $make_source =~  s/\\ $ \n/ /mxg;
+     $keywords = $1 if $make_source =~ /^$varname[ ]*=\[?([^\n\]]+)/m;
+     
+     return $keywords;