Update debian/copyright to reflect upstream's relicensing to GPL-2+, thanks to cme

3 files changed, 79 insertions, 17 deletions

diff --git a/debian/copyright b/debian/copyright
index 8769ea0..90d4225 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,25 +3,57 @@ Upstream-Name: cups-bjnp
 Source: http://cups-bjnp.sourceforge.net/
 
 Files: *
-Copyright: 2008-2012 Louis Lagendijk <llagendijk@sourforge.net>
-License: GPL-2.0
+Copyright: 2008-2014, Louis Lagendijk <llagendijk@sourceforge.net>
+License: GPL-2+
+
+Files: INSTALL
+Copyright: 1994-1996, 1999-2002, 2004-2013, Free Software Foundation
+License: FSFAP
+ Copying and distribution of this file, with or without modification, are
+  permitted in any medium without royalty provided the copyright notice and
+  this notice are preserved.  This file is offered as-is, without warranty of
+  any kind.
+
+Files: Makefile.in
+  aclocal.m4
+Copyright: 1989, 1991, 1994-2017, Free Software Foundation, Inc.
+License: GPL-2+
+
+Files: bjnp.c
+Copyright: 2008-2014, Louis Lagendijk
+  2007, Apple Inc.
+  1997-2007, Easy Software Products
+License: GPL-2+
+
+Files: compile
+  depcomp
+  missing
+Copyright: 1996-2017, Free Software Foundation, Inc.
+License: GPL-2+
+
+Files: configure
+Copyright: 1992-1996, 1998-2012, Free Software Foundation, Inc.
+License: FSFUL
+ This configure script is free software; the Free Software Foundation
+  gives unlimited permission to copy, distribute and modify it.
 
 Files: debian/*
-Copyright: 2012 Joe Nahmias <jello@debian.org>
-License: GPL-2.0
+Copyright: 2012, Joe Nahmias <jello@debian.org>
+License: GPL-2
 
-License: GPL-2.0
- This package is free software; you can redistribute it and/or modify
- it under the terms of version 2 of the GNU General Public License as
- published by the Free Software Foundation.
- .
- This package 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.
+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.
  .
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>
+ 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'.
+
+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 the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+ 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/debian/copyright-scan-patterns.yml b/debian/copyright-scan-patterns.yml
new file mode 100644
index 0000000..e5dc30f
--- /dev/null
+++ b/debian/copyright-scan-patterns.yml
@@ -0,0 +1,10 @@
+---
+ignore:
+  pattern:
+  - AUTHORS
+  - ChangeLog
+  - Makefile.am
+  - NEWS
+  - TODO
+  - acinclude.m4
+  - config.h.in
diff --git a/debian/fix.scanned.copyright b/debian/fix.scanned.copyright
new file mode 100644
index 0000000..06110dc
--- /dev/null
+++ b/debian/fix.scanned.copyright
@@ -0,0 +1,20 @@
+# Apply general license
+! Files:"*"
+  Copyright=~"s/Lagendijk/Lagendijk \<llagendijk\@sourceforge.net\>/"
+  License short_name="GPL-2+"
+
+# Fix wrong detections
+! Files:"bjnp.c" License short_name="GPL-2+"
+
+# Add missing licenses
+! Files:"INSTALL"
+  License short_name=FSFAP
+  full_license="Copying and distribution of this file, with or without modification, are
+permitted in any medium without royalty provided the copyright notice and
+this notice are preserved.  This file is offered as-is, without warranty of
+any kind."
+
+! Files:"configure"
+  License short_name=FSFUL
+  full_license="This configure script is free software; the Free Software Foundation
+gives unlimited permission to copy, distribute and modify it."