Re: Licensing of old Debconf::Gettext module in dpkg
Hi!
On Mon, 2023-03-06 at 21:32:05 -0800, Nicolas François wrote:
> GPL-2+ is fine for any of my modifications.
Perfect, thanks!
On Tue, 2023-03-07 at 18:53:27 -0400, Joey Hess wrote:
> I'm not sure if there is enough of my code left here, or enough
> expressiveness, for me to hold a legitimate copyright on it. But I
> am fine with relicensing it GPL-2+.
This also briefly crossed my mind, but given that the current code was
derived from yours, just for that alone but also out of courtesy this
is what seemed like the correct thing to do. :) Regardless, thanks too!
Attached is what I've queued for my next push.
Thanks,
Guillem
From 72d7307ff2951c75ee9680307004c08c397f7ac9 Mon Sep 17 00:00:00 2001
From: Guillem Jover <guillem@debian.org>
Date: Tue, 7 Mar 2023 23:49:26 +0100
Subject: [PATCH] Dpkg::Gettext: Relicense from BSD-2 to GPL-2+
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
This file was originally copied from the Debconf::Gettext module from
debconf with a BSD-2 license, originally by Joey Hess, which got
modified by Nicolas François on import, and subsequently reworked by
me, and with a trivial change by Raphaël Hertzog.
With agreement from authors with original or non-trivial code:
Joey Hess
<https://lists.debian.org/debian-dpkg/2023/03/msg00005.html>
Nicolas François
<https://lists.debian.org/debian-dpkg/2023/03/msg00002.html>
and myself with this commit, relicense this file from BSD-2 to GPL-2+
to simplify the licensing for the Dpkg perl modules.
Signed-off-by: Guillem Jover <guillem@debian.org>
---
debian/copyright | 33 ++-------------------------------
scripts/Dpkg/Gettext.pm | 33 +++++++++++++--------------------
2 files changed, 15 insertions(+), 51 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index 8135e5cc1..082328813 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -26,13 +26,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 © 2001, 2007, 2010 Joey Hess <joeyh@debian.org>
+ Copyright © 2000-2001, 2007, 2010 Joey Hess <joeyh@debian.org>
Copyright © 2004-2005, 2007-2008, 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 Nicolas François <nicolas.francois@centraliens.net>
Copyright © 2007 Don Armstrong <don@donarmstrong.com>
Copyright © 2007 Colin Watson <cjwatson@debian.org>
Copyright © 2007, 2008 Tollef Fog Heen <tfheen@err.no>
@@ -72,13 +72,6 @@ Copyright:
Copyright © 1999-2001, 2005-2006, 2009 Raphaël Hertzog <hertzog@debian.org>
License: GPL-2
-Files:
- scripts/Dpkg/Gettext.pm
-Copyright:
- Copyright © 2000 Joey Hess <joeyh@debian.org>
- Copyright © 2007-2022 Guillem Jover <guillem@debian.org>
-License: BSD-2-clause
-
Files:
utils/start-stop-daemon.c
Copyright:
@@ -141,25 +134,3 @@ License: GPL-2
.
You should have received a copy of the GNU General Public License
along with this program. If not, see <https://www.gnu.org/licenses/>.
-
-License: BSD-2-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- 1. Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in the
- documentation and/or other materials provided with the distribution.
- .
- THIS SOFTWARE IS PROVIDED BY AUTHORS AND CONTRIBUTORS ``AS IS'' AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
- FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- SUCH DAMAGE.
diff --git a/scripts/Dpkg/Gettext.pm b/scripts/Dpkg/Gettext.pm
index bac8f57cb..823a99a05 100644
--- a/scripts/Dpkg/Gettext.pm
+++ b/scripts/Dpkg/Gettext.pm
@@ -1,28 +1,21 @@
-# Copied from /usr/share/perl5/Debconf/Gettext.pm
+# Based on Debconf::Gettext.
#
# Copyright © 2000 Joey Hess <joeyh@debian.org>
+# Copyright © 2006 Nicolas François <nicolas.francois@centraliens.net>
# Copyright © 2007-2022 Guillem Jover <guillem@debian.org>
#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-# notice, this list of conditions and the following disclaimer in the
-# documentation and/or other materials provided with the distribution.
+# 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; either version 2 of the License, or
+# (at your option) any later version.
#
-# THIS SOFTWARE IS PROVIDED BY AUTHORS AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
+# This program 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/>.
package Dpkg::Gettext;
--
2.39.2
Reply to: