[Pkg-gnupg-commit] [gnupg1] 04/15: clean up debian/copyright

Wed Aug 3 18:58:14 UTC 2016

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg1.

commit 138163b0ba8ed2e59acf10bc86b5c5052ade0fbe
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Wed Aug 3 09:18:34 2016 -0400

    clean up debian/copyright
    
     * use https
     * add myself to debian/copyright as author of files in debian/
     * identify as "classic" (compare with "modern" gnupg2)
     * correct information about source files
---
 debian/copyright | 76 ++++++++++++++++++++++++++++++++++++++++++--------------
 1 file changed, 58 insertions(+), 18 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index d4c79b4..cb48192 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,16 +1,50 @@
-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/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: GnuPG - The GNU Privacy Guard (classic version)
+Upstream-Contact: GnuPG development mailing list <gnupg-devel at gnupg.org>
+Source: https://www.gnupg.org/
 
 Files: *
-Copyright: 1998-2013 Free Software Foundation, Inc.
-           1997, 1998, 2013 Werner Koch
+Copyright: 1998-2015 Free Software Foundation, Inc.
+           1997-2015 Werner Koch
+License: GPL-3+
+
+Files:
+ keyserver/gpgkeys_ldap.c
+ keyserver/gpgkeys_hkp.c
+ keyserver/gpgkeys_curl.c
+ keyserver/ksutil.c
+ keyserver/ksutil.h
+Copyright: 2001-2013 Free Softwrae Foundation, Inc.
 License: GPL-3+ with OpenSSL exception
 
+Files: util/compat.c
+Copyright: 2006, 2007, 2009 Free Software Foundation, Inc.
+License: permissive
+
 Files: debian/*
-Copyright: 1998-2006 James Troup, 2008-2014 Daniel Leidert, Sune Vuorela, Thijs Kinkhorst.
-License: GPL-3+ with OpenSSL exception
+Copyright: 1998-2006 James Troup
+ 2008-2014 Daniel Leidert, Sune Vuorela, Thijs Kinkhorst
+ 2014-2016 Daniel Kahn Gillmor
+License: GPL-3+
+
+License: GPL-3+
+ 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
+ along with this program; if not, see <https://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the full text of the GNU General Public
+ License version 3 can be found in the file
+ `/usr/share/common-licenses/GPL-3'.
+
 
 License: GPL-3+ with OpenSSL exception
  GnuPG is free software; you can redistribute it and/or modify it under
@@ -18,19 +52,16 @@ License: GPL-3+ with OpenSSL exception
  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.
+ 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.
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, see <https://www.gnu.org/licenses/>.
  .
  On Debian systems, the full text of the GNU General Public
- License version 2 can be found in the file
+ License version 3 can be found in the file
  `/usr/share/common-licenses/GPL-3'.
  .
  In addition, as a special exception, the Free Software Foundation
@@ -72,3 +103,12 @@ License: RFC-Reference
  .
  The limited permissions granted above are perpetual and will not be
  revoked by the Internet Society or its successors or assigns.
+
+License: permissive
+ This file is free software; as a special exception the author gives
+ unlimited permission to copy and/or distribute it, with or without
+ modifications, as long as this notice is preserved.
+ .
+ This file is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg1.git

