[Reproducible-commits] [dpkg] 39/61: dselect: Switch multicd method license 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 b67c481e2e12b6239b1642e7e52fe29db7e94f28
Author: Guillem Jover <guillem at debian.org>
Date:   Tue Sep 15 15:33:54 2015 +0200

    dselect: Switch multicd method license from GPL2 to GPL2+
    
    All authors have agreed to the change:
    
      Heiko   in <https://lists.debian.org/debian-dpkg/2010/04/msg00057.html>
      Martin  in <https://lists.debian.org/debian-dpkg/2010/04/msg00055.html>
      Ian     in <https://lists.debian.org/debian-dpkg/2015/08/msg00029.html>
      Raphaël in <https://lists.debian.org/debian-dpkg/2010/04/msg00054.html>
      Guillem with this commit.
    
    Signed-off-by: Heiko Schlittermann <hs at schlittermann.de>
    Signed-off-by: Martin Schulze <joey at infodrom.org>
    Signed-off-by: Ian Jackson <ijackson at chiark.greenend.org.uk>
    Signed-off-by: Raphaël Hertzog <hertzog at debian.org>
    Signed-off-by: Guillem Jover <guillem at debian.org>
---
 debian/changelog                |  2 ++
 debian/copyright                | 10 +---------
 dselect/methods/multicd/install |  5 +++--
 dselect/methods/multicd/setup   |  5 +++--
 dselect/methods/multicd/update  |  5 +++--
 5 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 41b7bca..eef1e74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -16,6 +16,8 @@ dpkg (1.18.3) UNRELEASED; urgency=low
   * Fix an off-by-one write access in dpkg-deb when parsing the .deb magic.
     Reported by Jacek Wielemborek <d33tah at gmail.com>. Closes: #798324
   * Split overlong perl regexes into multiline extended regexes.
+  * Switch dselect multicd method license from GPL2 to GPL2+, with consent
+    from all its authors.
   * 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 77ee919..cd7af7d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -20,7 +20,7 @@ Copyright:
  Copyright © 1998 Juan Cespedes <cespedes at debian.org>
  Copyright © 1998 Nils Rennebarth <nils at debian.org>
  Copyright © 1998 Heiko Schlittermann <heiko at lotte.sax.de>
- Copyright © 1998-1999 Martin Schulze <joey at infodrom.north.de>
+ Copyright © 1998-1999, 2001, 2003, 2006 Martin Schulze <joey at infodrom.org>
  Copyright © 1999 Roderick Shertler <roderick at argon.org>
  Copyright © 1999 Ben Collins <bcollins at debian.org>
  Copyright © 1999 Richard Kettlewell <rjk at sfere.greenend.org.uk>
@@ -68,14 +68,6 @@ Copyright:
 License: GPL-2
 
 Files:
- dselect/methods/multicd/*
-Copyright:
- Copyright © 1995-1998 Ian Jackson <ian at chiark.greenend.org.uk>
- Copyright © 1998 Heiko Schlittermann <heiko at lotte.sax.de>
- Copyright © 1998-1999, 2001, 2003, 2006 Martin Schulze <joey at infodrom.org>
-License: GPL-2
-
-Files:
  scripts/Dpkg/Gettext.pm
 Copyright:
  Copyright © 2000 Joey Hess <joeyh at debian.org>
diff --git a/dselect/methods/multicd/install b/dselect/methods/multicd/install
index f81da04..d494be4 100755
--- a/dselect/methods/multicd/install
+++ b/dselect/methods/multicd/install
@@ -3,9 +3,10 @@
 # Copyright © 1995-1998 Ian Jackson <ian at chiark.greenend.org.uk>
 # Copyright © 1998 Heiko Schlittermann <heiko at lotte.sax.de>
 #
-# This program is free software; you can redistribute it and/or modify
+# This 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; version 2 dated June, 1991.
+# 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
diff --git a/dselect/methods/multicd/setup b/dselect/methods/multicd/setup
index 199ced3..8607206 100755
--- a/dselect/methods/multicd/setup
+++ b/dselect/methods/multicd/setup
@@ -10,9 +10,10 @@
 # Copyright © 1995-1998 Ian Jackson <ian at chiark.greenend.org.uk>
 # Copyright © 1998 Heiko Schlittermann <heiko at lotte.sax.de>
 #
-# This program is free software; you can redistribute it and/or modify
+# This 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; version 2 dated June, 1991.
+# 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
diff --git a/dselect/methods/multicd/update b/dselect/methods/multicd/update
index 745201f..47368ba 100755
--- a/dselect/methods/multicd/update
+++ b/dselect/methods/multicd/update
@@ -3,9 +3,10 @@
 # Copyright © 1995-1998 Ian Jackson <ian at chiark.greenend.org.uk>
 # Copyright © 1998 Heiko Schlittermann <heiko at lotte.sax.de>
 #
-# This program is free software; you can redistribute it and/or modify
+# This 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; version 2 dated June, 1991.
+# 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

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