r9975 - in /desktop/unstable/intltool/debian: changelog patches/70_fix-intltool-extract-check.patch

[lool at users.alioth.debian.org]

Author: lool
Date: Sun Apr 15 11:09:20 2007
New Revision: 9975

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=9975
Log:
* New patch, 70_fix-intltool-extract-check, fixes the -x test on
  intltool-extract which did not expand the full PATH; from SVN r674;
  GNOME #413461; closes: #419262.

Added:
    desktop/unstable/intltool/debian/patches/70_fix-intltool-extract-check.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=9975&op=diff
==============================================================================
--- desktop/unstable/intltool/debian/changelog (original)
+++ desktop/unstable/intltool/debian/changelog Sun Apr 15 11:09:20 2007
@@ -1,3 +1,11 @@
+intltool (0.35.5-3) unstable; urgency=low
+
+  * New patch, 70_fix-intltool-extract-check, fixes the -x test on
+    intltool-extract which did not expand the full PATH; from SVN r674;
+    GNOME #413461; closes: #419262.
+
+ -- Loic Minier <lool at dooz.org>  Sun, 15 Apr 2007 13:07:30 +0200
+
 intltool (0.35.5-2) unstable; urgency=low
 
   * Upload to unstable; drop check-dist include.

Added: desktop/unstable/intltool/debian/patches/70_fix-intltool-extract-check.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/intltool/debian/patches/70_fix-intltool-extract-check.patch?rev=9975&op=file
==============================================================================
--- desktop/unstable/intltool/debian/patches/70_fix-intltool-extract-check.patch (added)
+++ desktop/unstable/intltool/debian/patches/70_fix-intltool-extract-check.patch Sun Apr 15 11:09:20 2007
@@ -1,0 +1,37 @@
+From SVN r674; GNOME #413461; Debian #419262; fixes the -x test on
+intltool-extract which did not expand the full PATH; from SVN r674;
+
+2007-03-02  Danilo Å egan  <danilo at gnome.org>
+
+	Fix #413461 (resulting from #399476 fix).
+
+	* intltool-update.in.in (isIntltoolExtractInPath): Added.
+	(GenerateHeaders): Use isIntltoolExtractInPath instead of -x.
+
+Index: intltool-update.in.in
+===================================================================
+--- intltool-update.in.in (révision 673)
++++ intltool-update.in.in (révision 674)
+@@ -563,13 +563,21 @@ sub Console_WriteError_InvalidOption
+     exit 1;
+ }
+ 
++sub isIntltoolExtractInPath
++{
++    my ($file) = @_;
++    # If either a file exists, or when run it returns 0 exit status
++    return 1 if ((-x $file) or (system("$file >/dev/null") == 0));
++    return 0;
++}
++
+ sub GenerateHeaders
+ {
+     my $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} || "intltool-extract";
+ 
+     ## Generate the .h header files, so we can allow glade and
+     ## xml translation support
+-    if (! -x "$EXTRACT")
++    if (! isIntltoolExtractInPath("$EXTRACT"))
+     {
+ 	print STDERR "\n *** The intltool-extract script wasn't found!"
+ 	     ."\n *** Without it, intltool-update can not generate files.\n";