Merge branch 'release/experimental/1.0.29-1_experimental1'experimental/1.0.29-1_experimental1

1 files changed, 82 insertions, 79 deletions

diff --git a/debian/copyright b/debian/copyright
index 8735810..80efaa3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -13,7 +13,9 @@ Copyright: 1997-2002 Kevin Dalley <kevind@rahul.net>
            2002-2011 Julien BLACHE <jblache@debian.org>
            2002-2006 Aurélien Jarno <aurel32@debian.org>
            2013      Mark Buda <hermit@acm.org>
-           2014-2017 Jörg Frings-Fürst <debian@jff.email>
+           2018      Laurent Bigonville <bigon@debian.org>
+           2019      John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
+           2014-2020 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-2+ with sane exception
 
 Files: backend/abaton.*
@@ -117,6 +119,11 @@ Files: backend/dmc.*
 Copyright: 1998      David F. Skoll
 License: GPL-2+ with sane exception
 
+Files: backend/escl/*
+Copyright: 2019      Touboul Nathane
+           2019      Thierry HUCHARD <thierry@ordissimo.com>
+License: GPL-2+ with sane exception
+
 Files: backend/epjitsu*.*
 Copyright: 2007-2015 m. allan noah <kitno455@gmail.com>
            2009      Richard Goedeken <richard@fascinationsoftware.com>
@@ -154,87 +161,37 @@ Copyright: 2000      Randolph Bentson
            2003-2016 m. allan noah
 License: GPL-2+ with sane exception
 
-Files: backend/genesys.c
-Copyright: 2003-2004 Henning Meier-Geinitz <henning@meier-geinitz.de>
-           2004-2005 Gerhard Jaeger <gerhard@gjaeger.de>
-           2004-2013 Stéphane Voltz <stef.dev@free.fr>
-           2005-2009 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-           2006      Laurent Charpentier <laurent_pubs@yahoo.com>
-           2007      Luke <iceyfor@gmail.com>
-           2010      Chris Berry <s0457957@sms.ed.ac.uk>
-           2010      Michael Rickmann <mrickma@gwdg.de>
-License: GPL-2+ with sane exception
-
-Files: backend/genesys.h
+Files: backend/genesys/genesys.h
 Copyright: 2003-2004 Henning Meier-Geinitz <henning@meier-geinitz.de>
            2004-2005 Gerhard Jaeger <gerhard@gjaeger.de>
            2004-2013 Stéphane Voltz <stef.dev@free.fr>
            2005-2009 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
 License: GPL-2+ with sane exception
 
-Files: backend/genesys_conv.c
-Copyright: 2010-2013 Stéphane Voltz <stef.dev@free.fr>
-           2005-2006 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-License: GPL-2+ with sane exception
-
-Files: backend/genesys_conv_hlp.c
-Copyright: 2005      Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-License: GPL-2+ with sane exception
-
-Files: backend/genesys_devices.c
-Copyright: 2003      Oliver Rauch
-           2003-2004 Henning Meier-Geinitz <henning@meier-geinitz.de>
-           2004-2005 Gerhard Jaeger <gerhard@gjaeger.de>
-           2004-2013 Stéphane Voltz <stef.dev@free.fr>
-           2005-2009 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-           2007      Luke <iceyfor@gmail.com>
-           2010      Jack McGill <jmcgill85258@yahoo.com>
-           2010      Andrey Loginov <avloginov@gmail.com>,
-           2010      Chris Berry <s0457957@sms.ed.ac.uk>
-           2010      Michael Rickmann <mrickma@gwdg.de>
-License: GPL-2+ with sane exception
-
-Files: backend/genesys_gl124.*
-       backend/genesys_gl841.h
-       backend/genesys_gl843.*
-       backend/genesys_gl846.*
-       backend/genesys_gl847.*
-       backend/genesys_low.c
+Files: backend/genesys/gl124.*
+       backend/genesys/gl841.h
+       backend/genesys/gl843.*
+       backend/genesys/gl846.*
+       backend/genesys/gl847.*
        backend/rts88*.*
        backend/umax_pp*.*
 Copyright: 2010-2016 Stéphane Voltz <stef.dev@free.fr>
 License: GPL-2+ with sane exception
 
-Files: backend/genesys_gl646.c
-Copyright: 2003      Oliver Rauch
-           2003-2004 Henning Meier-Geinitz <henning@meier-geinitz.de>
-           2004      Gerhard Jaeger <gerhard@gjaeger.de>
-           2004-2013 Stéphane Voltz <stef.dev@free.fr>
-           2005-2009 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-           2007      Luke <iceyfor@gmail.com>
-           2011      Alexey Osipov <simba@lerlan.ru> 
+Files: backend/genesys/error.cpp
+       backend/genesys/serialize.h
+       backend/genesys/error.h
+Copyright: 2019      Povilas Kanapickas <povilas@radix.lt>
 License: GPL-2+ with sane exception
 
-Files: backend/genesys_gl646.h
+Files: backend/genesys/gl646.h
 Copyright: 2003-2004 Henning Meier-Geinitz <henning@meier-geinitz.de>
            2004      Gerhard Jaeger <gerhard@gjaeger.de>
            2004-2013 Stéphane Voltz <stef.dev@free.fr>
            2005-2009 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
 License: GPL-2+ with sane exception
 
-Files: backend/genesys_gl841.c
-Copyright: 2003      Oliver Rauch
-           2003-2004 Henning Meier-Geinitz <henning@meier-geinitz.de>
-           2004      Gerhard Jaeger <gerhard@gjaeger.de>
-           2004-2013 Stéphane Voltz <stef.dev@free.fr>
-           2005      Philipp Schmid <philipp8288@web.de>
-           2005-2009 Pierre Willenbrock <pierre@pirsoft.dnsalias.org>
-           2006      Laurent Charpentier <laurent_pubs@yahoo.com>
-           2010      Chris Berry <s0457957@sms.ed.ac.uk>
-           2010      Michael Rickmann <mrickma@gwdg.de>
-License: GPL-2+ with sane exception
-
-Files: backend/genesys_low.h
+Files: backend/genesys/low.h
 Copyright: 2003      Oliver Rauch
            2003-2004 Henning Meier-Geinitz <henning@meier-geinitz.de>
            2004-2005 Gerhard Jaeger <gerhard@gjaeger.de>
@@ -464,30 +421,25 @@ Files: backend/pint.h
 Copyright: 1997      Gordon Matzigkeit
 License: GPL-2+ with sane exception
 
-Files: backend/pixma.*
-       backend/pixma_common.c
-       backend/pixma_imageclass.c
-       backend/pixma_mp150.c
-       backend/pixma_mp730.c
-       backend/pixma_mp810.c
+Files: backend/pixma/pixma*.*
 Copyright: 2007-2008 Nicolas Martin, <nicols-guest@alioth.debian.org>
            2006-2007 Wittawat Yamwong <wittawat@web.de>
-           2011-2016 Rolf Bensch <rolf@bensch-online.de>
+           2011-2019 Rolf Bensch <rolf@bensch-online.de>
 License: GPL-2+ with sane exception
 
-Files: backend/pixma_bjnp*.*
+Files: backend/pixma/pixma_bjnp*.*
 Copyright: 2008-2012 Louis Lagendijk
 License: GPL-2+ with sane exception
 
-Files: backend/pixma_common.h
-       backend/pixma_io_sanei.c
-       backend/pixma_mp750.c
+Files: backend/pixma/pixma_common.h
+       backend/pixma/pixma_io_sanei.c
+       backend/pixma/pixma_mp750.c
 Copyright: 2006-2007 Wittawat Yamwong <wittawat@web.de>
            2011-2016 Rolf Bensch <rolf@bensch-online.de>
 License: GPL-2+ with sane exception
 
-Files: backend/pixma_io.h
-       backend/pixma_rename.h
+Files: backend/pixma/pixma_io.h
+       backend/pixma/pixma_rename.h
 Copyright: 2006-2007 Wittawat Yamwong <wittawat@web.de>
 License: GPL-2+ with sane exception
 
@@ -558,6 +510,11 @@ Files: backend/ricoh*.*
 Copyright: 1998      F.W. Dillema <dillema@acm.org>
 License: GPL-2+ with sane exception
 
+Files: backend/ricoh2.c
+       backend/ricoh2_buffer.c
+Copyright: 2018      Stanislav Yuzvinsky
+License: GPL-2+ with sane exception
+
 Files: backend/s9036*.*
 Copyright: 1997      Ingo Schneider
 License: GPL-2+ with sane exception
@@ -760,8 +717,18 @@ Copyright: 2010-2011 Reinhold Kainhofer
 License: GPL-2+
 
 Files: doc/descriptions-external/utsushi.desc
-Copyright: 2004-2015 Olaf Meeuwissen
-License: GPL-2+
+Copyright: 2004-2019 Olaf Meeuwissen
+License: GPL-3+
+
+Files: po/Makevars
+Copyright: 2016-2019  Olaf Meeuwissen and the SANE developers
+License: GPL-2+ with sane exception
+
+Files: po/he.po
+       po/ca@valencia.po
+       po/ca.po
+Copyright: 2018      The SANE developers
+License: GPL-2+ with sane exception
 
 Files: po/fr.po
 Copyright: 2002      Frank Zago <fzago@austin.rr.com>
@@ -897,6 +864,25 @@ Copyright: 2001-2005 Henning Meier-Geinitz
            2011      Reinhold Kainhofer <reinhold@kainhofer.com>
 License: GPL-2+ with sane exception
 
+Files: testsuite/backend/Makefile.am
+       testsuite/backend/genesys/Makefile.am
+Copyright: 2019      Sane Developers
+License: GPL-2+ with sane exception
+
+Files: testsuite/backend/genesys/*
+Copyright: 2019      Povilas Kanapickas <povilas@radix.lt>
+License: GPL-2+ with sane exception
+
+Files: testsuite/backend/genesys/Makefile.am
+Copyright: 2019      Sane Developers
+License: GPL-2+ with sane exception
+
+Files: tools/create-release.sh
+       tools/create-changelog.sh
+       tools/update-upstreams.sh
+Copyright: 2017-2019 Olaf Meeuwissen
+License: GPL-3+
+
 Files: tools/RenSaneDlls.cmd
 Copyright: 2004-2005 Franz Bakan
 License: GPL-2+
@@ -925,7 +911,7 @@ License: GPL-2+
 
 Files: tools/sane-find-scanner.c
 Copyright: 1997-2013 Oliver Rauch
-           1997-2013  Henning Meier-Geinitz
+           1997-2013 Henning Meier-Geinitz
 License: GPL-2+
 
 License: Artistic
@@ -1099,6 +1085,23 @@ License: GPL-2
  License version 2 can be found in the file
  `/usr/share/common-licenses/GPL-2'.
 
+License: GPL-3+
+ 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 3 of the License, or
+ (at your option) any later version.
+ .
+ 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 <http://www.gnu.org/licenses/>
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
 License: LGPL-2.1+
  This library is free software; you can redistribute it and/or
  modify it under the terms of the GNU Lesser General Public