[SCM] Debian package checker branch, master, updated. 2.5.12-94-gf9f1b3e
The following commit has been merged in the master branch:
commit 58a132c352648dba0815def5f2bf40b1da860bd6
Author: Bastien ROUCARIÈS <roucaries.bastien@gmail.com>
Date: Sat May 18 17:50:11 2013 +0200
Allow patch symbols as space for gfdl detection
Allow (\n\+|\n-|\n!|\n<|\n>) aka patch marker for gdfl detection
[nthykier:
* Use a character class rather than alternatives
* Merge of patches 0002 and 0004.
]
Signed-off-by: Niels Thykier <niels@thykier.net>
diff --git a/checks/cruft b/checks/cruft
index dacc992..da69b35 100644
--- a/checks/cruft
+++ b/checks/cruft
@@ -484,7 +484,7 @@ sub find_cruft {
A \s+ copy \s+ of \s+ the \s+ license \s+ is \s+ included/xis) {
if (!exists $licenseproblemhash{'gfdl-invariants'}) {
# local space
- my $s = '(?:\s|\@c|%)';
+ my $s = '(?:\s|\@c|%|\n[-\+!<>])';
# GFDL license, assume it is bad unless it
# explicitly states it has no "bad sections".
given($+{gfdlsections}) {
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/patch-R.diff b/t/tests/cruft-gfdl-invariants/debian/src/patch-R.diff
new file mode 100644
index 0000000..73e379b
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/patch-R.diff
@@ -0,0 +1,7 @@
+1,6d0
+< Permission is granted to copy, distribute and/or modify this
+< document under the terms of the GNU Free Documentation License,
+< version 1.3 or any later version published by the Free Software
+< Foundation; with no Invariant Sections, no Front-Cover Texts and
+< no Back-Cover Texts. A copy of the license is included in the
+< section entitled "GNU Free Documentation License".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/patch-c0.diff b/t/tests/cruft-gfdl-invariants/debian/src/patch-c0.diff
new file mode 100644
index 0000000..600653e
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/patch-c0.diff
@@ -0,0 +1,18 @@
+*** make-stds.texi 2013-02-17 21:44:05.485250349 +0100
+--- normal.texi 2012-12-20 21:23:22.829397718 +0100
+***************
+*** 1,7 ****
+! @c Permission is granted to copy, distribute and/or modify this document
+! @c under the terms of the GNU Free Documentation License, Version 1.1
+! @c or any later version published by the Free Software Foundation;
+! @c with no Invariant Sections, with no
+! @c Front-Cover Texts, and with no Back-Cover Texts.
+! @c A copy of the license is included in the section entitled ``GNU
+! @c Free Documentation License''.
+--- 1,6 ----
+! Permission is granted to copy, distribute and/or modify this
+! document under the terms of the GNU Free Documentation License,
+! version 1.3 or any later version published by the Free Software
+! Foundation; with no Invariant Sections, no Front-Cover Texts and
+! no Back-Cover Texts. A copy of the license is included in the
+! section entitled "GNU Free Documentation License".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/patch-u.diff b/t/tests/cruft-gfdl-invariants/debian/src/patch-u.diff
new file mode 100644
index 0000000..db6e4f9
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/patch-u.diff
@@ -0,0 +1,9 @@
+--- /dev/null 2013-05-15 23:18:30.206386135 +0200
++++ normal.texi 2012-12-20 21:23:22.829397718 +0100
+@@ -0,0 +1,6 @@
++Permission is granted to copy, distribute and/or modify this
++document under the terms of the GNU Free Documentation License,
++version 1.3 or any later version published by the Free Software
++Foundation; with no Invariant Sections, no Front-Cover Texts and
++no Back-Cover Texts. A copy of the license is included in the
++section entitled "GNU Free Documentation License".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/patch-uR.diff b/t/tests/cruft-gfdl-invariants/debian/src/patch-uR.diff
new file mode 100644
index 0000000..347adff
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/patch-uR.diff
@@ -0,0 +1,9 @@
+--- normal.texi 2012-12-20 21:23:22.829397718 +0100
++++ /dev/null 2013-05-15 23:18:30.206386135 +0200
+@@ -1,6 +0,0 @@
+-Permission is granted to copy, distribute and/or modify this
+-document under the terms of the GNU Free Documentation License,
+-version 1.3 or any later version published by the Free Software
+-Foundation; with no Invariant Sections, no Front-Cover Texts and
+-no Back-Cover Texts. A copy of the license is included in the
+-section entitled "GNU Free Documentation License".
diff --git a/t/tests/cruft-gfdl-invariants/debian/src/patch.diff b/t/tests/cruft-gfdl-invariants/debian/src/patch.diff
new file mode 100644
index 0000000..f64bfaf
--- /dev/null
+++ b/t/tests/cruft-gfdl-invariants/debian/src/patch.diff
@@ -0,0 +1,7 @@
+0a1,6
+> Permission is granted to copy, distribute and/or modify this
+> document under the terms of the GNU Free Documentation License,
+> version 1.3 or any later version published by the Free Software
+> Foundation; with no Invariant Sections, no Front-Cover Texts and
+> no Back-Cover Texts. A copy of the license is included in the
+> section entitled "GNU Free Documentation License".
--
Debian package checker
Reply to: