Merge branch 'release/debian/1.0.14-13'debian/1.0.14-13

20 files changed, 68 insertions, 80 deletions

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..a62f7b9
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,18 @@
+Hello,
+
+now I use the branching model from Vincent Driessen[1].
+
+I use the gitflow-avh[2]. with the Documentation[3].
+The Debian package can be found here[4].
+
+Please upload unattended uploads use a branch feature/<your title>.
+
+
+Many thanks.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Fri, 02 Jun 2017 19:00:40 +0200
+
+[1] http://nvie.com/posts/a-successful-git-branching-model/
+[2] https://github.com/petervanderdoes/gitflow-avh
+[3] https://github.com/petervanderdoes/gitflow-avh/wiki
+[4] https://tracker.debian.org/pkg/git-flow
diff --git a/debian/changelog b/debian/changelog
index 07a7da7..c1fc88a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,14 +1,32 @@
-sane-frontends (1.0.14-13) UNRELEASED; urgency=medium
+sane-frontends (1.0.14-13) unstable; urgency=medium
 
-  * debian/watch:
-    - Switch to gitlab.
   * Change to my new email address.
+  * New README.source to explain the branching model used.
   * Migrate to debhelper 11:
     - Change debian/compat to 11.
     - Bump minimum debhelper version in debian/control to >= 11.
+    - Remove Build-Depend autotools.dev in debian/control.
+    - Remove --with autotools-dev from debian/rules.
   * Declare compliance with Debian Policy 4.2.1 (No changes needed).
+  * Remove obsolete package sane-dbg.
+  * Rename patches and remove not used debian/patches/scanadf-sigchld.diff.
+  * debian/watch:
+    - Switch to gitlab.
+  * debian/changelog:
+    - Remove trailing whitespaces.
+  * debian/control:
+    - Change Vcs-* to point to the new repository.
+    - Remove trailing whitespaces.
+    - Remove outdated minimum version for libgimp2.0-dev and libsane-dev.
+  * debian/copyright:
+    - Use secure copyright format URI.
+    - Update source.
+  * debian/sane.dirs:
+    - Remove usr/share/sane.
+  * debian/sane.install:
+    - Remove usr/share/sane/* and usr/bin/*.
 
- -- Jörg Frings-Fürst <debian@jff.email>  Sat, 08 Sep 2018 15:03:19 +0200
+ -- Jörg Frings-Fürst <debian@jff.email>  Sat, 08 Sep 2018 19:34:09 +0200
 
 sane-frontends (1.0.14-12) unstable; urgency=medium
 
@@ -48,7 +66,7 @@ sane-frontends (1.0.14-10) unstable; urgency=medium
     - Add Vcs-* to new git repository.
   * debian/compat:
     - Change from 5 to 9.
-  * New debian/source/format 
+  * New debian/source/format
     - Set to "3.0 (quilt)".
   * Convert patches from dpatch to quilt.
   * Rewrite debian/copyright.
@@ -302,10 +320,10 @@ sane-frontends (1.0.8-2) unstable; urgency=low
 sane-frontends (1.0.8-1) unstable; urgency=low
 
   * New upstream release.  New frontend scanadf, focusing on scanners with
-    automatic document feeders. 
+    automatic document feeders.
 
  -- Kevin Dalley <kevind@rahul.net>  Sun,  6 Oct 2002 18:14:23 -0700
-  
+
 sane-frontends (1.0.7-2.1) unstable; urgency=medium
 
   * Non-Maintainer Upload.
@@ -365,7 +383,7 @@ sane (1.0.1-1999-10-21-12) frozen unstable; urgency=low
 sane (1.0.1-1999-10-21-11) frozen unstable; urgency=low
 
   * Add Build-Depends to control files for sane and sane-gimp1.1 (closes:
-    #60923). 
+    #60923).
 
  -- Kevin Dalley <kevind@rahul.net>  Mon, 27 Mar 2000 03:16:55 -0800
 
@@ -506,11 +524,11 @@ sane (1.00-1) unstable; urgency=low
 
 sane (0.74-2) unstable; urgency=low
 
-  * temporarily comment out artec in dll.conf, due to bad interaction with 
+  * temporarily comment out artec in dll.conf, due to bad interaction with
     Umax scanner.  If artec is used as a scanner, uncomment artec from
-    dll.conf 
+    dll.conf
   * automatically generates conffiles, thanks for
-    Roman.Hodek@informatik.uni-erlangen.de (fixes bug #26545) 
+    Roman.Hodek@informatik.uni-erlangen.de (fixes bug #26545)
   * fixes problem with creation of /usr/share/sane during build process
     (bug #26314)
 
@@ -555,7 +573,7 @@ sane (0.70-1) unstable; urgency=low
     UMAX backend
 
   * add patches 2-5 to SnapScan backend which allows other scanners
-    to work	
+    to work
 
  -- Kevin Dalley <kevind@rahul.net>  Sat, 31 Jan 1998 17:32:53 -0800
 
@@ -564,7 +582,7 @@ sane (0.69-2) unstable; urgency=low
   * correct umax-scanner.h so that Astra 1200S is legal
 
  -- Kevin Dalley <kevind@rahul.net>  Sun, 25 Jan 1998 09:44:45 -0800
-	
+
 sane (0.69-1) unstable; urgency=low
 
   * update to version 0.69 of sane
@@ -604,5 +622,3 @@ sane (0.67-1) unstable; urgency=low
   * first Debian release of sane
 
  -- Kevin Dalley <kevind@rahul.net>  Tue, 18 Nov 1997 21:38:41 -0800
-
-
diff --git a/debian/control b/debian/control
index c42df42..4176c93 100644
--- a/debian/control
+++ b/debian/control
@@ -4,14 +4,13 @@ Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
 Standards-Version: 4.2.1
 Build-Depends:
- autotools-dev,
  debhelper (>= 11),
- libgimp2.0-dev (>= 2.0.0),
+ libgimp2.0-dev,
  libgtk2.0-dev,
- libsane-dev (>= 1.0.11-3),
+ libsane-dev
 Homepage: http://www.sane-project.org
-Vcs-Git: git://anonscm.debian.org/collab-maint/sane-frontends.git
-Vcs-Browser: https://anonscm.debian.org/cgit/collab-maint/sane-frontends.git
+Vcs-Git: git://jff.email/opt/git/sane-frontends.git
+Vcs-Browser: https://jff.email/cgit/sane-frontends.git
 
 Package: sane
 Architecture: any
@@ -36,30 +35,3 @@ Description: scanner graphical frontends
  operating systems, including GNU/Linux, OS/2, Win32 and various Unices
  and is available under the GNU General Public License (commercial
  applications and backends are welcome, too, however).
-
-Package: sane-dbg
-Section: debug
-Priority: extra
-Architecture: any
-Depends: 
- ${misc:Depends},
- sane (= ${binary:Version})
-Description: scanner graphical frontends (debug symbols)
- This package includes :
-  o xscanimage, a scanner graphical frontend with GIMP 2.0 support
-  o scanadf, a command-line frontend for scanners with Automatic Document Feeder
-  o xcam, for acquiring images continuously from cameras.
- .
- An alternative to xscanimage called xsane is packaged separately.
- .
- The scanner frontends use SANE.  SANE stands for "Scanner Access Now
- Easy" and is an application programming interface (API) that provides
- standardized access to any raster image scanner hardware (flatbed
- scanner, hand-held scanner, video- and still-cameras, frame-grabbers,
- etc.). The SANE standard is free and its discussion and development are
- open to everybody. The current source code is written to support several
- operating systems, including GNU/Linux, OS/2, Win32 and various Unices
- and is available under the GNU General Public License (commercial
- applications and backends are welcome, too, however).
- .
- This package contains the debugging symbols for the SANE frontends.
diff --git a/debian/copyright b/debian/copyright
index 9129abe..c7965da 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: sane-backends
-Upstream-Contact:
-Source: ftp://ftp.sane-project.org/pub/sane/
+Upstream-Contact: 
+Source: https://gitlab.com/sane-project
 
 Files: *
 Copyright: 1995      Spencer Kimball
@@ -15,7 +15,7 @@ License: GPL-2+ with sane exception
 Files: debian/*
 Copyright: 1997-2002 Kevin Dalley <kevind@rahul.net>
            2002-2009 Julien BLACHE <jblache@debian.org>
-           2014-2017 Jörg Frings-Fürst <debian@jff.email>
+           2014-2018 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-2+ with sane exception
 
 Files: include/*.h
diff --git a/debian/files b/debian/files
deleted file mode 100644
index 0081bd9..0000000
--- a/debian/files
+++ /dev/null
@@ -1 +0,0 @@
-sane-frontends_1.0.14-12_source.buildinfo graphics optional
diff --git a/debian/patches/01_xcam.c_dead_code.patch b/debian/patches/0100-xcam.c_dead_code.patch
index f90bc6b..f90bc6b 100644
--- a/debian/patches/01_xcam.c_dead_code.patch
+++ b/debian/patches/0100-xcam.c_dead_code.patch
diff --git a/debian/patches/03_scanadf_options_fix.patch b/debian/patches/0105-scanadf_options_fix.patch
index 8c1b0c7..8c1b0c7 100644
--- a/debian/patches/03_scanadf_options_fix.patch
+++ b/debian/patches/0105-scanadf_options_fix.patch
diff --git a/debian/patches/04_cap_always_settable.patch b/debian/patches/0110-cap_always_settable.patch
index aef60f1..aef60f1 100644
--- a/debian/patches/04_cap_always_settable.patch
+++ b/debian/patches/0110-cap_always_settable.patch
diff --git a/debian/patches/05_xcam_off_by_one.patch b/debian/patches/0115-xcam_off_by_one.patch
index 0b91cc4..0b91cc4 100644
--- a/debian/patches/05_xcam_off_by_one.patch
+++ b/debian/patches/0115-xcam_off_by_one.patch
diff --git a/debian/patches/06_word_list_fix.patch b/debian/patches/0120-word_list_fix.patch
index 683e745..683e745 100644
--- a/debian/patches/06_word_list_fix.patch
+++ b/debian/patches/0120-word_list_fix.patch
diff --git a/debian/patches/20_scanadf-SIGCHLD.patch b/debian/patches/0125-scanadf-SIGCHLD.patch
index ab91534..ab91534 100644
--- a/debian/patches/20_scanadf-SIGCHLD.patch
+++ b/debian/patches/0125-scanadf-SIGCHLD.patch
diff --git a/debian/patches/30_gimp_init.patch b/debian/patches/0130-gimp_init.patch
index 08c81f1..08c81f1 100644
--- a/debian/patches/30_gimp_init.patch
+++ b/debian/patches/0130-gimp_init.patch
diff --git a/debian/patches/100_xscanimage_c-out-of-bounds.patch b/debian/patches/0135-xscanimage_c-out-of-bounds.patch
index 2249f5a..2249f5a 100644
--- a/debian/patches/100_xscanimage_c-out-of-bounds.patch
+++ b/debian/patches/0135-xscanimage_c-out-of-bounds.patch
diff --git a/debian/patches/02_xcam_man_typo.patch b/debian/patches/0600-xcam_man_typo.patch
index 2421dc8..2421dc8 100644
--- a/debian/patches/02_xcam_man_typo.patch
+++ b/debian/patches/0600-xcam_man_typo.patch
diff --git a/debian/patches/25_manpages-typo.patch b/debian/patches/0605-manpages-typo.patch
index 2bc246b..2bc246b 100644
--- a/debian/patches/25_manpages-typo.patch
+++ b/debian/patches/0605-manpages-typo.patch
diff --git a/debian/patches/scanadf-sigchld.diff b/debian/patches/scanadf-sigchld.diff
deleted file mode 100644
index fe84f08..0000000
--- a/debian/patches/scanadf-sigchld.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/src/scanadf.c b/src/scanadf.c
---- a/src/scanadf.c
-+++ b/src/scanadf.c
-@@ -1195,6 +1195,7 @@
- 
- 	case 0:
- 	  /*  in child process  */
-+	  signal(SIGCHLD, SIG_DFL);
- 	  sprintf(cmd, "%s '%s'", script, fname);
- 	  /*	  system(cmd); */
- 	  execle(script, script, fname, NULL, environ);
diff --git a/debian/patches/series b/debian/patches/series
index bb24e0e..64afa25 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,11 +1,11 @@
 0001-fix_missing_sane-config.patch
-30_gimp_init.patch
-25_manpages-typo.patch
-01_xcam.c_dead_code.patch
-02_xcam_man_typo.patch
-03_scanadf_options_fix.patch
-04_cap_always_settable.patch
-05_xcam_off_by_one.patch
-06_word_list_fix.patch
-20_scanadf-SIGCHLD.patch
-100_xscanimage_c-out-of-bounds.patch
+0100-xcam.c_dead_code.patch
+0105-scanadf_options_fix.patch
+0110-cap_always_settable.patch
+0115-xcam_off_by_one.patch
+0120-word_list_fix.patch
+0125-scanadf-SIGCHLD.patch
+0130-gimp_init.patch
+0135-xscanimage_c-out-of-bounds.patch
+0600-xcam_man_typo.patch
+0605-manpages-typo.patch
diff --git a/debian/rules b/debian/rules
index 4aa0e6b..e3a8c6e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,4 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh  $@ --with autotools-dev
-
-override_dh_strip:
-	dh_strip --dbg-package=sane-dbg
+	dh  $@
diff --git a/debian/sane.dirs b/debian/sane.dirs
index 48002d8..a356f1d 100644
--- a/debian/sane.dirs
+++ b/debian/sane.dirs
@@ -1,2 +1 @@
 usr/lib/gimp/2.0/plug-ins
-usr/share/sane
diff --git a/debian/sane.install b/debian/sane.install
index d90bab2..d40d673 100644
--- a/debian/sane.install
+++ b/debian/sane.install
@@ -1,3 +1 @@
 debian/xscanimage-icon-32x32-2.xpm usr/share/sane
-usr/share/sane/*
-usr/bin/*