[Reproducible-commits] [dpkg] 40/61: libdpkg: Fix inadvertent license change back from GPL2 to GPL2+

[Jérémy Bobbio]

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

lunar pushed a commit to branch pu/reproducible_builds
in repository dpkg.

commit f467eb0f53d3b78e8565790e8caf008b60abac66
Author: Guillem Jover <guillem at debian.org>
Date:   Tue Sep 15 15:28:39 2015 +0200

    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 at chiark.greenend.org.uk>
    Signed-off-by: Guillem Jover <guillem at debian.org>
---
 debian/changelog | 1 +
 debian/copyright | 8 +-------
 lib/dpkg/utils.c | 7 +++++--
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eef1e74..accfdf4 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 cd7af7d..84c4d5a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,7 @@ Copyright:
  Copyright © 1994 Ian Murdock <imurdock at debian.org>
  Copyright © 1994 Matt Welsh <mdw at sunsite.unc.edu>
  Copyright © 1994 Carl Streeter <streeter at cae.wisc.edu>
- Copyright © 1994-1999 Ian Jackson <ian at chiark.greenend.org.uk>
+ Copyright © 1994-1999, 2008 Ian Jackson <ian at chiark.greenend.org.uk>
  Copyright © 1995 Bruce Perens <bruce at pixar.com>
  Copyright © 1995-1996 Erick Branderhorst <branderhorst at heel.fgg.eur.nl>
  Copyright © 1996 Michael Shields <shields at crosslink.net>
@@ -53,12 +53,6 @@ Copyright:
 License: GPL-2+
 
 Files:
- lib/dpkg/utils.c
-Copyright:
- Copyright © 2008 Ian Jackson <ian at davenant.greenend.org.uk>
-License: GPL-2
-
-Files:
  dselect/methods/Dselect/Ftp.pm
  dselect/methods/ftp/*
 Copyright:
diff --git a/lib/dpkg/utils.c b/lib/dpkg/utils.c
index d0221ca..20d7bb4 100644
--- a/lib/dpkg/utils.c
+++ b/lib/dpkg/utils.c
@@ -2,9 +2,12 @@
  * libdpkg - Debian packaging suite library routines
  * utils.c - helper functions for dpkg
  *
+ * Copyright © 1995, 2008 Ian Jackson <ian at chiark.greenend.org.uk>
+ *
  * This is free software; you can redistribute it and/or modify
- * it under the terms of version 2 of the GNU General Public
- * License version 2 as published by the Free Software Foundation.
+ * 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 is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git