Просмотр исходного кода

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@schlittermann.de>
Signed-off-by: Martin Schulze <joey@infodrom.org>
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
Signed-off-by: Raphaël Hertzog <hertzog@debian.org>
Signed-off-by: Guillem Jover <guillem@debian.org>
Guillem Jover лет назад: 10
Родитель
Сommit
b67c481e2e

+ 2 - 0
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@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.

+ 1 - 9
debian/copyright

@@ -20,7 +20,7 @@ Copyright:
  Copyright © 1998 Juan Cespedes <cespedes@debian.org>
  Copyright © 1998 Nils Rennebarth <nils@debian.org>
  Copyright © 1998 Heiko Schlittermann <heiko@lotte.sax.de>
- Copyright © 1998-1999 Martin Schulze <joey@infodrom.north.de>
+ Copyright © 1998-1999, 2001, 2003, 2006 Martin Schulze <joey@infodrom.org>
  Copyright © 1999 Roderick Shertler <roderick@argon.org>
  Copyright © 1999 Ben Collins <bcollins@debian.org>
  Copyright © 1999 Richard Kettlewell <rjk@sfere.greenend.org.uk>
@@ -67,14 +67,6 @@ Copyright:
  Copyright © 1999-2001, 2005-2006, 2009 Raphaël Hertzog <hertzog@debian.org>
 License: GPL-2
 
-Files:
- dselect/methods/multicd/*
-Copyright:
- Copyright © 1995-1998 Ian Jackson <ian@chiark.greenend.org.uk>
- Copyright © 1998 Heiko Schlittermann <heiko@lotte.sax.de>
- Copyright © 1998-1999, 2001, 2003, 2006 Martin Schulze <joey@infodrom.org>
-License: GPL-2
-
 Files:
  scripts/Dpkg/Gettext.pm
 Copyright:

+ 3 - 2
dselect/methods/multicd/install

@@ -3,9 +3,10 @@
 # Copyright © 1995-1998 Ian Jackson <ian@chiark.greenend.org.uk>
 # Copyright © 1998 Heiko Schlittermann <heiko@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

+ 3 - 2
dselect/methods/multicd/setup

@@ -10,9 +10,10 @@
 # Copyright © 1995-1998 Ian Jackson <ian@chiark.greenend.org.uk>
 # Copyright © 1998 Heiko Schlittermann <heiko@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

+ 3 - 2
dselect/methods/multicd/update

@@ -3,9 +3,10 @@
 # Copyright © 1995-1998 Ian Jackson <ian@chiark.greenend.org.uk>
 # Copyright © 1998 Heiko Schlittermann <heiko@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