[SCM] Debian package checker branch, master, updated. 2.5.11-269-g4fa9095
The following commit has been merged in the master branch:
commit 2ec177b2e226890f2dd433180b1bd07518a41bfb
Author: Niels Thykier <niels@thykier.net>
Date: Fri Apr 5 16:22:46 2013 +0200
checks/po-debconf: Set INTLTOOL_EXTRACT unconditionally
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/po-debconf b/checks/po-debconf
index dbcf872..1b0eed3 100644
--- a/checks/po-debconf
+++ b/checks/po-debconf
@@ -128,7 +128,7 @@ if (! -f "$debfiles/po/templates.pot" && ! -l "$debfiles/po/templates.pot") {
if (-x '/usr/bin/msgcmp' && -x '/usr/share/intltool-debian/intltool-update' ) {
if ($missing_files == 0) {
- $ENV{'INTLTOOL_EXTRACT'} ||= '/usr/share/intltool-debian/intltool-extract';
+ $ENV{'INTLTOOL_EXTRACT'} = '/usr/share/intltool-debian/intltool-extract';
system_env("cd \Q$debfiles/po\E && /usr/share/intltool-debian/intltool-update --gettext-package=test --pot");
system_env("/usr/bin/msgcmp --use-untranslated \Q$debfiles/po/test.pot\E \Q$debfiles/po/templates.pot\E >/dev/null 2>&1"
. "&& /usr/bin/msgcmp --use-untranslated \Q$debfiles/po/templates.pot\E \Q$debfiles/po/test.pot\E >/dev/null 2>&1") == 0
diff --git a/debian/changelog b/debian/changelog
index 164f687..3b28677 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -135,6 +135,8 @@ lintian (2.5.12) UNRELEASED; urgency=low
+ [NT] Retire unneeded-build-dep-on-quilt, it is only a pedantic
tag and apparently not too accurate. Thanks to Charles Plessy
and Frank Kuester for the reports. (Closes: #615516, #681061)
+ * checks/po-debconf:
+ + [NT] Unconditionally set INTLTOOL_EXTRACT.
* checks/rules:
+ [NT] Remove ant1.7 as alternative to ant as ant1.7 has been
removed from Wheezy.
--
Debian package checker
Reply to: