[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

[SCM] Debian package checker branch, master, updated. 2.4.3-86-gcfd4b14



The following commit has been merged in the master branch:
commit cfd4b14488198c84c3d7503a13dde55c2001b743
Author: Niels Thykier <niels@thykier.net>
Date:   Thu Dec 30 11:51:56 2010 +0100

    Tests for not referring to LGPL license and poor common-licenses
    reference tags.

diff --git a/t/COVERAGE b/t/COVERAGE
index 897d1e0..eda5055 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -24,9 +24,6 @@ control-files control-file-has-bad-owner
 control-files not-allowed-control-file
 control-files unknown-control-file
 
-copyright-file copyright-does-not-refer-to-common-license-file
-copyright-file copyright-should-refer-to-common-license-file-for-lgpl
-
 cruft documentation-package-not-architecture-independent
 cruft source-contains-prebuilt-windows-binary
 
diff --git a/t/tests/copyright-file-general/debian/debian/control.in b/t/tests/copyright-file-general/debian/debian/control.in
index 7d62898..707959e 100644
--- a/t/tests/copyright-file-general/debian/debian/control.in
+++ b/t/tests/copyright-file-general/debian/debian/control.in
@@ -27,6 +27,17 @@ Description: checks inclusion of GPL in full text
  things.  It should not be installed like a regular package.  It may
  be an empty package.
 
+Package: copyright-full-lgpl
+Architecture: all
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Description: checks inclusion of LGPL in full text
+ Tests the tag for including all of the LGPL.
+ .
+ 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-gfdl
 Architecture: all
 Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
@@ -171,3 +182,15 @@ Description: checks for perl packages not pointing to common-licenses
  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-poor-common-licenses
+Architecture: all
+Depends: $\{shlibs:Depends\}, $\{misc:Depends\}
+Description: checks not referring to common licenses
+ Packages should refer to common licenses with full path if they
+ use a common license.
+ .
+ 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.
diff --git a/t/tests/copyright-file-general/debian/debian/copyright-full-lgpl.copyright b/t/tests/copyright-file-general/debian/debian/copyright-full-lgpl.copyright
new file mode 100644
index 0000000..5dabe34
--- /dev/null
+++ b/t/tests/copyright-file-general/debian/debian/copyright-full-lgpl.copyright
@@ -0,0 +1,171 @@
+A copy of the GNU Lesser General Public License is available on
+the World Wide Web at `http://www.gnu.org/licenses/lgpl-3.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 LESSER GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+
+  This version of the GNU Lesser General Public License incorporates
+the terms and conditions of version 3 of the GNU General Public
+License, supplemented by the additional permissions listed below.
+
+  0. Additional Definitions.
+
+  As used herein, "this License" refers to version 3 of the GNU Lesser
+General Public License, and the "GNU GPL" refers to version 3 of the GNU
+General Public License.
+
+  "The Library" refers to a covered work governed by this License,
+other than an Application or a Combined Work as defined below.
+
+  An "Application" is any work that makes use of an interface provided
+by the Library, but which is not otherwise based on the Library.
+Defining a subclass of a class defined by the Library is deemed a mode
+of using an interface provided by the Library.
+
+  A "Combined Work" is a work produced by combining or linking an
+Application with the Library.  The particular version of the Library
+with which the Combined Work was made is also called the "Linked
+Version".
+
+  The "Minimal Corresponding Source" for a Combined Work means the
+Corresponding Source for the Combined Work, excluding any source code
+for portions of the Combined Work that, considered in isolation, are
+based on the Application, and not on the Linked Version.
+
+  The "Corresponding Application Code" for a Combined Work means the
+object code and/or source code for the Application, including any data
+and utility programs needed for reproducing the Combined Work from the
+Application, but excluding the System Libraries of the Combined Work.
+
+  1. Exception to Section 3 of the GNU GPL.
+
+  You may convey a covered work under sections 3 and 4 of this License
+without being bound by section 3 of the GNU GPL.
+
+  2. Conveying Modified Versions.
+
+  If you modify a copy of the Library, and, in your modifications, a
+facility refers to a function or data to be supplied by an Application
+that uses the facility (other than as an argument passed when the
+facility is invoked), then you may convey a copy of the modified
+version:
+
+   a) under this License, provided that you make a good faith effort to
+   ensure that, in the event an Application does not supply the
+   function or data, the facility still operates, and performs
+   whatever part of its purpose remains meaningful, or
+
+   b) under the GNU GPL, with none of the additional permissions of
+   this License applicable to that copy.
+
+  3. Object Code Incorporating Material from Library Header Files.
+
+  The object code form of an Application may incorporate material from
+a header file that is part of the Library.  You may convey such object
+code under terms of your choice, provided that, if the incorporated
+material is not limited to numerical parameters, data structure
+layouts and accessors, or small macros, inline functions and templates
+(ten or fewer lines in length), you do both of the following:
+
+   a) Give prominent notice with each copy of the object code that the
+   Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the object code with a copy of the GNU GPL and this license
+   document.
+
+  4. Combined Works.
+
+  You may convey a Combined Work under terms of your choice that,
+taken together, effectively do not restrict modification of the
+portions of the Library contained in the Combined Work and reverse
+engineering for debugging such modifications, if you also do each of
+the following:
+
+   a) Give prominent notice with each copy of the Combined Work that
+   the Library is used in it and that the Library and its use are
+   covered by this License.
+
+   b) Accompany the Combined Work with a copy of the GNU GPL and this license
+   document.
+
+   c) For a Combined Work that displays copyright notices during
+   execution, include the copyright notice for the Library among
+   these notices, as well as a reference directing the user to the
+   copies of the GNU GPL and this license document.
+
+   d) Do one of the following:
+
+       0) Convey the Minimal Corresponding Source under the terms of this
+       License, and the Corresponding Application Code in a form
+       suitable for, and under terms that permit, the user to
+       recombine or relink the Application with a modified version of
+       the Linked Version to produce a modified Combined Work, in the
+       manner specified by section 6 of the GNU GPL for conveying
+       Corresponding Source.
+
+       1) Use a suitable shared library mechanism for linking with the
+       Library.  A suitable mechanism is one that (a) uses at run time
+       a copy of the Library already present on the user's computer
+       system, and (b) will operate properly with a modified version
+       of the Library that is interface-compatible with the Linked
+       Version.
+
+   e) Provide Installation Information, but only if you would otherwise
+   be required to provide such information under section 6 of the
+   GNU GPL, and only to the extent that such information is
+   necessary to install and execute a modified version of the
+   Combined Work produced by recombining or relinking the
+   Application with a modified version of the Linked Version. (If
+   you use option 4d0, the Installation Information must accompany
+   the Minimal Corresponding Source and Corresponding Application
+   Code. If you use option 4d1, you must provide the Installation
+   Information in the manner specified by section 6 of the GNU GPL
+   for conveying Corresponding Source.)
+
+  5. Combined Libraries.
+
+  You may place library facilities that are a work based on the
+Library side by side in a single library together with other library
+facilities that are not Applications and are not covered by this
+License, and convey such a combined library under terms of your
+choice, if you do both of the following:
+
+   a) Accompany the combined library with a copy of the same work based
+   on the Library, uncombined with any other library facilities,
+   conveyed under the terms of this License.
+
+   b) Give prominent notice with the combined library that part of it
+   is a work based on the Library, and explaining where to find the
+   accompanying uncombined form of the same work.
+
+  6. Revised Versions of the GNU Lesser General Public License.
+
+  The Free Software Foundation may publish revised and/or new versions
+of the GNU Lesser General Public License from time to time. Such new
+versions will be similar in spirit to the present version, but may
+differ in detail to address new problems or concerns.
+
+  Each version is given a distinguishing version number. If the
+Library as you received it specifies that a certain numbered version
+of the GNU Lesser General Public License "or any later version"
+applies to it, you have the option of following the terms and
+conditions either of that published version or of any later version
+published by the Free Software Foundation. If the Library as you
+received it does not specify a version number of the GNU Lesser
+General Public License, you may choose any version of the GNU Lesser
+General Public License ever published by the Free Software Foundation.
+
+  If the Library as you received it specifies that a proxy can decide
+whether future versions of the GNU Lesser General Public License shall
+apply, that proxy's public statement of acceptance of any version is
+permanent authorization for you to choose that version for the
+Library.
diff --git a/t/tests/copyright-file-general/debian/debian/copyright-poor-common-licenses.copyright b/t/tests/copyright-file-general/debian/debian/copyright-poor-common-licenses.copyright
new file mode 100644
index 0000000..5a24980
--- /dev/null
+++ b/t/tests/copyright-file-general/debian/debian/copyright-poor-common-licenses.copyright
@@ -0,0 +1,24 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+    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.
+
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>
+
+The full text of this license is in common-licenses/GPL-3
+
diff --git a/t/tests/copyright-file-general/desc b/t/tests/copyright-file-general/desc
index e904659..4b69a77 100644
--- a/t/tests/copyright-file-general/desc
+++ b/t/tests/copyright-file-general/desc
@@ -5,6 +5,7 @@ Description: Test checking of copyright files
 Test-For:
  FSSTND-dir-in-usr
  copyright-contains-dh-make-perl-boilerplate
+ copyright-does-not-refer-to-common-license-file
  copyright-file-compressed
  copyright-file-contains-full-apache-2-license
  copyright-file-contains-full-gfdl-license
@@ -21,6 +22,7 @@ Test-For:
  copyright-refers-to-problematic-php-license
  copyright-should-refer-to-common-license-file-for-gfdl
  copyright-should-refer-to-common-license-file-for-gpl
+ copyright-should-refer-to-common-license-file-for-lgpl
  copyright-without-copyright-notice
  debian-copyright-file-uses-obsolete-national-encoding
  old-style-copyright-file
diff --git a/t/tests/copyright-file-general/tags b/t/tests/copyright-file-general/tags
index c7cb4cc..2e0fefc 100644
--- a/t/tests/copyright-file-general/tags
+++ b/t/tests/copyright-file-general/tags
@@ -7,6 +7,7 @@ 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-full-lgpl: copyright-should-refer-to-common-license-file-for-lgpl
 E: copyright-misc-errors: copyright-refers-to-compressed-license usr/share/common-licenses/BSD.gz
 E: copyright-misc-errors: copyright-refers-to-incorrect-directory usr/share/common-licences
 E: copyright-misc-errors: copyright-refers-to-old-directory
@@ -15,6 +16,7 @@ E: copyright-old-style: FSSTND-dir-in-usr usr/doc/
 E: copyright-old-style: old-style-copyright-file
 E: copyright-php: copyright-refers-to-bad-php-license
 E: copyright-php: copyright-refers-to-problematic-php-license
+E: copyright-poor-common-licenses: copyright-should-refer-to-common-license-file-for-gpl
 E: copyright-symlink: copyright-file-is-symlink
 W: copyright-compressed: copyright-without-copyright-notice
 W: copyright-full-apache-2: copyright-without-copyright-notice
@@ -24,3 +26,4 @@ W: copyright-misc-errors: copyright-has-url-from-dh_make-boilerplate
 W: copyright-misc-errors: copyright-refers-to-deprecated-bsd-license-file
 W: copyright-misc-errors: copyright-refers-to-nonexistent-license-file usr/share/common-licenses/GPL2
 W: copyright-old-style: copyright-without-copyright-notice
+W: copyright-poor-common-licenses: copyright-does-not-refer-to-common-license-file /GPL-3

-- 
Debian package checker


Reply to: