Re: License audit on dpkg source tree
Hi!
On Thu, 2010-04-15 at 15:21:40 +0200, Raphael Hertzog wrote:
> On Thu, 12 Nov 2009, Guillem Jover wrote:
> > I've cleaned up the license headers and added missing ones, as a side
> > effect “licensecheck -r dpkg” works better now. There's still lots of
> > copyright statements missing, I have a patch around to add few, but
> > every file takes time digging, and there's probably more urgent things
> > to tend to. I'd like to get all GPL code unified as GPL-2+,
> > eventually, though.
> > * dselect/methods/multicd/*: GPL-2 only
> >
> > The dselect-multicd method from the dpkg-multicd package, states on
> > its debian/copyright to be based on builtin methods from dselect,
> > but then has a license of GPL-2 only, while dselect has GPL-2+.
> I'm ccing all the people listed in the copyright. Please respond and
> tell us whether you agree to change the license of your code to "GPLv2 or
> later" instead of the "GPLv2 only"?
> As far I am concerned, I agree with changing the license of all my code to
> GPLv2 or later.
On Thu, 2010-04-15 at 15:30:41 +0200, Martin Schulze wrote:
> I agree.
On Thu, 2010-04-15 at 16:11:49 +0200, Heiko Schlittermann wrote:
> Me too.
On Fri, 2015-08-21 at 20:41:26 +0100, Ian Jackson wrote:
> Anything in the dpkg source tree with my copyright should be GPLv2+.
>
> Anything there which seems to be marked GPLv2-only represents some
> kind of administrative mistake, and the copyright notice can be
> changed to GPLv2+.
Thanks all! I'm going to push the attached patch. Hope the S-o-b are
fine.
Regards,
Guillem
From 492f988cc88c159e1f33072e7cb5e81ee7126021 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 15 Sep 2015 15:33:54 +0200
Subject: [PATCH] dselect: Switch multicd method license from GPL2 to GPL2+
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
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>
---
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 09f5d84..de17395 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@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@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>
@@ -68,14 +68,6 @@ Copyright:
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:
Copyright © 2000 Joey Hess <joeyh@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@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
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@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
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@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
--
2.6.0.rc0.131.gf624c3d
Reply to: