[Pkg-gnutls-commits] r65 - in /libgcrypt11/trunk/debian: changelog copyright

[jamesw-guest at users.alioth.debian.org]

Author: jamesw-guest
Date: Thu Jun  8 17:02:37 2006
New Revision: 65

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=65
Log:
Changes to debian/copyright (323458)

Modified:
    libgcrypt11/trunk/debian/changelog
    libgcrypt11/trunk/debian/copyright

Modified: libgcrypt11/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/libgcrypt11/trunk/debian/changelog?rev=65&op=diff
==============================================================================
--- libgcrypt11/trunk/debian/changelog (original)
+++ libgcrypt11/trunk/debian/changelog Thu Jun  8 17:02:37 2006
@@ -15,6 +15,8 @@
   * Use cdbs' simple-patchsys.mk.
     - add debian/README.source_and_patches
     - add debian/patches/11_gcrypt_h_362636 (closes: #362636)
+  * Tidied up the debian/copyright file. Noted that the documentation is now
+    licensed under the GPL (closes: #323458)
 
  -- James Westby <jw+debian at jameswestby.net>  Thu,  8 Jun 2006 03:17:20 +0100
 

Modified: libgcrypt11/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnutls/libgcrypt11/trunk/debian/copyright?rev=65&op=diff
==============================================================================
--- libgcrypt11/trunk/debian/copyright (original)
+++ libgcrypt11/trunk/debian/copyright Thu Jun  8 17:02:37 2006
@@ -9,15 +9,13 @@
 
 Upstream Authors: Werner Koch and others.
 
-Copyright: GNU Lesser General Public License (LGPL) version 2.1,
-except two binaries, which are not built in this package.  See the
-file README in the package libgcrypt-doc, or the excerpt below for
-details.
+Copyright:
 
-On Debian GNU/Linux systems, the complete text of the GNU Lesser
-General Public License can be found in
-`/usr/share/common-licenses/LGPL'; the GNU General Public License can
-be found in `/usr/share/common-licenses/GPL'.
+Most of the package is licensed under the GNU Lesser General Public 
+License (LGPL) version 2.1, except two binaries, which are not built 
+in this package.  See the file README in the package libgcrypt-doc, 
+or the excerpt below for details. The documentation is licensed under 
+the GPL, see below.
 
 Excerpt from /usr/share/doc/libgcrypt-doc/README (in the package
 libgcrypt-doc):
@@ -36,9 +34,6 @@
       rndunix - Entropy gatherer for Unices without a /dev/random
       rndw32  - Entropy gatherer for MS Windows
 
-    The documentation is available under the terms of the GNU Free
-    Documentation License; see the file COPYING.DOC for the terms.
-
     This library used to be available under the GPL - this was changed
     with version 1.1.7 with the rationale that there are now many free
     crypto libraries available and many of them come with capabilities
@@ -53,3 +48,37 @@
     less to protect the freedom of the users of the code that it
     covers.  See http://www.gnu.org/philosophy/why-not-lgpl.html for
     more explanation.
+
+An example of the license headers of the LGPL is
+
+   This file is part of Libgcrypt.
+
+   Libgcrypt is free software; you can redistribute it and/or modify
+   it under the terms of the GNU Lesser General Public License as
+   published by the Free Software Foundation; either version 2.1 of
+   the License, or (at your option) any later version.
+
+   Libgcrypt 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 Lesser General Public
+   License along with Libgcrypt; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  
+   02110-1301  USA
+
+On Debian GNU/Linux systems, the complete text of the GNU Lesser
+General Public License can be found in
+`/usr/share/common-licenses/LGPL'; 
+
+The documentation licensed under the GPL
+
+  Permission is granted to copy, distribute and/or modify this document
+  under the terms of the GNU General Public License as published by the
+  Free Software Foundation; either version 2 of the License, or (at your
+  option) any later version.
+
+On Debian GNU/Linux systems, the text of the GNU General Public License, 
+version 2 can be found in `/usr/share/common-licenses/GPL-2'.
+