[Pkg-gnutls-commits] r118 - /packages/libgcrypt11/trunk/debian/copyright

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Sun Jun 25 14:48:13 2006
New Revision: 118

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=118
Log:
Clean up copyright file, include actual copyright statements.

Modified:
    packages/libgcrypt11/trunk/debian/copyright

Modified: packages/libgcrypt11/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/libgcrypt11/trunk/debian/copyright?rev=118&op=diff
==============================================================================
--- packages/libgcrypt11/trunk/debian/copyright (original)
+++ packages/libgcrypt11/trunk/debian/copyright Sun Jun 25 14:48:13 2006
@@ -13,12 +13,10 @@
 
 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 
+in this package.  See 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):
+Excerpt from upstream's README:
 
     License
     -------
@@ -51,33 +49,42 @@
 
 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
+-------------
+ * Copyright (C) 1998, 2000, 2001, 2002, 2003,
+ *               2004, 2005  Free Software Foundation, Inc.
+ *
+ * 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 Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, 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
+-------------
+Copyright @copyright{} 2000, 2002, 2003, 2004 Free Software Foundation, Inc.
 
-  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.
+ at quotation
+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. The text of the license can be found in the
+section entitled ``Copying''.
+-------------
 
 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'.