[SCM] Debian package checker branch, master, updated. 2.5.1-156-g8644ff2
The following commit has been merged in the master branch:
commit 8644ff25144905849c0bafae4a6bce91f8c96975
Author: Niels Thykier <niels@thykier.net>
Date: Thu Jul 28 10:30:15 2011 +0200
Allow @modifier in debconf po files
diff --git a/checks/po-debconf b/checks/po-debconf
index c22a745..2780eaa 100644
--- a/checks/po-debconf
+++ b/checks/po-debconf
@@ -145,7 +145,7 @@ opendir(DEBIAN, "$debfiles/po")
while (defined(my $file=readdir(DEBIAN))) {
next unless $file =~ m/\.po$/;
tag "misnamed-po-file", "debian/po/$file"
- unless ($file =~ /^[a-z]{2,3}(_[A-Z]{2})?\.po$/);
+ unless ($file =~ /^[a-z]{2,3}(_[A-Z]{2})?(?:\@[^\.]+)?\.po$/o);
local ($/) = "\n\n";
$_ = '';
open(PO, '<', "$debfiles/po/$file")
diff --git a/debian/changelog b/debian/changelog
index 2d82500..904918d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -118,6 +118,9 @@ lintian (2.5.2) UNRELEASED; urgency=low
"NMU" in changelogs for suppressing
changelog-should-mention-nmu. Thanks to Jordi Mallach for
the report. (Closes: #620418)
+ * checks/po-debconf:
+ + [NT] Allow po-files with an "@modifier", which works with
+ debconf (>= 1.5.34). (Closes: #617905)
* checks/rules:
+ [NT] Check included files in d/rules against a limited
number of common makefile snippets, which are known not
--
Debian package checker
Reply to: