[Pkg-gnupg-commit] [gnupg2] 06/12: debian/copyright: cleanup, fix URLs

[Daniel Kahn Gillmor]

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

dkg pushed a commit to branch experimental
in repository gnupg2.

commit a84ff7816eea0d8696f2c08257cde04b838e46cf
Author: Daniel Kahn Gillmor <dkg at fifthhorseman.net>
Date:   Mon Aug 1 13:31:29 2016 -0400

    debian/copyright: cleanup, fix URLs
---
 debian/copyright | 60 +++-----------------------------------------------------
 1 file changed, 3 insertions(+), 57 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index 47e3108..6e3b881 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,10 +1,10 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: GNU Privacy Guard
 Upstream-Contact: gnupg-devel at gnupg.org
-Source: ftp://ftp.gnupg.org/gcrypt/gnupg/
+Source: https://gnupg.org/download/
 
 Files: *
-Copyright: 1992, 1995-2012, Free Software Foundation, Inc
+Copyright: 1992, 1995-2016, Free Software Foundation, Inc
 License: GPL-3+
 
 Files: agent/command.c
@@ -21,19 +21,8 @@ Files: autogen.sh
 Copyright: 2003, g10 Code GmbH
 License: permissive
 
-Files: common/estream.c
- common/estream.h
-Copyright: 2004-2007, 2009-2010, g10 Code GmbH
-License: GPL-2+ or BSD-3-clause
-
-Files: common/estream-printf.c
- common/estream-printf.h
-Copyright:  2007-2009, g10 Code GmbH
-License: GPL-2+
-
 Files: common/gc-opt-flags.h
  common/i18n.h
- keyserver/no-libgcrypt.c
  tests/openpgp/defs.inc
  tools/clean-sat.c
  tools/mk-tdata.c
@@ -42,7 +31,6 @@ Copyright: 1998-2001, 2003, 2004, 2006, 2007 Free Software Foundation, Inc
 License: permissive
 
 Files: common/localename.c
- include/_regex.h
 Copyright: 1985, 1989-1993, 1995-2003, 2007, 2008 Free Software Foundation, Inc.
 License: LGPL-2.1+
 
@@ -52,30 +40,6 @@ Copyright: 2004, 2005, g10 Code GmbH
   2006, 2008, 2009, 2011, Free Software Foundation, Inc
 License: GPL-3+
 
-Files: gl/allocsa.c
-Copyright: 2003, 2006 Free Software Foundation, Inc
-License: GPL-2+
-
-Files: jnlib/*
-Copyright: 1998-2007 Free Software Foundation, Inc
-License: LGPL-3+
-
-Files: jnlib/argparse.h
- jnlib/w32-gettext.c
-Copyright: 1995-1997, 1999, 2005, 2007
-  1995-2003, Free Software Foundation, Inc
-License: LGPL-2.1+
-
-Files: jnlib/argparse.c
-Copyright: 1998-2001, 2006-2008, 2012  Free Software Foundation, Inc.
- 1997, 2013 Werner Koch
-License: LGPL-2.1+
-
-Files: jnlib/w32-afunix.c
- jnlib/w32-afunix.h
-Copyright: 2004, 2006 g10 Code GmbH
-License: LGPL-3+
-
 Files: scd/ccid-driver.h
  scd/ccid-driver.c
 Copyright: 2003-2007, Free Software Foundation, Inc
@@ -201,24 +165,6 @@ License: LGPL-3+
  License version 3 can be found in the file
  `/usr/share/common-licenses/LGPL-3'.
 
-License: GPL-2+
- This program 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 2 of the License,
- or (at your option) any later version.
- .
- This program 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 <http://www.gnu.org/licenses/>.
- .
- 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-2'.
-
 License: LGPL-2.1+
  This program is free software; you can redistribute it and/or modify it
  under the terms of the GNU Lesser General Public License as

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