d/copyright: Refresh for the new upstream release; Add year 2020 for debian/*

3 files changed, 37 insertions, 38 deletions

diff --git a/debian/changelog b/debian/changelog
index ed3f0b4..0204425 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -30,7 +30,7 @@ sane-backends (1.0.29-1~experimental1) experimental; urgency=medium
   * debian/sane-utils.config: Remove the RUN parameter in compliance with
     Debian Policy Manual section 9.3.3.1 (Closes: #915197).
   * debian/copyright:
-    - Add year 2019 for debian/*.
+    - Add year 2020 for debian/*.
     - Add missing Uploaders to debian/*.
     - Refresh for the new upstream release.
   * Fix the lintian warning "libsane: package-name-doesnt-match-sonames
diff --git a/debian/control b/debian/control
index fdebd2c..cb74d97 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Build-Depends:
  libavahi-client-dev,
  libcam-dev [kfreebsd-any],
  libcups2-dev,
- libcurl-dev,
+ libcurl4-gnutls-dev,
  libgphoto2-dev,
  libieee1284-3-dev [!hurd-i386],
  libjpeg-dev,
diff --git a/debian/copyright b/debian/copyright
index 9ce5455..80efaa3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,7 +15,7 @@ Copyright: 1997-2002 Kevin Dalley <kevind@rahul.net>
            2013      Mark Buda <hermit@acm.org>
            2018      Laurent Bigonville <bigon@debian.org>
            2019      John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
-           2014-2019 Jörg Frings-Fürst <debian@jff.email>
+           2014-2020 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-2+ with sane exception
 
 Files: backend/abaton.*
@@ -119,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>
@@ -156,39 +161,37 @@ Copyright: 2000      Randolph Bentson
            2003-2016 m. allan noah
 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_gl124.*
-       backend/genesys_gl841.h
-       backend/genesys_gl843.*
-       backend/genesys_gl846.*
-       backend/genesys_gl847.*
+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_error.cc
-       backend/genesys_serialize.h
-       backend/genesys_error.h
-       backend/genesys_sanei.cc
-       backend/genesys_sanei.h
+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_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>
@@ -418,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-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
 
@@ -508,15 +506,15 @@ Copyright: 1996-1997 Andreas Beck
            2008      Stéphane Voltz <stef.dev@free.fr>
 License: GPL-2+ with sane exception
 
+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/ricoh*.*
-Copyright: 1998      F.W. Dillema <dillema@acm.org>
-License: GPL-2+ with sane exception
-
 Files: backend/s9036*.*
 Copyright: 1997      Ingo Schneider
 License: GPL-2+ with sane exception
@@ -866,18 +864,19 @@ Copyright: 2001-2005 Henning Meier-Geinitz
            2011      Reinhold Kainhofer <reinhold@kainhofer.com>
 License: GPL-2+ with sane exception
 
-Files: testsuite/backend/genesys/Makefile.am
+Files: testsuite/backend/Makefile.am
+       testsuite/backend/genesys/Makefile.am
 Copyright: 2019      Sane Developers
 License: GPL-2+ with sane exception
 
-Files: testsuite/backend/genesys/minigtest.cc
-       testsuite/backend/genesys/minigtest.h
-       testsuite/backend/genesys/tests.cc
-       testsuite/backend/genesys/tests.h
-       testsuite/backend/genesys/tests_calibration.cc
+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