[SCM] Debian package checker branch, master, updated. 2.4.3-85-g1f4a17f
The following commit has been merged in the master branch:
commit 1f4a17fa965a575858be1e2aff836214a89bb540
Author: Niels Thykier <niels@thykier.net>
Date: Thu Dec 30 11:24:37 2010 +0100
Added full GPL-2 for the sake of completeness and corrected the
description of the GPL-1 test to say that it should trigger an
error now, which it already did.
diff --git a/t/tests/copyright-file-general/debian/debian/control.in b/t/tests/copyright-file-general/debian/debian/control.in
index 6c389d5..7d62898 100644
--- a/t/tests/copyright-file-general/debian/debian/control.in
+++ b/t/tests/copyright-file-general/debian/debian/control.in
@@ -97,8 +97,18 @@ Package: copyright-full-gpl-1
Architecture: all
Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
Description: checks inclusion of GPL1
- This should not trigger any errors as the common license
- files only cover GPL >= 2
+ This should trigger errors as GPL1 is in the common license dir.
+ .
+ This is a test package designed to exercise some feature or tag of
+ Lintian. It is part of the Lintian test suite and may do very odd
+ things. It should not be installed like a regular package. It may
+ be an empty package.
+
+Package: copyright-full-gpl-2
+Architecture: all
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Description: checks inclusion of GPL2
+ This should trigger errors as GPL2 is in the common license dir.
.
This is a test package designed to exercise some feature or tag of
Lintian. It is part of the Lintian test suite and may do very odd
diff --git a/COPYING b/t/tests/copyright-file-general/debian/debian/copyright-full-gpl-2.copyright
similarity index 96%
copy from COPYING
copy to t/tests/copyright-file-general/debian/debian/copyright-full-gpl-2.copyright
index d511905..f94bb0d 100644
--- a/COPYING
+++ b/t/tests/copyright-file-general/debian/debian/copyright-full-gpl-2.copyright
@@ -1,12 +1,17 @@
- GNU GENERAL PUBLIC LICENSE
- Version 2, June 1991
+A copy of the GNU General Public License is available on
+the World Wide Web at `http://www.gnu.org/licenses/gpl-2.0.txt'. You can
+also obtain it by writing to the Free Software Foundation, Inc., 51
+Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
Everyone is permitted to copy and distribute verbatim copies
of this license document, but changing it is not allowed.
- Preamble
+ Preamble
The licenses for most software are designed to take away your
freedom to share and change it. By contrast, the GNU General Public
@@ -56,7 +61,7 @@ patent must be licensed for everyone's free use or not licensed at all.
The precise terms and conditions for copying, distribution and
modification follow.
- GNU GENERAL PUBLIC LICENSE
+ GNU GENERAL PUBLIC LICENSE
TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
0. This License applies to any program or other work which contains
@@ -255,7 +260,7 @@ make exceptions for this. Our decision will be guided by the two goals
of preserving the free status of all derivatives of our free software and
of promoting the sharing and reuse of software generally.
- NO WARRANTY
+ NO WARRANTY
11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
@@ -277,9 +282,9 @@ YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
POSSIBILITY OF SUCH DAMAGES.
- END OF TERMS AND CONDITIONS
+ END OF TERMS AND CONDITIONS
- How to Apply These Terms to Your New Programs
+ How to Apply These Terms to Your New Programs
If you develop a new program, and you want it to be of the greatest
possible use to the public, the best way to achieve this is to make it
diff --git a/t/tests/copyright-file-general/tags b/t/tests/copyright-file-general/tags
index 8a45a0f..c7cb4cc 100644
--- a/t/tests/copyright-file-general/tags
+++ b/t/tests/copyright-file-general/tags
@@ -3,6 +3,8 @@ E: copyright-full-apache-2: copyright-file-contains-full-apache-2-license
E: copyright-full-gfdl: copyright-file-contains-full-gfdl-license
E: copyright-full-gfdl: copyright-should-refer-to-common-license-file-for-gfdl
E: copyright-full-gpl-1: copyright-should-refer-to-common-license-file-for-gpl
+E: copyright-full-gpl-2: copyright-file-contains-full-gpl-license
+E: copyright-full-gpl-2: copyright-should-refer-to-common-license-file-for-lgpl
E: copyright-full-gpl: copyright-file-contains-full-gpl-license
E: copyright-full-gpl: copyright-should-refer-to-common-license-file-for-gpl
E: copyright-misc-errors: copyright-refers-to-compressed-license usr/share/common-licenses/BSD.gz
--
Debian package checker
Reply to: