[SCM] Debian package checker branch, master, updated. 2.5.12-94-gf9f1b3e
The following commit has been merged in the master branch:
commit ecf1f8f7417970502cfdd1cbb15d2122db9aed84
Author: Bastien ROUCARIÈS <roucaries.bastien@gmail.com>
Date: Sun May 19 11:23:47 2013 +0200
Add variant for dict-fold package
dict-fold use a variant syntax that is ok for gfdl with no invariants.
Allow it.
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/cruft b/checks/cruft
index 1d0d345..ef38b5a 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -488,11 +488,16 @@ sub find_cruft {
# GFDL license, assume it is bad unless it
# explicitly states it has no "bad sections".
given($+{gfdlsections}) {
- when(m/(?:the$s+)? no $s+ Invariant $s+ Sections?,?
- $s+ (?:with$s+)? (?:the$s+)? no $s+ Front-Cover $s+ Texts?,? $s+ (?:and$s+)?
- (?:with$s+)? (?:the$s+)? no $s+ Back-Cover $s+ Texts?/xiso) {
+ when(m/no $s+ Invariant $s+ Sections?,?
+ $s+ (?:with$s+)? (?:the$s+)? no $s+ Front-Cover $s+ Texts?,? $s+ (?:and$s+)?
+ (?:with$s+)? (?:the$s+)? no $s+ Back-Cover $s+ Texts?/xiso) {
# no invariant
}
+ when(m/no $s+ Invariant $s+ Sections?,?
+ $s+ (?:no$s+)? Front-? $s+ or
+ $s+ (?:no$s+)? Back-Cover $s+ Texts?/xiso) {
+ # no invariant variant (dict-foldoc)
+ }
when(m/with $s+ the $s+ Invariant $s+ Sections $s+ being
$s+ (?:\@var\{|<var>)? LIST $s+ THEIR $s+TITLES (?:\}|<\/var>)? $s* ,?
$s+ with $s+ the $s+ Front-Cover $s+ Texts $s+ being
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/variantdictfold.txt b/t/tests/cruft-gfdl-invariants/debian/src/variantdictfold.txt
new file mode 100644
index 0000000..8463a59
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/variantdictfold.txt
@@ -0,0 +1,7 @@
+This is ok
+ Permission is granted to copy, distribute and/or modify this
+ document under the terms of the GNU Free Documentation
+ License, Version 1.1 or any later version published by the
+ Free Software Foundation; with no Invariant Sections, Front-
+ or Back-Cover Texts. A copy of the license is included in the
+ section entitled "{GNU Free Documentation License}".
--
Debian package checker
Reply to: