[SCM] Debian package checker branch, master, updated. 2.5.12-104-gc8d9f5a
The following commit has been merged in the master branch:
commit c8d9f5ad8f7318756fa46ca3e41f225b010467ad
Author: Bastien ROUCARIÈS <roucaries.bastien@gmail.com>
Date: Mon May 20 13:37:57 2013 +0200
Fix #708957 when GFDL is used in template
Fix #708957 by allowing entities but only on well known files.
Indeed in other files, entities could be the phase of moon or even devil clauses.
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/cruft b/checks/cruft
index 67fc821..b401e35 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -528,6 +528,15 @@ sub find_cruft {
tag 'license-problem-gfdl-invariants-empty', $name;
$licenseproblemhash{'gfdl-invariants'} = 1;
}
+ # fix #708957 about FDL entities in template
+ when(m/with $s+ \&FDLInvariantSections;, $s+ with $s+ \&FDLFrontCoverText;,
+ $s+ and $s+ with $s+ \&FDLBackCoverText;/xiso)
+ {
+ unless($name =~ m/\/customization\/[\w-]+\/entities\/[\w-]+\.docbook$/) {
+ tag 'license-problem-gfdl-invariants', $name;
+ $licenseproblemhash{'gfdl-invariants'} = 1;
+ }
+ }
default {
tag 'license-problem-gfdl-invariants', $name;
$licenseproblemhash{'gfdl-invariants'} = 1;
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/kdoctools/customization/ru/entities/fdl-notice.docbook b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/kdoctools/customization/ru/entities/fdl-notice.docbook
new file mode 100644
index 0000000..0168da6
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/oldfalsepositive/kdoctools/customization/ru/entities/fdl-notice.docbook
@@ -0,0 +1,6 @@
+<para>Permission is granted to copy, distribute and/or modify this
+document under the terms of the GNU Free Documentation License,
+Version 1.2 or any later version published by the Free Software
+Foundation; with &FDLInvariantSections;, with &FDLFrontCoverText;, and
+with &FDLBackCoverText;. A copy of the license is included in <xref linkend="gnu-fdl"/>.</para>
+
--
Debian package checker
Reply to: