Re: License audit on dpkg source tree

[Guillem Jover <guillem@debian.org>]

Hi!

On Thu, 2010-04-15 at 15:21:40 +0200, Raphael Hertzog wrote:
> On Thu, 12 Nov 2009, Guillem Jover wrote:
> > This is something that has been bothering me for a long time, so the
> > other day I sat down and did a full license audit of the sources.
> > 
> > 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.
> > 
> > The remaining issues, which might need asking people around are:

> > * dselect/methods/Debian/Dselect/Ftp.pm: No header
> >   dselect/methods/ftp/*: GPL (no version)
> > 
> >   The dselect-ftp method from the dpkg-ftp package, states on its
> >   debian/copyright file to be under the GPL-2 only. Ideally this
> >   would have the same terms as the rest of the code base, in case
> >   code needs to be reused for example.
 
> 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 Tue, 2023-03-07 at 13:43:39 +0000, Christian Hudon wrote:
> Hi. Yes, I'm fine re-licensing my contribution with the same licenses
> as the rest of the codebase.

On Thu, 2023-03-16 at 18:20:46 +0000, Andy Guy wrote:
> I am 'Andy W P Guy' who wrote dpkg-ftp. My current email address
> is andy@cyteen.org. I am happy to re-licence the work I did as GPL-2 or
> any future version of GPL.

On Fri, 2023-03-17 at 09:22:00 +0100, Yann Dirson wrote:
> I have no objection, and re-license the work I did on dpkg-ftp as GPL-2+. 
> (pfew, that was ages ago ;)) 

Thank you all! I've queued the attached patch which I'll be pushing to
git shortly.

Thanks,
Guillem

From ebe52b2d54af0151e18560a2fc683cb358f57105 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Sat, 18 Mar 2023 15:30:58 +0100
Subject: [PATCH] dselect: Relicense ftp method from GPL-2 to GPL-2+
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This code was merged from the dpkg-ftp package, which had a GPL-2
license.

With the agreement from authors with original or non-trivial code:

  Andy Guy
    <https://lists.debian.org/debian-dpkg/2023/03/msg00007.html>
  Christian Hudon
    <https://lists.debian.org/debian-dpkg/2023/03/msg00004.html>
  Yann Dirson
    <https://lists.debian.org/debian-dpkg/2023/03/msg00008.html>
  Martin Schulze
    <https://lists.debian.org/debian-dpkg/2010/04/msg00055.html>
  Raphaël Hertzog
    <https://lists.debian.org/debian-dpkg/2010/04/msg00054.html>

and myself with this commit, relicense this code from GPL-2 to GPL-2+
to simplify the licensing for the dselect methods and make it possible
to refactor and shuffle code around without creating licensing issues.

Signed-off-by: Guillem Jover <guillem@debian.org>
---
 debian/copyright               | 25 ++-----------------------
 dselect/methods/ftp/install.pl |  3 ++-
 dselect/methods/ftp/setup.pl   |  3 ++-
 dselect/methods/ftp/update.pl  |  3 ++-
 4 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index fc6398ba5..9f2b8fe5d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,6 +13,7 @@ Copyright:
  Copyright © 1996 Klee Dienes <klee@debian.org>
  Copyright © 1996 Kim-Minh Kaplan <kkaplan@cdfhp3.in2p3.fr>
  Copyright © 1996-1998 Miquel van Smoorenburg <miquels@cistron.nl>
+ Copyright © 1996 Andy Guy <andy@cyteen.org>
  Copyright © 1997-1998 Charles Briscoe-Smith <cpbs@debian.org>
  Copyright © 1997-1998 Juho Vuori <javuori@cc.helsinki.fi>
  Copyright © 1998 Koichi Sekido <sekido@mbox.kyoto-inet.or.jp>
@@ -26,13 +27,13 @@ Copyright:
  Copyright © 1999 Richard Kettlewell <rjk@sfere.greenend.org.uk>
  Copyright © 1999-2001 Marcus Brinkmann <brinkmd@debian.org>
  Copyright © 1999-2002 Wichert Akkerman <wakkerma@debian.org>
+ Copyright © 1999-2001, 2005-2016 Raphaël Hertzog <hertzog@debian.org>
  Copyright © 2000-2001, 2007, 2010 Joey Hess <joeyh@debian.org>
  Copyright © 2004-2005, 2007-2010 Canonical Ltd.
  Copyright © 2004-2005 Scott James Remnant <scott@netsplit.com>
  Copyright © 2006-2008 Frank Lichtenheld <djpig@debian.org>
  Copyright © 2006-2023 Guillem Jover <guillem@debian.org>
  Copyright © 2006-2007 Nicolas François <nicolas.francois@centraliens.net>
- Copyright © 2007-2012, 2014, 2016 Raphaël Hertzog <hertzog@debian.org>
  Copyright © 2007 Don Armstrong <don@donarmstrong.com>
  Copyright © 2007 Colin Watson <cjwatson@debian.org>
  Copyright © 2007, 2008 Tollef Fog Heen <tfheen@err.no>
@@ -62,15 +63,6 @@ Copyright:
  Copyright © 1987-2006 Free Software Foundation, Inc.
 License: GPL-2+
 
-Files:
- dselect/methods/Dselect/Ftp.pm
- dselect/methods/ftp/*
-Copyright:
- Copyright © 1996 Andy Guy <andy@cyteen.org>
- Copyright © 1998 Martin Schulze <joey@infodrom.org>
- Copyright © 1999-2001, 2005-2006, 2009 Raphaël Hertzog <hertzog@debian.org>
-License: GPL-2
-
 Files:
  utils/start-stop-daemon.c
 Copyright:
@@ -120,16 +112,3 @@ Comment:
  On Debian systems, the complete text of the GNU General Public License
  can be found in ‘/usr/share/common-licenses/GPL-2’ or in the dpkg source
  as the file ‘COPYING’.
-
-License: GPL-2
- 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.
- .
- This is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- GNU General Public License for more details.
- .
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <https://www.gnu.org/licenses/>.
diff --git a/dselect/methods/ftp/install.pl b/dselect/methods/ftp/install.pl
index bddd7a2b6..c2bdecb6c 100755
--- a/dselect/methods/ftp/install.pl
+++ b/dselect/methods/ftp/install.pl
@@ -6,7 +6,8 @@
 #
 # This program 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 of the License.
+# 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/ftp/setup.pl b/dselect/methods/ftp/setup.pl
index 4ca68427f..0ab87a09d 100755
--- a/dselect/methods/ftp/setup.pl
+++ b/dselect/methods/ftp/setup.pl
@@ -6,7 +6,8 @@
 #
 # This program 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 of the License.
+# 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/ftp/update.pl b/dselect/methods/ftp/update.pl
index b1dc1f0f8..b5ec567d9 100755
--- a/dselect/methods/ftp/update.pl
+++ b/dselect/methods/ftp/update.pl
@@ -6,7 +6,8 @@
 #
 # This program 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 of the License.
+# 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.39.2