Merge lp:~seb128/pkgbinarymangler/smallfixes into lp:ubuntu/precise/pkgbinarymangler

[Sebastien Bacher]

  dh_translations:

  - close the correct file in the configure.ac case
  - try using configure.in after configure.ac, those are still common
  - get the gettext domain from config.h if possible, the configure.ac can use
  variables and reading from it would give the wrong value

using config.h should handle cases where configure.ac has GETTEXT_DOMAIN="$PACKAGE" (gdk-pixbuf for example)

[Martin Pitt (pitti)]

Looks good, please go ahead and merge with a changelog.

review: Approve

[Sebastien Bacher (seb128)]

there was a small error in the config.h regexp, fixed that, added the changelog and merging in trunk

=== modified file 'dh_translations'
--- dh_translations	2011-10-26 07:49:19 +0000
+++ dh_translations	2012-01-05 12:00:39 +0000
@@ -56,7 +56,21 @@
 
 	    $domain = $1 if /^GETTEXT_PACKAGE\s*=\s*(\S*)/;
 	}
-	close (MAKEFILE);
+	close (CFGFILE);
+    }
+    if (!$domain && open CFGFILE, 'configure.in') {
+	while (<CFGFILE>) {
+	    $use_intltool = 1 if /INTLTOOL/;
+
+	    $domain = $1 if /^GETTEXT_PACKAGE\s*=\s*(\S*)/;
+	}
+	close (CFGFILE);
+    }
+    if (open CFGFILE, 'config.h') {
+	while (<CFGFILE>) {
+	    $domain = $1 if /^GETTEXT_PACKAGE\s*=\s*(\S*)/;
+	}
+	close (CFGFILE);
     }
     if (!$domain && open CFGFILE, 'setup.cfg') {
 	while (<CFGFILE>) {