This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch main in repository dpkg.
View the commit online: https://git.dpkg.org/cgit/dpkg/dpkg.git/commit/?id=2fb0d6625668afe339328023148e6e48e6538ae8 commit 2fb0d6625668afe339328023148e6e48e6538ae8 Author: Guillem Jover <[email protected]> AuthorDate: Tue Mar 7 23:49:26 2023 +0100 Dpkg::Gettext: Relicense from BSD-2 to GPL-2+ 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 <[email protected]> --- 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 <[email protected]> Copyright © 1999-2001 Marcus Brinkmann <[email protected]> Copyright © 1999-2002 Wichert Akkerman <[email protected]> - Copyright © 2001, 2007, 2010 Joey Hess <[email protected]> + Copyright © 2000-2001, 2007, 2010 Joey Hess <[email protected]> Copyright © 2004-2005, 2007-2008, 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 Nicolas François <[email protected]> Copyright © 2007 Don Armstrong <[email protected]> Copyright © 2007 Colin Watson <[email protected]> Copyright © 2007, 2008 Tollef Fog Heen <[email protected]> @@ -72,13 +72,6 @@ Copyright: Copyright © 1999-2001, 2005-2006, 2009 Raphaël Hertzog <[email protected]> License: GPL-2 -Files: - scripts/Dpkg/Gettext.pm -Copyright: - Copyright © 2000 Joey Hess <[email protected]> - Copyright © 2007-2022 Guillem Jover <[email protected]> -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 00653a12f..3de8e0294 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 <[email protected]> +# Copyright © 2006 Nicolas François <[email protected]> # Copyright © 2007-2022 Guillem Jover <[email protected]> # -# 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/>. =encoding utf8 -- Dpkg.Org's dpkg
