Rewrite debian/copyright thanks to `cme update dpkg-copyright`

1 files changed, 281 insertions, 71 deletions

diff --git a/debian/copyright b/debian/copyright
index 92678ed..fec9636 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -41,7 +41,7 @@ Copyright:
 License: GPL-2+
 
 Files: INSTALL
-Copyright: 1994-1996, 1999-2002, 2004-2013, Free Software Foundation
+Copyright: 1994-1996, 1999-2002, 2004-2016, Free Software
 License: FSFAP
  Copying and distribution of this file, with or without modification,
  are permitted in any medium without royalty provided the copyright
@@ -53,10 +53,13 @@ Copyright: 2000-2004, Roger Leigh
 License: GPL-2+
 
 Files: Makefile.in
-  aclocal.m4
-Copyright: 1989, 1991, 1994-2013, Free Software Foundation, Inc.
+Copyright: 1989, 1991, 1994-2018, Free Software Foundation, Inc.
 License: GPL-2+
 
+Files: aclocal.m4
+Copyright: 1996-2018, Free Software Foundation, Inc.
+License: GPL
+
 Files: configure
 Copyright: 1992-1996, 1998-2012, Free Software Foundation, Inc.
 License: FSFUL
@@ -72,7 +75,7 @@ Copyright: 2000-2004, Roger Leigh
 License: GPL-2+
 
 Files: doc/Makefile.in
-Copyright: 1989, 1991, 1994-2013, Free Software Foundation, Inc.
+Copyright: 1989, 1991, 1994-2018, Free Software Foundation, Inc.
 License: GPL-2+
 
 Files: doc/developer/Makefile.am
@@ -80,23 +83,107 @@ Copyright: 2001, Andy Stewart and Roger Leigh
 License: GPL-2+
 
 Files: doc/developer/Makefile.in
-Copyright: 1989, 1991, 1994-2013, Free Software Foundation, Inc.
+Copyright: 1989, 1991, 1994-2018, Free Software Foundation, Inc.
+License: GPL-2+
+
+Files: doc/gutenprint/*
+Copyright: 1997-2017, Dimitri van Heesch
+License: GPL-2+
+
+Files: doc/gutenprint/html/doxygen.css
+  doc/gutenprint/html/tabs.css
+Copyright:
+ Andreas Kemnade <akemnade@tzi.de>
+ Andy Stewart <andystewart@attbi.com>
+ Andy Thaller <thaller@ph.tum.de>
+ Charles Briscoe-Smith <cpbs@debian.org>
+ Dave Hill <dave@minnie.demon.co.uk>
+ David Pace <dpace@echo-on.net>
+ Eric Sharkey <sharkey@ale.physics.sunysb.edu>
+ Eugene Anikin <eugene@anikin.com>
+ Gernot Hassenpflug <aikishugyo@gmail.com>
+ Grant Taylor <gtaylor@picante.com>
+ Henryk "Buggs" Richter <tfa652@cks1.rz.uni-rostock.de>
+ Ian Young <ian@iay.org.uk>
+ Jean-Marc Verbavatz <verbavatz@ifrance.fr>
+ John Labovitz <johnl@johnlabovitz.com>
+ Karl Heinz Kremer <khk@khk.net>
+ Karsten Festag <karsten.festag@gmx.de>
+ Matthew Broughton <walterwego@macosx.com>
+ Mark Tomlinson <mark.tomlinson@xtra.co.nz>
+ Michael Mraka <michael.mraka@linux.cz>
+ Michael Natterer <mitschel@cs.tu-berlin.de>
+ Mike Sweet <mike@easysw.com>
+ Peter Missel <peter.missel@eplus-online.de>
+ Piotr Stachura <albert1@autocom.pl>
+ Richard Wisenoecker <Richard.Wisenoecker@gmx.at>
+ Robert Krawitz <rlk@alum.mit.edu>
+ Roger Leigh <rleigh@debian.org>
+ Sascha Sommer <saschasommer@freenet.de>
+ Solomon Peachy <pizza@shaftnet.org>
+ Steve Kann <stevek@stevek.com>
+ Steve Letter <sletter1@yahoo.com>
+ Steve Miller <smiller@rni.net>
+ Thomas Tonino <ttonino@bio.vu.nl>
+ Till Kamppeter <till.kamppeter@gmail.com>
 License: GPL-2+
 
 Files: doc/gutenprint/html/jquery.js
-Copyright: 2011, John Resig
+Copyright: 1997-2017, Dimitri van Heesch
+License: Expat
+
+Files: doc/gutenprintui2/*
+Copyright: 1997-2017, Dimitri van Heesch
 License: GPL-2+
 
-Files: doc/gutenprintui2/html/jquery.js
-Copyright: 2011, John Resig
+Files: doc/gutenprintui2/html/doxygen.css
+  doc/gutenprintui2/html/tabs.css
+Copyright:
+ Andreas Kemnade <akemnade@tzi.de>
+ Andy Stewart <andystewart@attbi.com>
+ Andy Thaller <thaller@ph.tum.de>
+ Charles Briscoe-Smith <cpbs@debian.org>
+ Dave Hill <dave@minnie.demon.co.uk>
+ David Pace <dpace@echo-on.net>
+ Eric Sharkey <sharkey@ale.physics.sunysb.edu>
+ Eugene Anikin <eugene@anikin.com>
+ Gernot Hassenpflug <aikishugyo@gmail.com>
+ Grant Taylor <gtaylor@picante.com>
+ Henryk "Buggs" Richter <tfa652@cks1.rz.uni-rostock.de>
+ Ian Young <ian@iay.org.uk>
+ Jean-Marc Verbavatz <verbavatz@ifrance.fr>
+ John Labovitz <johnl@johnlabovitz.com>
+ Karl Heinz Kremer <khk@khk.net>
+ Karsten Festag <karsten.festag@gmx.de>
+ Matthew Broughton <walterwego@macosx.com>
+ Mark Tomlinson <mark.tomlinson@xtra.co.nz>
+ Michael Mraka <michael.mraka@linux.cz>
+ Michael Natterer <mitschel@cs.tu-berlin.de>
+ Mike Sweet <mike@easysw.com>
+ Peter Missel <peter.missel@eplus-online.de>
+ Piotr Stachura <albert1@autocom.pl>
+ Richard Wisenoecker <Richard.Wisenoecker@gmx.at>
+ Robert Krawitz <rlk@alum.mit.edu>
+ Roger Leigh <rleigh@debian.org>
+ Sascha Sommer <saschasommer@freenet.de>
+ Solomon Peachy <pizza@shaftnet.org>
+ Steve Kann <stevek@stevek.com>
+ Steve Letter <sletter1@yahoo.com>
+ Steve Miller <smiller@rni.net>
+ Thomas Tonino <ttonino@bio.vu.nl>
+ Till Kamppeter <till.kamppeter@gmail.com>
 License: GPL-2+
 
+Files: doc/gutenprintui2/html/jquery.js
+Copyright: 1997-2017, Dimitri van Heesch
+License: Expat
+
 Files: include/Makefile.am
 Copyright: 2000-2004, Roger Leigh
 License: GPL-2+
 
 Files: include/Makefile.in
-Copyright: 1989, 1991, 1994-2013, Free Software Foundation, Inc.
+Copyright: 1989, 1991, 1994-2018, Free Software Foundation, Inc.
 License: GPL-2+
 
 Files: include/gutenprint/*
@@ -108,7 +195,7 @@ Copyright: 2000-2004, Roger Leigh
 License: GPL-2+
 
 Files: include/gutenprint/Makefile.in
-Copyright: 1989, 1991, 1994-2013, Free Software Foundation, Inc.
+Copyright: 1989, 1991, 1994-2018, Free Software Foundation, Inc.
 License: GPL-2+
 
 Files: include/gutenprint/array.h
@@ -126,8 +213,9 @@ Copyright: 1997-2008, Michael Sweet (mike@easysw.com)
 License: GPL-2+
 
 Files: include/gutenprint/gutenprint-version.h.in
+  include/gutenprint/refcache.h
   include/gutenprint/types.h
-Copyright: 1999-2003, 2007-2017, Robert Krawitz (rlk@alum.mit.edu)
+Copyright: 1999-2018, Robert Krawitz (rlk@alum.mit.edu)
 License: GPL-2+
 
 Files: include/gutenprint/list.h
@@ -147,7 +235,7 @@ Copyright: 2000-2004, Roger Leigh
 License: GPL-2+
 
 Files: include/gutenprintui2/Makefile.in
-Copyright: 1989, 1991, 1994-2013, Free Software Foundation, Inc.
+Copyright: 1989, 1991, 1994-2018, Free Software Foundation, Inc.
 License: GPL-2+
 
 Files: include/gutenprintui2/curve.h
@@ -163,31 +251,35 @@ Copyright: 1997-2008, Michael Sweet (mike@easysw.com)
 License: GPL-2+
 
 Files: m4/*
-Copyright: 1989, 1991, 1994-2013, Free Software Foundation, Inc.
+Copyright: 1989, 1991, 1994-2018, Free Software Foundation, Inc.
 License: GPL-2+
 
-Files: m4/gimp.m4
-Copyright: no-info-found
+Files: m4/glibc2.m4
+  m4/glibc21.m4
+  m4/lcmessage.m4
+Copyright: 1995-2002, 2004, 2005, 2008-2014, Free Software Foundation
 License: GPL-2+
 
 Files: m4/libtool.m4
-Copyright: 1996-2001, 2003-2011, Free Software
-License: GPL-2+
+Copyright: 1996-2018, Free Software Foundation, Inc.
+License: GPL
 
 Files: m4/ltoptions.m4
-Copyright: 2004, 2005, 2007-2009, Free Software Foundation
+  m4/ltsugar.m4
+  m4/lt~obsolete.m4
+  m4/nls.m4
+Copyright: 1995-2016, Free Software
 License: GPL-2+
 
 Files: m4/stp.m4
   m4/stp_cups.m4
-  m4/stp_gimp.m4
   m4/stp_option.m4
   m4/stp_release.m4
 Copyright: 2000-2004, Roger Leigh
 License: GPL-2+
 
 Files: m4extra/*
-Copyright: 1989, 1991, 1994-2013, Free Software Foundation, Inc.
+Copyright: 1989, 1991, 1994-2018, Free Software Foundation, Inc.
 License: GPL-2+
 
 Files: m4extra/glib.m4
@@ -212,31 +304,35 @@ Copyright: 2000-2004, Roger Leigh
 License: GPL-2+
 
 Files: man/Makefile.in
-Copyright: 1989, 1991, 1994-2013, Free Software Foundation, Inc.
+Copyright: 1989, 1991, 1994-2018, Free Software Foundation, Inc.
 License: GPL-2+
 
 Files: man/cups-calibrate.8.in
 Copyright: 2000-2004, Roger Leigh <rleigh@debian.org>
-License: GPL-2+
+License: GPL-2
 
 Files: man/escputil.1.in
-Copyright: 2000-2002, 2014, Robert Krawitz <rlk@alum.mit.edu>
+Copyright: 2000-2008, 2014, Robert Krawitz <rlk@alum.mit.edu>
 License: GPL-2+
 
 Files: po/Makefile.in.in
 Copyright: 1995-1997, 2000-2006, Ulrich Drepper <drepper@gnu.ai.mit.edu>
-License: Gettext-functionality
+License: GPL
  This file can be copied and used freely without restrictions.  It can
  be used in projects which are not available under the GNU General Public
  License but which still want to provide support for the GNU gettext
  functionality.
 
+Files: po/Makevars
+Copyright: for their translations to this person
+License: GPL-2+
+
 Files: po/POTFILES.in
-Copyright: 2000-2004, Roger Leigh
+Copyright: 2000, Roger Leigh
 License: GPL-2+
 
 Files: samples/*
-Copyright: 1989, 1991, 1994-2013, Free Software Foundation, Inc.
+Copyright: 1989, 1991, 1994-2018, Free Software Foundation, Inc.
 License: GPL-2+
 
 Files: samples/Makefile.am
@@ -244,21 +340,32 @@ Copyright: 2000-2004, Roger Leigh
 License: GPL-2+
 
 Files: scripts/*
-Copyright: 1989, 1991, 1994-2013, Free Software Foundation, Inc.
+Copyright: 1996-2018, Free Software Foundation, Inc.
 License: GPL-2+
 
 Files: scripts/Makefile.am
 Copyright: 2000-2004, Roger Leigh
 License: GPL-2+
 
+Files: scripts/Makefile.in
+Copyright: 1989, 1991, 1994-2018, Free Software Foundation, Inc.
+License: GPL-2+
+
+Files: scripts/autogen.sh
+Copyright: 1989, 1991, 1994-2013, Free Software Foundation, Inc.
+License: GPL-2+
+
 Files: scripts/gversion
   scripts/gversion.in
-Copyright: 2008, 2016, 2017, Robert Krawitz
+  scripts/test-gversion.in
+Copyright: 2008, 2016-2018, Robert Krawitz
 License: GPL-2+
 
 Files: scripts/mkgitlog
   scripts/mkgitlog.in
-Copyright: 1999-2003, 2007-2017, Robert Krawitz (rlk@alum.mit.edu)
+  scripts/wzpaq
+  scripts/wzpaq.in
+Copyright: 1999-2018, Robert Krawitz (rlk@alum.mit.edu)
 License: GPL-2+
 
 Files: src/*
@@ -270,11 +377,11 @@ Copyright: 2000-2004, Roger Leigh
 License: GPL-2+
 
 Files: src/Makefile.in
-Copyright: 1989, 1991, 1994-2013, Free Software Foundation, Inc.
+Copyright: 1989, 1991, 1994-2018, Free Software Foundation, Inc.
 License: GPL-2+
 
 Files: src/cups/*
-Copyright: 2007-2017, Solomon Peachy <pizza@shaftnet.org>
+Copyright: 2007-2018, Solomon Peachy <pizza@shaftnet.org>
 License: GPL-2+
 
 Files: src/cups/Info.plist.in
@@ -286,7 +393,12 @@ Copyright: 2000-2004, Roger Leigh
 License: GPL-2+
 
 Files: src/cups/Makefile.in
-Copyright: 1989, 1991, 1994-2013, Free Software Foundation, Inc.
+Copyright: 1989, 1991, 1994-2018, Free Software Foundation, Inc.
+License: GPL-2+
+
+Files: src/cups/blacklist
+  src/cups/commandtocanon.c
+Copyright: 2007-2017, Solomon Peachy <pizza@shaftnet.org>
 License: GPL-2+
 
 Files: src/cups/commandtoepson.c
@@ -294,12 +406,15 @@ Files: src/cups/commandtoepson.c
 Copyright: 1993-2000, Easy Software Products.
 License: GPL-2+
 
-Files: src/cups/cups-genppdupdate.in
-Copyright: 2002, 2003, Roger Leigh (rleigh@debian.org)
+Files: src/cups/cups-genppd.c
+  src/cups/genppd.c
+  src/cups/genppd.h
+  src/cups/gutenprint.c
+Copyright: 1993-2008, Mike Sweet and Robert Krawitz.
 License: GPL-2+
 
-Files: src/cups/genppd.c
-Copyright: 1993-2008, Mike Sweet and Robert Krawitz.
+Files: src/cups/cups-genppdupdate.in
+Copyright: 2002, 2003, Roger Leigh (rleigh@debian.org)
 License: GPL-2+
 
 Files: src/cups/i18n.c
@@ -307,12 +422,15 @@ Files: src/cups/i18n.c
 Copyright: 1997-2008, Michael Sweet (mike@easysw.com)
 License: GPL-2+
 
-Files: src/cups/rastertoprinter.c
-Copyright: 1993-2008, Mike Sweet.
+Files: src/cups/min-pagesize.in
+  src/cups/test-ppds.in
+  src/cups/test-rastertogutenprint.check.in
+  src/cups/test-rastertogutenprint.in
+Copyright: 1999-2018, Robert Krawitz (rlk@alum.mit.edu)
 License: GPL-2+
 
-Files: src/cups/test-rastertogutenprint.in
-Copyright: 1999-2003, 2007-2017, Robert Krawitz (rlk@alum.mit.edu)
+Files: src/cups/rastertogutenprint.c
+Copyright: 1993-2008, Mike Sweet.
 License: GPL-2+
 
 Files: src/escputil/Makefile.am
@@ -320,7 +438,7 @@ Copyright: 2000-2004, Roger Leigh
 License: GPL-2+
 
 Files: src/escputil/Makefile.in
-Copyright: 1989, 1991, 1994-2013, Free Software Foundation, Inc.
+Copyright: 1989, 1991, 1994-2018, Free Software Foundation, Inc.
 License: GPL-2+
 
 Files: src/escputil/d4lib.c
@@ -328,7 +446,7 @@ Copyright: 2001, Jean-Jacques Sarton jj.sarton@t-online.de
 License: GPL-2+
 
 Files: src/escputil/escputil.c
-Copyright: 1999-2003, 2007-2017, Robert Krawitz (rlk@alum.mit.edu)
+Copyright: 1999-2018, Robert Krawitz (rlk@alum.mit.edu)
 License: GPL-2+
 
 Files: src/gimp2/Makefile.am
@@ -336,7 +454,7 @@ Copyright: 2000-2004, Roger Leigh
 License: GPL-2+
 
 Files: src/gimp2/Makefile.in
-Copyright: 1989, 1991, 1994-2013, Free Software Foundation, Inc.
+Copyright: 1989, 1991, 1994-2018, Free Software Foundation, Inc.
 License: GPL-2+
 
 Files: src/gimp2/print-image-gimp.c
@@ -358,7 +476,7 @@ Copyright: 2000-2004, Roger Leigh
 License: GPL-2+
 
 Files: src/gutenprintui2/Makefile.in
-Copyright: 1989, 1991, 1994-2013, Free Software Foundation, Inc.
+Copyright: 1989, 1991, 1994-2018, Free Software Foundation, Inc.
 License: GPL-2+
 
 Files: src/gutenprintui2/curve.c
@@ -377,7 +495,7 @@ License: GPL-2+
 
 Files: src/gutenprintui2/printrcy.c
   src/gutenprintui2/printrcy.h
-Copyright: 1984, 1989, 1990, 2000-2012, Free Software Foundation, Inc.
+Copyright: 1984, 1989, 1990, 2000-2015, Free Software Foundation, Inc.
 License: GPL-3+
 
 Files: src/main/Makefile.am
@@ -385,7 +503,7 @@ Copyright: 2000-2004, Roger Leigh
 License: GPL-2+
 
 Files: src/main/Makefile.in
-Copyright: 1989, 1991, 1994-2013, Free Software Foundation, Inc.
+Copyright: 1989, 1991, 1994-2018, Free Software Foundation, Inc.
 License: GPL-2+
 
 Files: src/main/array.c
@@ -417,7 +535,8 @@ Files: src/main/channel.c
   src/main/generic-options.c
   src/main/generic-options.h
   src/main/print-dither-matrices.c
-Copyright: 1999-2003, 2007-2017, Robert Krawitz (rlk@alum.mit.edu)
+  src/main/refcache.c
+Copyright: 1999-2018, Robert Krawitz (rlk@alum.mit.edu)
 License: GPL-2+
 
 Files: src/main/color.c
@@ -432,6 +551,10 @@ Files: src/main/dither-eventone.c
 Copyright: 2002, 2003, Mark Tomlinson (mark@southern.co.nz)
 License: GPL-2+
 
+Files: src/main/escp2-papers.c
+Copyright: 1997-2000, Michael Sweet (mike@easysw.com) and
+License: GPL-2+
+
 Files: src/main/gutenprint.pc.in
 Copyright: no-info-found
 License: GPL-2+
@@ -453,13 +576,13 @@ Copyright: 2016, Steve Letter (sletter1@yahoo.com)
   1997-2000, Michael Sweet (mike@easysw.com)
 License: GPL-2+
 
-Files: src/main/print-lexmark.c
-Copyright: 2000, Richard Wisenoecker (richard.wisenoecker@gmx.at) and
+Files: src/main/print-dyesub.c
+Copyright: 2007-2018, Solomon Peachy (pizza@shaftnet.org)
+  2003-2006, Michael Mraka (Michael.Mraka@linux.cz)
 License: GPL-2+
 
-Files: src/main/print-olympus.c
-Copyright: 2007-2017, Solomon Peachy (pizza@shaftnet.org)
-  2003-2006, Michael Mraka (Michael.Mraka@linux.cz)
+Files: src/main/print-lexmark.c
+Copyright: 2000, Richard Wisenoecker (richard.wisenoecker@gmx.at) and
 License: GPL-2+
 
 Files: src/main/print-pcl.c
@@ -472,7 +595,7 @@ Copyright: 2007, Michael R Sweet and Robert Krawitz
 License: GPL-2+
 
 Files: src/testpattern/*
-Copyright: 1999-2003, 2007-2017, Robert Krawitz (rlk@alum.mit.edu)
+Copyright: 1999-2018, Robert Krawitz (rlk@alum.mit.edu)
 License: GPL-2+
 
 Files: src/testpattern/Makefile.am
@@ -480,21 +603,23 @@ Copyright: 2000-2004, Roger Leigh
 License: GPL-2+
 
 Files: src/testpattern/Makefile.in
-Copyright: 1989, 1991, 1994-2013, Free Software Foundation, Inc.
+Copyright: 1989, 1991, 1994-2018, Free Software Foundation, Inc.
 License: GPL-2+
 
 Files: src/testpattern/compare-checksums.in
   src/testpattern/compress-checksums.in
-Copyright: 2008, 2016, 2017, Robert Krawitz
+  src/testpattern/run-testpattern-2.check.in
+Copyright: 2008, 2016-2018, Robert Krawitz
 License: GPL-2+
 
-Files: src/testpattern/run-testpattern-2.in
-Copyright: 2006-2017, Robert Krawitz (rlk@alum.mit.edu) and other
+Files: src/testpattern/run-testpattern-1.in
+  src/testpattern/run-testpattern-2.in
+Copyright: 2004-2017, Robert Krawitz (rlk@alum.mit.edu) and other
 License: GPL-2+
 
 Files: src/testpattern/testpattern.c
   src/testpattern/testpattern.h
-Copyright: 2000-2002, 2014, Robert Krawitz <rlk@alum.mit.edu>
+Copyright: 2000-2008, 2014, Robert Krawitz <rlk@alum.mit.edu>
 License: GPL-2+
 
 Files: src/testpattern/testpatternl.c
@@ -503,53 +628,85 @@ License: GPL-2+
 
 Files: src/testpattern/testpatterny.c
   src/testpattern/testpatterny.h
-Copyright: 1984, 1989, 1990, 2000-2012, Free Software Foundation, Inc.
+Copyright: 1984, 1989, 1990, 2000-2015, Free Software Foundation, Inc.
 License: GPL-3+
 
 Files: src/xml/*
-Copyright: 1989, 1991, 1994-2013, Free Software Foundation, Inc.
+Copyright: 1989, 1991, 1994-2018, Free Software Foundation, Inc.
 License: GPL-2+
 
 Files: src/xml/Makefile.am
-Copyright: 2008, 2016, 2017, Robert Krawitz
+Copyright: 2008, 2016-2018, Robert Krawitz
+License: GPL-2+
+
+Files: src/xml/dither/Makefile.am
+Copyright: 2008, 2016-2018, Robert Krawitz
 License: GPL-2+
 
 Files: src/xml/escp2/Makefile.am
-Copyright: 2008, 2016, 2017, Robert Krawitz
+Copyright: 2008, 2016-2018, Robert Krawitz
 License: GPL-2+
 
 Files: src/xml/escp2/inks/Makefile.am
-Copyright: 2008, 2016, 2017, Robert Krawitz
+Copyright: 2008, 2016-2018, Robert Krawitz
 License: GPL-2+
 
 Files: src/xml/escp2/inputslots/Makefile.am
-Copyright: 2008, 2016, 2017, Robert Krawitz
+Copyright: 2008, 2016-2018, Robert Krawitz
 License: GPL-2+
 
 Files: src/xml/escp2/media/Makefile.am
-Copyright: 2008, 2016, 2017, Robert Krawitz
+Copyright: 2008, 2016-2018, Robert Krawitz
 License: GPL-2+
 
 Files: src/xml/escp2/mediasizes/Makefile.am
-Copyright: 2008, 2016, 2017, Robert Krawitz
+Copyright: 2008, 2016-2018, Robert Krawitz
 License: GPL-2+
 
 Files: src/xml/escp2/model/Makefile.am
-Copyright: 2008, 2016, 2017, Robert Krawitz
+Copyright: 2008, 2016-2018, Robert Krawitz
+License: GPL-2+
+
+Files: src/xml/escp2/model/base/Makefile.am
+Copyright: 2008, 2016-2018, Robert Krawitz
 License: GPL-2+
 
 Files: src/xml/escp2/qualitypresets/Makefile.am
-Copyright: 2008, 2016, 2017, Robert Krawitz
+Copyright: 2008, 2016-2018, Robert Krawitz
+License: GPL-2+
+
+Files: src/xml/escp2/resolutions/Makefile.am
+Copyright: 2017, Krawitz
 License: GPL-2+
 
 Files: src/xml/escp2/weaves/Makefile.am
-Copyright: 2008, 2016, 2017, Robert Krawitz
+Copyright: 2008, 2016-2018, Robert Krawitz
 License: GPL-2+
 
 Files: src/xml/extract-strings.c
 Copyright: 2008, Robert Krawitz.
 License: GPL-2+
 
+Files: src/xml/papers/Makefile.am
+Copyright: 2008, 2016-2018, Robert Krawitz
+License: GPL-2+
+
+Files: src/xml/printers/*
+Copyright: 1999-2018, Robert Krawitz (rlk@alum.mit.edu)
+License: GPL-2+
+
+Files: src/xml/printers/Makefile.am
+Copyright: 2008, 2016-2018, Robert Krawitz
+License: GPL-2+
+
+Files: src/xml/printers/Makefile.in
+Copyright: 1989, 1991, 1994-2018, Free Software Foundation, Inc.
+License: GPL-2+
+
+Files: src/xml/xmli18n-tmp.h
+Copyright: 1989, 1991, 1994-2013, Free Software Foundation, Inc.
+License: GPL-2+
+
 Files: test/*
 Copyright: 1999-2003, 2007-2017, Robert Krawitz (rlk@alum.mit.edu)
 License: GPL-2+
@@ -559,15 +716,24 @@ Copyright: 2000-2004, Roger Leigh
 License: GPL-2+
 
 Files: test/Makefile.in
-Copyright: 1989, 1991, 1994-2013, Free Software Foundation, Inc.
+Copyright: 1989, 1991, 1994-2018, Free Software Foundation, Inc.
 License: GPL-2+
 
 Files: test/bjc-unprint.c
 Copyright: 2001, Andy Thaller <thaller@ph.tum.de>
 License: GPL-2+
 
+Files: test/curve.c
+  test/escp2-weavetest.c
+  test/run-testdither.in
+  test/test-curve.in
+  test/xml-curve.c
+Copyright: 1999-2018, Robert Krawitz (rlk@alum.mit.edu)
+License: GPL-2+
+
 Files: test/gen-printer-list.c
-Copyright: 2000-2002, 2014, Robert Krawitz <rlk@alum.mit.edu>
+  test/parse-escp2.in
+Copyright: 2000-2008, 2014, Robert Krawitz <rlk@alum.mit.edu>
 License: GPL-2+
 
 Files: test/pcl-unprint.c
@@ -587,6 +753,50 @@ Files: test/unprint.c
 Copyright: 2000, 2001, Eric Sharkey <sharkey@superk.physics.sunysb.edu>
 License: GPL-2+
 
+License: Expat
+ This software is Copyright (c) 2018 by foo.
+ .
+ This is free software, licensed under:
+ .
+   The MIT (X11) License
+ .
+ The MIT License
+ .
+ Permission is hereby granted, free of charge, to any person
+ obtaining a copy of this software and associated
+ documentation files (the "Software"), to deal in the Software
+ without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to
+ whom the Software is furnished to do so, subject to the
+ following conditions:
+ .
+ The above copyright notice and this permission notice shall
+ be included in all copies or substantial portions of the
+ Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT
+ WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+ INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR
+ PURPOSE AND NONINFRINGEMENT. IN NO EVENT
+ SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
+ TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+ CONNECTION WITH THE SOFTWARE OR THE USE OR
+ OTHER DEALINGS IN THE SOFTWARE.
+
+License: GPL
+ Please fill license GPL from header of aclocal.m4
+
+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.
+ 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