[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.5.12-8-ge6d0d14



The following commit has been merged in the master branch:
commit e6d0d1446d6fae5a16afe733a36492d5685d2188
Author: Niels Thykier <niels@thykier.net>
Date:   Sat Apr 20 11:13:18 2013 +0200

    checks/po-debconf: Remove test for msgcmp and intltool-update
    
    Signed-off-by: Niels Thykier <niels@thykier.net>

diff --git a/checks/po-debconf b/checks/po-debconf
index 1b0eed3..47c5bc8 100644
--- a/checks/po-debconf
+++ b/checks/po-debconf
@@ -126,21 +126,14 @@ if (! -f "$debfiles/po/templates.pot" && ! -l "$debfiles/po/templates.pot") {
     $missing_files = 1;
 }
 
-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';
-        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
-                or tag 'newer-debconf-templates';
-    }
-} else {
-    fail('either msgcmp or intltool-update not found');
+if ($missing_files == 0) {
+    $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
+               or tag 'newer-debconf-templates';
 }
 
-if (! -x '/usr/bin/msgfmt' ) {
-    fail('msgfmt not found');
-}
 opendir(my $po_dirfd, "$debfiles/po");
 while (defined(my $file=readdir($po_dirfd))) {
     next unless $file =~ m/\.po$/;
diff --git a/debian/changelog b/debian/changelog
index 969d9e5..e644283 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,9 @@ lintian (2.5.13) UNRELEASED; urgency=low
     + [NT] Recognise "<dist>-backports-sloppy" as a valid
       distribution.  Thanks to Romain Francoise for the
       report and the patch.  (Closes: #705170)
+  * checks/po-debconf:
+    + [NT] Remove tests for commands that are provided by
+      Lintian's dependencies.
 
   * collection/debfiles:
     + [NT] Replace makeshift "is_ancestor_of" check with the

-- 
Debian package checker


Reply to: