[SCM] Debian package checker branch, master, updated. 2.5.10-97-gcb86b26
The following commit has been merged in the master branch:
commit cb86b26250750244fdfc85fc7d8710f01c8d2659
Author: Niels Thykier <niels@thykier.net>
Date: Wed Jul 25 11:21:48 2012 +0200
t: Extend debconf-templates-general
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/t/COVERAGE b/t/COVERAGE
index 92d4f67..f57a8e1 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,5 +1,5 @@
Last generated 2012-07-25
-Coverage (Tags): 874/962 (90.85%), w. legacy tests: 944/962 (98.13%)
+Coverage (Tags): 875/962 (90.96%), w. legacy tests: 944/962 (98.13%)
Coverage (Checks): 32/41 (78.05%), w. legacy tests: 35/41 (85.37%)
The following tags are not tested by the test suite:
@@ -38,7 +38,6 @@ binaries unstripped-binary-or-object
debconf missing-debconf-dependency
debconf no-debconf-templates
-debconf template-uses-unsplit-choices
files desktop-file-in-wrong-dir
files package-contains-devhelp-file-without-symlink
@@ -148,7 +147,6 @@ binary
debconf
missing-debconf-dependency
newer-debconf-templates
- template-uses-unsplit-choices
udeb-postinst-must-not-call-ldconfig
unknown-encoding-in-po-file
diff --git a/t/tests/debconf-templates-general/debian/debian/po/da.po b/t/tests/debconf-templates-general/debian/debian/po/da.po
index e7cceb3..6cadcbe 100644
--- a/t/tests/debconf-templates-general/debian/debian/po/da.po
+++ b/t/tests/debconf-templates-general/debian/debian/po/da.po
@@ -7,13 +7,13 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-23 23:07+0200\n"
+"POT-Creation-Date: 2012-07-25 11:04+0200\n"
"PO-Revision-Date: 2012-07-23 23:08+0200\n"
"Last-Translator: Niels Thykier <niels@thykier.net>\n"
"Language-Team: Danish\n"
"Language: da\n"
"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=ASCII\n"
+"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
@@ -22,3 +22,9 @@ msgstr ""
#: ../templates:1001
msgid "Useless note"
msgstr "Ubrugelig note"
+
+#. Type: select
+#. Choices
+#: ../templates:2001
+msgid "left, right, up, down"
+msgstr "venstre, højre, op, ned"
diff --git a/t/tests/debconf-templates-general/debian/debian/po/templates.pot b/t/tests/debconf-templates-general/debian/debian/po/templates.pot
index 3edd4a9..381c779 100644
--- a/t/tests/debconf-templates-general/debian/debian/po/templates.pot
+++ b/t/tests/debconf-templates-general/debian/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-07-23 23:07+0200\n"
+"POT-Creation-Date: 2012-07-25 11:04+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,3 +22,9 @@ msgstr ""
#: ../templates:1001
msgid "Useless note"
msgstr ""
+
+#. Type: select
+#. Choices
+#: ../templates:2001
+msgid "left, right, up, down"
+msgstr ""
diff --git a/t/tests/debconf-templates-general/debian/debian/templates b/t/tests/debconf-templates-general/debian/debian/templates
index 94fba1d..1f969c3 100644
--- a/t/tests/debconf-templates-general/debian/debian/templates
+++ b/t/tests/debconf-templates-general/debian/debian/templates
@@ -2,6 +2,11 @@ Template: debconf/translated
Type: error
_Description: Useless note
+Template: debconf/unsplit-choices
+Type: select
+_Choices: left, right, up, down
+Description: Pick the odd one out
+
Type: text
Description: Missing template field.
diff --git a/t/tests/debconf-templates-general/desc b/t/tests/debconf-templates-general/desc
index b6efd5e..58c4309 100644
--- a/t/tests/debconf-templates-general/desc
+++ b/t/tests/debconf-templates-general/desc
@@ -17,6 +17,7 @@ Test-For:
no-template-type
select-with-boolean-choices
select-without-choices
+ template-uses-unsplit-choices
too-long-extended-description-in-templates
too-long-short-description-in-templates
unknown-field-in-templates
diff --git a/t/tests/debconf-templates-general/tags b/t/tests/debconf-templates-general/tags
index a1e6cfd..3dfce0b 100644
--- a/t/tests/debconf-templates-general/tags
+++ b/t/tests/debconf-templates-general/tags
@@ -8,6 +8,7 @@ E: debconf-templates-general: no-template-type debconf/no-type
E: debconf-templates-general: select-without-choices debconf/select-without-choices
E: debconf-templates-general: unknown-field-in-templates debconf/unknown-field unknown-field
E: debconf-templates-general: unknown-template-type lintian
+W: debconf-templates-general source: template-uses-unsplit-choices debconf-templates-general - debconf/unsplit-choices
W: debconf-templates-general: duplicate-long-description-in-template debconf/duplicate-long-desc
W: debconf-templates-general: making-assumptions-about-interfaces-in-templates debconf/assumption
W: debconf-templates-general: malformed-prompt-in-templates debconf/malformed-prompt
--
Debian package checker
Reply to: