r12274 - in /desktop/unstable/intltool/debian: changelog patches/60_check-configure-ac.patch

[lool at users.alioth.debian.org]

Author: lool
Date: Tue Aug  7 20:53:45 2007
New Revision: 12274

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=12274
Log:
* New patch, 60_check-configure-ac, also check for configure.ac and not
  only configure.in when srcdir != builddir; GNOME #464474; closes: #436447.

Added:
    desktop/unstable/intltool/debian/patches/60_check-configure-ac.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=12274&op=diff
==============================================================================
--- desktop/unstable/intltool/debian/changelog (original)
+++ desktop/unstable/intltool/debian/changelog Tue Aug  7 20:53:45 2007
@@ -1,12 +1,14 @@
-intltool (0.36.0-2) UNRELEASED; urgency=low
+intltool (0.36.0-2) unstable; urgency=low
 
   * Wrap build-deps and deps.
   * Bump debhelper compatibility level to 5 (from 3).
   * Fix watch file.
   * Cleanup copyright.
   * Drop NEWS bits; running intltoolize is required regularly.
-
- -- Loic Minier <lool at dooz.org>  Fri, 03 Aug 2007 11:51:47 +0200
+  * New patch, 60_check-configure-ac, also check for configure.ac and not
+    only configure.in when srcdir != builddir; GNOME #464474; closes: #436447.
+
+ -- Loic Minier <lool at dooz.org>  Tue, 07 Aug 2007 22:52:21 +0200
 
 intltool (0.36.0-1) unstable; urgency=low
 

Added: desktop/unstable/intltool/debian/patches/60_check-configure-ac.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/intltool/debian/patches/60_check-configure-ac.patch?rev=12274&op=file
==============================================================================
--- desktop/unstable/intltool/debian/patches/60_check-configure-ac.patch (added)
+++ desktop/unstable/intltool/debian/patches/60_check-configure-ac.patch Tue Aug  7 20:53:45 2007
@@ -1,0 +1,19 @@
+GNOME #464474, Debian #436447; also check for configure.ac and not only
+configure.in when srcdir != builddir
+
+diff -Nur intltool-0.36.0/intltool-update.in.in intltool-0.36.0.new/intltool-update.in.in
+--- intltool-0.36.0/intltool-update.in.in	2007-08-03 01:35:56.000000000 +0200
++++ intltool-0.36.0.new/intltool-update.in.in	2007-08-07 22:52:11.000000000 +0200
+@@ -1021,7 +1021,11 @@
+ 		    $src_dir =~ s/^top_srcdir[ \t]*=[ \t]*([^ \t\n\r]*)/$1/;
+ 
+ 		    chomp $src_dir;
+-		    $conf_in = "$src_dir" . "/configure.in" . "\n";
++                    if (-f "$src_dir" . "/configure.ac") {
++                        $conf_in = "$src_dir" . "/configure.ac" . "\n";
++                    } else {
++                        $conf_in = "$src_dir" . "/configure.in" . "\n";
++                    }
+ 
+ 		    last;
+ 		}