diff options
| author | Guillem Jover <guillem@debian.org> | 2015-09-15 15:28:39 +0200 |
|---|---|---|
| committer | Guillem Jover <guillem@debian.org> | 2015-09-17 04:26:09 +0200 |
| commit | f467eb0f53d3b78e8565790e8caf008b60abac66 (patch) | |
| tree | 4e02dc3b8df35f8b095423a6733026eb262eb40e /debian | |
| parent | b67c481e2e12b6239b1642e7e52fe29db7e94f28 (diff) | |
| download | dpkg-f467eb0f53d3b78e8565790e8caf008b60abac66.tar.gz | |
libdpkg: Fix inadvertent license change back from GPL2 to GPL2+
In commit b95907e6e0f3f25136fb2ebcc8d3489efb208dea, several functions
were refactored out from src/filesdb.c (with a GPL2+ license), into
lib/utils.c (with a GPL2 license), inadvertently making them change
license.
Ian clarified that this was a mistake in:
<https://lists.debian.org/debian-dpkg/2015/08/msg00029.html>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Signed-off-by: Guillem Jover <guillem@debian.org>
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 1 | ||||
| -rw-r--r-- | debian/copyright | 8 |
2 files changed, 2 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog index eef1e74fe..accfdf440 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ dpkg (1.18.3) UNRELEASED; urgency=low * Split overlong perl regexes into multiline extended regexes. * Switch dselect multicd method license from GPL2 to GPL2+, with consent from all its authors. + * Fix inadvertent license change for lib/dpkg/utils.c from GPL2 to GPL2+. * Perl modules: - Only warn on invalid week days instead of aborting in Dpkg::Changelog::Entry::Debian. Regression introduced in dpkg 1.18.2. diff --git a/debian/copyright b/debian/copyright index cd7af7ddb..84c4d5a1d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -6,7 +6,7 @@ Copyright: Copyright © 1994 Ian Murdock <imurdock@debian.org> Copyright © 1994 Matt Welsh <mdw@sunsite.unc.edu> Copyright © 1994 Carl Streeter <streeter@cae.wisc.edu> - Copyright © 1994-1999 Ian Jackson <ian@chiark.greenend.org.uk> + Copyright © 1994-1999, 2008 Ian Jackson <ian@chiark.greenend.org.uk> Copyright © 1995 Bruce Perens <bruce@pixar.com> Copyright © 1995-1996 Erick Branderhorst <branderhorst@heel.fgg.eur.nl> Copyright © 1996 Michael Shields <shields@crosslink.net> @@ -53,12 +53,6 @@ Copyright: License: GPL-2+ Files: - lib/dpkg/utils.c -Copyright: - Copyright © 2008 Ian Jackson <ian@davenant.greenend.org.uk> -License: GPL-2 - -Files: dselect/methods/Dselect/Ftp.pm dselect/methods/ftp/* Copyright: |