From a648ef13af4c34dae88cd1ca9cbd9a123cd7cd74 Mon Sep 17 00:00:00 2001 From: Till Kamppeter Date: Wed, 18 Jan 2023 17:48:10 -0300 Subject: [PATCH] COPYING, NOTICE: Simplification for autotools-generated files autotools-generated files can be included under the license of the upstream code, and FSF copyright added to upstream copyright list. Simplified debian/copyright appropriately. --- COPYING | 15 +-------------- NOTICE | 1 + 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/COPYING b/COPYING index dab3e6c41..6b4b79be8 100644 --- a/COPYING +++ b/COPYING @@ -6,6 +6,7 @@ Source: http://www.openprinting.org/download/cups-filters/ Files: * Copyright: 2011-2022 OpenPrinting 1993-2007 Easy Software Products + 1996-2023 Free Software Foundation, Inc. 2003-2015 Tim Waugh 2003-2006 Red Hat, Inc. 2006-2012 BBR Inc. @@ -33,10 +34,6 @@ Copyright: 2011-2022 OpenPrinting 2022 Sachin Thakan Licence: Apache-2.0-with-GPL2-LGPL2-Exception -Files: ltmain.sh -Copyright: 1996-2001, 2003-2011 Free Software Foundation, Inc. -License: GPL-2+ - License: Apache-2.0-with-GPL2-LGPL2-Exception Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -64,13 +61,3 @@ License: Apache-2.0-with-GPL2-LGPL2-Exception prospectively choose to deem waived or otherwise exclude such Section(s) of the License, but only in their entirety and only with respect to the Combined Software. - -License: GPL-2+ - 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 dated June, 1991, or (at - your option) any later version. - . - On Debian systems, the complete text of version 2 of the GNU General - Public License can be found in '/usr/share/common-licenses/GPL-2'. - diff --git a/NOTICE b/NOTICE index 6dd7d98bb..a60a9894c 100644 --- a/NOTICE +++ b/NOTICE @@ -2,6 +2,7 @@ cups-filters Copyright © 2011-2022 OpenPrinting Copyright © 1993-2007 Easy Software Products +Copyright © 1996-2023 Free Software Foundation, Inc. Copyright © 2003-2015 Tim Waugh Copyright © 2003-2006 Red Hat, Inc. Copyright © 2006-2012 BBR Inc. -- 2.47.3