Hi! On Sat, 2023-03-18 at 15:34:25 +0100, Guillem Jover wrote: > Thank you all! I've queued the attached patch which I'll be pushing to > git shortly.
Had missed one file! Updated patch attached. Thanks, Guillem
From f164eb0bc774e5db480341369ef3fd72efa21509 Mon Sep 17 00:00:00 2001 From: Guillem Jover <[email protected]> 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 <[email protected]> --- debian/copyright | 25 ++----------------------- dselect/methods/Dselect/Ftp.pm | 3 ++- dselect/methods/ftp/install.pl | 3 ++- dselect/methods/ftp/setup.pl | 3 ++- dselect/methods/ftp/update.pl | 3 ++- 5 files changed, 10 insertions(+), 27 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 <[email protected]> Copyright © 1996 Kim-Minh Kaplan <[email protected]> Copyright © 1996-1998 Miquel van Smoorenburg <[email protected]> + Copyright © 1996 Andy Guy <[email protected]> Copyright © 1997-1998 Charles Briscoe-Smith <[email protected]> Copyright © 1997-1998 Juho Vuori <[email protected]> Copyright © 1998 Koichi Sekido <[email protected]> @@ -26,13 +27,13 @@ Copyright: Copyright © 1999 Richard Kettlewell <[email protected]> Copyright © 1999-2001 Marcus Brinkmann <[email protected]> Copyright © 1999-2002 Wichert Akkerman <[email protected]> + Copyright © 1999-2001, 2005-2016 Raphaël Hertzog <[email protected]> Copyright © 2000-2001, 2007, 2010 Joey Hess <[email protected]> Copyright © 2004-2005, 2007-2010 Canonical Ltd. Copyright © 2004-2005 Scott James Remnant <[email protected]> Copyright © 2006-2008 Frank Lichtenheld <[email protected]> Copyright © 2006-2023 Guillem Jover <[email protected]> Copyright © 2006-2007 Nicolas François <[email protected]> - Copyright © 2007-2012, 2014, 2016 Raphaël Hertzog <[email protected]> Copyright © 2007 Don Armstrong <[email protected]> Copyright © 2007 Colin Watson <[email protected]> Copyright © 2007, 2008 Tollef Fog Heen <[email protected]> @@ -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 <[email protected]> - Copyright © 1998 Martin Schulze <[email protected]> - Copyright © 1999-2001, 2005-2006, 2009 Raphaël Hertzog <[email protected]> -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/Dselect/Ftp.pm b/dselect/methods/Dselect/Ftp.pm index e42fe09fd..4ed576932 100644 --- a/dselect/methods/Dselect/Ftp.pm +++ b/dselect/methods/Dselect/Ftp.pm @@ -1,6 +1,7 @@ # 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/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
