[Pkg-gnupg-commit] r224 - /gnupg/trunk/debian/copyright

Wed Feb 29 17:35:38 UTC 2012

Author: thijs
Date: Wed Feb 29 17:35:38 2012
New Revision: 224

URL: http://svn.debian.org/wsvn/pkg-gnupg/?sc=1&rev=224
Log:
attempt to use copyright-format 1.0

Modified:
    gnupg/trunk/debian/copyright

Modified: gnupg/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/pkg-gnupg/gnupg/trunk/debian/copyright?rev=224&op=diff
==============================================================================

--- gnupg/trunk/debian/copyright (original)
+++ gnupg/trunk/debian/copyright Wed Feb 29 17:35:38 2012
@@ -1,41 +1,44 @@
-This is Debian GNU's prepackaged version of GnuPG, a free PGP
-replacement.
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: GnuPG - The GNU Privacy Guard
+Upstream-Contact: Werner Koch <wk at gnupg.org>
+Source: http://www.gnupg.org/
 
-This package was put together by me, James Troup <james at nocrew.org>,
-from the sources, which I obtained from
-ftp://ftp.gnupg.org/gcrypt/gnupg/gnupg-1.4.6.tar.gz.  The changes were
-minimal, namely:
+Files: *
+Copyright: 1998-2012 Free Software Foundation, Inc.
+License: GPL-3+ with OpenSSL exception
+ GnuPG 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.
+ .
+ GnuPG 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 with
+ your Debian GNU system, in /usr/share/common-licenses/GPL-3, or with the
+ Debian GNU gnupg source package as the file COPYING.  If not, see
+ <http://www.gnu.org/licenses/> or write to the Free Software Foundation,
+ Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 2 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
+ .
+ In addition, as a special exception, the Free Software Foundation
+ gives permission to link the code of the keyserver helper tools:
+ gpgkeys_ldap, gpgkeys_curl and gpgkeys_hkp with the OpenSSL project's
+ "OpenSSL" library (or with modified versions of it that use the same
+ license as the "OpenSSL" library), and distribute the linked
+ executables. You must obey the GNU General Public License in all
+ respects for all of the code used other than "OpenSSL". If you modify
+ this file, you may extend this exception to your version of the file,
+ but you are not obligated to do so. If you do not wish to do so,
+ delete this exception statement from your version.
 
-- adding support for the Debian package maintenance scheme, by adding
-  various debian/* files.
+Files: debian/*
+Copyright: 1998-2006 James Troup, 2008-2012 Daniel Leidert, Sune Vuorela, Thijs Kinkhorst.
+License: GPL-3+ with OpenSSL exception
 
-Program Copyright (C) 1998-2010 Free Software Foundation, Inc.
-Modifications for Debian Copyright (C) 1998-2006 James Troup,
-2008-2012 Daniel Leidert, Sune Vuorela, Thijs Kinkhorst.
 
-GnuPG 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.
-
-GnuPG 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 with
-your Debian GNU system, in /usr/share/common-licenses/GPL-3, or with the
-Debian GNU gnupg source package as the file COPYING.  If not, see
-<http://www.gnu.org/licenses/> or write to the Free Software Foundation,
-Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
-
-In addition, as a special exception, the Free Software Foundation
-gives permission to link the code of the keyserver helper tools:
-gpgkeys_ldap, gpgkeys_curl and gpgkeys_hkp with the OpenSSL project's
-"OpenSSL" library (or with modified versions of it that use the same
-license as the "OpenSSL" library), and distribute the linked
-executables.  You must obey the GNU General Public License in all
-respects for all of the code used other than "OpenSSL".  If you modify
-this file, you may extend this exception to your version of the file,
-but you are not obligated to do so.  If you do not wish to do so,
-delete this exception statement from your version.


