Merge tag 'debian/1.0.31-2' into develop

New upstream release

1 files changed, 14 insertions, 14 deletions

diff --git a/debian/copyright b/debian/copyright
index 9d9458a..6d5dc77 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -70,7 +70,7 @@ Copyright: 1997      BYTEC GmbH Germany
 License: GPL-2+ with sane exception
 
 Files: backend/canon630u.c
-Copyright: 2002      Nathan Rutman <nathan@gordian.com> 
+Copyright: 2002      Nathan Rutman <nathan@gordian.com>
            2001      Marcio Luis Teixeira
            1996-1997 Andreas Beck
            2000-2001 Michael Herder <crapsite@gmx.net>
@@ -232,7 +232,7 @@ License: GPL-2+ with sane exception
 Files: backend/gt68xx_generic.h
        backend/gt68xx_gt6801.h
        backend/gt68xx_gt6816.h
-       backend/gt68xx_mid.h   
+       backend/gt68xx_mid.h
        backend/gt68xx_shm_channel.*
 Copyright: 2002      Sergey Vlasov <vsu@altlinux.ru>
 License: GPL-2+ with sane exception
@@ -289,7 +289,7 @@ License: GPL-2+
 
 Files: backend/kvs1025.c
        backend/kvs20xx*.*
-       backend/kvs40xx.c 
+       backend/kvs40xx.c
        backend/kvs40xx_*.c
 Copyright:  2008      Panasonic Russia Ltd.
             2010-2011 m. allan noah
@@ -302,7 +302,7 @@ Copyright:  2008      Panasonic Russia Ltd.
 License: GPL-2+
 
 Files: backend/leo.*
-       backend/matsushita.* 
+       backend/matsushita.*
        backend/sceptre.*
        backend/teco1.*
        backend/teco3.*
@@ -478,7 +478,7 @@ Files: backend/plustek-pp_dac.c
        backend/plustek-usbhw.c
        backend/plustek-usbimg.c
        backend/plustek-usbio.c
-       backend/plustek-usbmap.c 
+       backend/plustek-usbmap.c
        backend/plustek-usbscan.c
        backend/plustek-usbshading.c
 Copyright: 1998      Plustek Inc.
@@ -560,7 +560,7 @@ License: GPL-2+ with sane exception
 Files: backend/snapscan-options.c
 Copyright: 1997-2013 Franck Schnefra
            1997-2013 Michel Roelofs
-           1997-2013 Emmanuel Blot 
+           1997-2013 Emmanuel Blot
            1997-2013 Mikko Tyolajarvi
            1997-2013 David Mosberger-Tang
            1997-2013 Wolfgang Goeller
@@ -576,7 +576,7 @@ License: GPL-2+ with sane exception
 Files: backend/snapscan-scsi.c
 Copyright: 1997-2013 Franck Schnefra
            1997-2013 Michel Roelofs
-           1997-2013 Emmanuel Blot 
+           1997-2013 Emmanuel Blot
            1997-2013 Mikko Tyolajarvi
            1997-2013 David Mosberger-Tang
            1997-2013 Wolfgang Goeller
@@ -593,7 +593,7 @@ License: GPL-2+ with sane exception
 Files: backend/snapscan-sources.c
 Copyright: 1997-2013 Franck Schnefra
            1997-2013 Michel Roelofs
-           1997-2013 Emmanuel Blot 
+           1997-2013 Emmanuel Blot
            1997-2013 Mikko Tyolajarvi
            1997-2013 David Mosberger-Tang
            1997-2013 Wolfgang Goeller
@@ -608,13 +608,13 @@ License: GPL-2+ with sane exception
 
 Files: backend/snapscan-sources.h
       backend/snapscan-usb.*
-Copyright: 2000       Henrik Johansson 
+Copyright: 2000       Henrik Johansson
 License: GPL-2+ with sane exception
 
 Files: backend/snapscan.c
 Copyright: 1997-2013 Franck Schnefra
            1997-2013 Michel Roelofs
-           1997-2013 Emmanuel Blot 
+           1997-2013 Emmanuel Blot
            1997-2013 Mikko Tyolajarvi
            1997-2013 David Mosberger-Tang
            1997-2013 Wolfgang Goeller
@@ -632,7 +632,7 @@ License: GPL-2+ with sane exception
 Files: backend/snapscan.h
 Copyright: 1997-2013 Franck Schnefra
            1997-2013 Michel Roelofs
-           1997-2013 Emmanuel Blot 
+           1997-2013 Emmanuel Blot
            1997-2013 Mikko Tyolajarvi
            1997-2013 David Mosberger-Tang
            1997-2013 Wolfgang Goeller
@@ -866,7 +866,7 @@ Files: sanei/sanei_usb.c
 Copyright: 2001-2005 Henning Meier-Geinitz
            2001      Frank Zago
            2003      Rene Rebe
-           2005      Paul Smedley <paul@smedley.info> 
+           2005      Paul Smedley <paul@smedley.info>
            2008      m. allan noah
            2009      Julien BLACHE <jb@jblache.org>
            2011      Reinhold Kainhofer <reinhold@kainhofer.com>
@@ -903,8 +903,8 @@ License: GPL-2+
 
 Files: tools/sane-desc.c
 Copyright: 2002-2006 Henning Meier-Geinitz <henning@meier-geinitz.de>
-           2004      Jose Gato <jgato@gsyc.escet.urjc.es> 
-           2006      Mattias Ellert <mattias.ellert@tsl.uu.se> 
+           2004      Jose Gato <jgato@gsyc.escet.urjc.es>
+           2006      Mattias Ellert <mattias.ellert@tsl.uu.se>
            2009      Dr. Ing. Dieter Jurzitza <dieter.jurzitza@t-online.de>
            2013      Tom Gundersen <teg@jklm.no>
 License: GPL-2+