debian/copyright: Reference GPL-2 in addition to GPL (latest version).

GPL2-only is used by some files.

diff --git a/debian/changelog b/debian/changelog
index 311a9e843a3e28eacae84ade9348b40083dd01c1..9a32a0e769ff7a48a46872abeb2a2885535c65bc 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -51,8 +51,11 @@ collectd (4.6.1-1) unstable; urgency=low
     - Start the daemon using start-stop-daemon's --oknodo option to exit
       successfully if the daemon is already running as requested by section
       9.3.2 of the Debian Policy 3.8.1.
+  * debian/copyright:
+    - Reference GPL-2 in addition to GPL (latest version), since GPL2-only is
+      used by some files.
 
- -- Sebastian Harl <sh@tokkee.org>  Sun, 15 Mar 2009 21:27:49 +0100
+ -- Sebastian Harl <sh@tokkee.org>  Sun, 22 Mar 2009 23:20:48 +0100
 
 collectd (4.5.1-1) experimental; urgency=low
 

diff --git a/debian/copyright b/debian/copyright
index a13b787425394a4777717b2810df8c4962af8ec0..a945d1660cb5c765bfabc2da1a84a95203bc046a 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -247,14 +247,15 @@ Licenses:
 
        You should have received a copy of the GNU General Public License
        along with this package; if not, write to the Free Software
-       Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, 
+       Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
        USA.
 
        Some files are licensed under version 2 only, while any others allow to
        use version 2 or (at your option) any later version.
 
-On Debian systems, the complete text of the GNU General Public License 
-can be found in `/usr/share/common-licenses/GPL'.
+On Debian systems, the complete text of the GNU General Public License,
+version 2, can be found in `/usr/share/common-licenses/GPL-2'. The complete
+text of the latest version can be found in `/usr/share/common-licenses/GPL'.
 
        File libltdl/ltdl.c
        Copyright © 1998-2001, 2003-2007 Free Software Foundation, Inc.
@@ -278,10 +279,10 @@ can be found in `/usr/share/common-licenses/GPL'.
 
        You should have received a copy of the GNU Lesser General Public
        License along with this library; if not, write to the Free Software
-       Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, 
+       Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301,
        USA.
 
-On Debian systems, the complete text of the GNU Lesser General Public License 
+On Debian systems, the complete text of the GNU Lesser General Public License
 can be found in `/usr/share/common-licenses/LGPL'.
 
        Parts of the file src/tcpconns.c
@@ -303,7 +304,7 @@ can be found in `/usr/share/common-licenses/LGPL'.
        1. Redistributions of source code must retain the above copyright notice,
           this list of conditions and the following disclaimer.
        2. Redistributions in binary form must reproduce the above copyright
-          notice, this list of conditions and the following disclaimer in the 
+          notice, this list of conditions and the following disclaimer in the
           documentation and/or other materials provided with the distribution.
        3. Neither the name of The Measurement Factory nor the names of its
           contributors may be used to endorse or promote products derived from