Refresh / remove patches

9 files changed, 84 insertions, 42 deletions

diff --git a/debian/patches/0005-mk_reproducible_results.patch b/debian/patches/0005-mk_reproducible_results.patch
index 6e382c6..a1a6182 100644
--- a/debian/patches/0005-mk_reproducible_results.patch
+++ b/debian/patches/0005-mk_reproducible_results.patch
@@ -64,3 +64,29 @@ Index: trunk/doc/Makefile.in
  LD = @LD@
  LDFLAGS = @LDFLAGS@
  LIBOBJS = @LIBOBJS@
+Index: trunk/testsuite/tools/data/html-backends-split.ref
+===================================================================
+--- trunk.orig/testsuite/tools/data/html-backends-split.ref
++++ trunk/testsuite/tools/data/html-backends-split.ref
+@@ -16496,7 +16496,6 @@ Grandtek Scopecam
+ >Contact</a>
+ </address>
+ <font size=-1>
+-This page was last updated on Wed Jul 31 07:52:48 2013
+- by sane-desc 3.5 from sane-backends 1.0.24git
++This page was last updated by sane-desc 3.5 from sane-backends 1.0.25
+ </font>
+ </body> </html>
+Index: trunk/testsuite/tools/data/html-mfgs.ref
+===================================================================
+--- trunk.orig/testsuite/tools/data/html-mfgs.ref
++++ trunk/testsuite/tools/data/html-mfgs.ref
+@@ -23910,7 +23910,6 @@ qcam<br>(unmaintained)
+ >Contact</a>
+ </address>
+ <font size=-1>
+-This page was last updated on Wed Jul 31 07:52:48 2013
+- by sane-desc 3.5 from sane-backends 1.0.24git
++This page was last updated by sane-desc 3.5 from sane-backends 1.0.25
+ </font>
+ </body> </html>
diff --git a/debian/patches/001-scanimage_manpage.patch b/debian/patches/001-scanimage_manpage.patch
index 08e5cc1..dc70271 100644
--- a/debian/patches/001-scanimage_manpage.patch
+++ b/debian/patches/001-scanimage_manpage.patch
@@ -9,7 +9,7 @@ Index: trunk/doc/scanimage.man
 ===================================================================
 --- trunk.orig/doc/scanimage.man
 +++ trunk/doc/scanimage.man
-@@ -73,6 +73,9 @@ To print all available options:
+@@ -74,6 +74,9 @@ To print all available options:
    scanimage \-h
  
  .SH OPTIONS
diff --git a/debian/patches/dll_backend_conf.patch b/debian/patches/dll_backend_conf.patch
index 3b8583c..193d75b 100644
--- a/debian/patches/dll_backend_conf.patch
+++ b/debian/patches/dll_backend_conf.patch
@@ -5,8 +5,10 @@ Description: Add a header to dll.conf
  Also remove the pint backend as it's not available on our platforms.
 Author: Julien BLACHE <jblache@debian.org>
 
---- a/backend/dll.conf.in
-+++ b/backend/dll.conf.in
+Index: trunk/backend/dll.conf.in
+===================================================================
+--- trunk.orig/backend/dll.conf.in
++++ trunk/backend/dll.conf.in
 @@ -1,4 +1,12 @@
 -# enable the next line if you want to allow access through the network:
 +# /etc/sane.d/dll.conf - Configuration file for the SANE dynamic backend loader
@@ -21,7 +23,7 @@ Author: Julien BLACHE <jblache@debian.org>
  net
  abaton
  agfafocus
-@@ -57,7 +65,6 @@
+@@ -58,7 +66,6 @@ nec
  niash
  #p5
  pie
diff --git a/debian/patches/frontend_libs.patch b/debian/patches/frontend_libs.patch
index 8c9c123..31411bf 100644
--- a/debian/patches/frontend_libs.patch
+++ b/debian/patches/frontend_libs.patch
@@ -9,9 +9,11 @@ libraries.
  frontend/Makefile.in | 4 ++--
  1 file changed, 2 insertions(+), 2 deletions(-)
 
---- a/frontend/Makefile.in
-+++ b/frontend/Makefile.in
-@@ -238,7 +238,7 @@
+Index: trunk/frontend/Makefile.in
+===================================================================
+--- trunk.orig/frontend/Makefile.in
++++ trunk/frontend/Makefile.in
+@@ -238,7 +238,7 @@ LATEX = @LATEX@
  LD = @LD@
  LDFLAGS = @LDFLAGS@
  LIBOBJS = @LIBOBJS@
@@ -20,7 +22,7 @@ libraries.
  LIBTOOL = @LIBTOOL@
  LIBUSB_1_0_CFLAGS = @LIBUSB_1_0_CFLAGS@
  LIBUSB_1_0_LIBS = @LIBUSB_1_0_LIBS@
-@@ -361,7 +361,7 @@
+@@ -365,7 +365,7 @@ scanimage_LDADD = ../backend/libsane.la
  
  saned_SOURCES = saned.c
  saned_LDADD = ../backend/libsane.la ../sanei/libsanei.la ../lib/liblib.la \
diff --git a/debian/patches/libsane_deps.patch b/debian/patches/libsane_deps.patch
index 478c9d2..4a38952 100644
--- a/debian/patches/libsane_deps.patch
+++ b/debian/patches/libsane_deps.patch
@@ -10,9 +10,11 @@ Original patch author: Julien BLACHE <jblache@debian.org>
  backend/Makefile.in | 5 ++---
  1 file changed, 2 insertions(+), 3 deletions(-)
 
---- a/backend/Makefile.in
-+++ b/backend/Makefile.in
-@@ -2660,10 +2660,9 @@
+Index: trunk/backend/Makefile.in
+===================================================================
+--- trunk.orig/backend/Makefile.in
++++ trunk/backend/Makefile.in
+@@ -2726,10 +2726,9 @@ libsane_dll_la_LIBADD = $(COMMON_LIBS) l
  nodist_libsane_la_SOURCES = dll-s.c
  libsane_la_CPPFLAGS = $(AM_CPPFLAGS) -DBACKEND_NAME=dll
  libsane_la_LDFLAGS = $(DIST_LIBS_LDFLAGS)
diff --git a/debian/patches/multiarch_manpages_libdir.patch b/debian/patches/multiarch_manpages_libdir.patch
index cd40126..142d501 100644
--- a/debian/patches/multiarch_manpages_libdir.patch
+++ b/debian/patches/multiarch_manpages_libdir.patch
@@ -3,9 +3,11 @@ Description: Use a generic multiarch path in man pages
  a generic /usr/lib/arch_triplet/sane path instead.
 Author: Julien BLACHE <jblache@debian.org>
 
---- a/doc/Makefile.in
-+++ b/doc/Makefile.in
-@@ -901,7 +901,7 @@
+Index: trunk/doc/Makefile.in
+===================================================================
+--- trunk.orig/doc/Makefile.in
++++ trunk/doc/Makefile.in
+@@ -906,7 +906,7 @@ all: bemans $(STANDARD) html-pages
  	@sed -e 's|@DATADIR@|$(datadir)|g' \
  	  -e 's|@CONFIGDIR@|$(configdir)|g' \
  	  -e 's|@DOCDIR@|$(docdir)|g' \
diff --git a/debian/patches/ppc64el.patch b/debian/patches/ppc64el.patch
index fe73912..d04a535 100644
--- a/debian/patches/ppc64el.patch
+++ b/debian/patches/ppc64el.patch
@@ -2,9 +2,11 @@ Description: remove ppc*-*linux* from configure
 Last-Update: 2014-10-13
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/configure
-+++ b/configure
-@@ -12929,7 +12929,7 @@
+Index: trunk/configure
+===================================================================
+--- trunk.orig/configure
++++ trunk/configure
+@@ -13146,7 +13146,7 @@ ia64-*-hpux*)
    rm -rf conftest*
    ;;
  
@@ -13,7 +15,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
-@@ -12947,7 +12947,10 @@
+@@ -13164,7 +13164,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
  	  x86_64-*linux*)
  	    LD="${LD-ld} -m elf_i386"
  	    ;;
@@ -25,7 +27,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	    LD="${LD-ld} -m elf32ppclinux"
  	    ;;
  	  s390x-*linux*)
-@@ -12966,7 +12969,10 @@
+@@ -13183,7 +13186,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
  	  x86_64-*linux*)
  	    LD="${LD-ld} -m elf_x86_64"
  	    ;;
@@ -37,9 +39,11 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	    LD="${LD-ld} -m elf64ppc"
  	    ;;
  	  s390*-*linux*|s390*-*tpf*)
---- a/m4/libtool.m4
-+++ b/m4/libtool.m4
-@@ -1312,7 +1312,7 @@
+Index: trunk/m4/libtool.m4
+===================================================================
+--- trunk.orig/m4/libtool.m4
++++ trunk/m4/libtool.m4
+@@ -1312,7 +1312,7 @@ ia64-*-hpux*)
    rm -rf conftest*
    ;;
  
@@ -48,7 +52,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
-@@ -1326,7 +1326,10 @@
+@@ -1326,7 +1326,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
  	  x86_64-*linux*)
  	    LD="${LD-ld} -m elf_i386"
  	    ;;
@@ -60,7 +64,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  	    LD="${LD-ld} -m elf32ppclinux"
  	    ;;
  	  s390x-*linux*)
-@@ -1345,7 +1348,10 @@
+@@ -1345,7 +1348,10 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*
  	  x86_64-*linux*)
  	    LD="${LD-ld} -m elf_x86_64"
  	    ;;
diff --git a/debian/patches/series b/debian/patches/series
index 893cb58..025f34f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,27 +1,27 @@
-0105-artec_missing_home_environment.patch
+#0105-artec_missing_home_environment.patch
 0005-mk_reproducible_results.patch
 hp3900.patch
 typo.patch
 license_typo.patch
 man_typo.patch
 dll_backend_conf.patch
-multiarch_dll_search_path.patch
+#multiarch_dll_search_path.patch
 multiarch_manpages_libdir.patch
 kfreebsd.patch
-fix-FTBFS-format-not-a-string-literal-error.patch
+#fix-FTBFS-format-not-a-string-literal-error.patch
 frontend_libs.patch
 libsane_deps.patch
 trim-libraries-in-sane-backends.pc.in.patch
 unneeded_doc.patch
-sane-desc.c_debian_mods.patch
-kodakaio.patch
-saned.man.patch
+#sane-desc.c_debian_mods.patch
+#kodakaio.patch
+#saned.man.patch
 nousbtest.patch
-man-page-spelling.patch
-source-spelling.patch
+#man-page-spelling.patch
+#source-spelling.patch
 ppc64el.patch
-hp5370c.patch
-out_of_bounds.patch
-0500-systemd_configure.patch
-0100-usb3-corrections.patch
+#hp5370c.patch
+#out_of_bounds.patch
+#0500-systemd_configure.patch
+#0100-usb3-corrections.patch
 001-scanimage_manpage.patch
diff --git a/debian/patches/unneeded_doc.patch b/debian/patches/unneeded_doc.patch
index 39f5fa5..e3c346a 100644
--- a/debian/patches/unneeded_doc.patch
+++ b/debian/patches/unneeded_doc.patch
@@ -13,9 +13,11 @@ Original Author: Julien BLACHE <jblache@debian.org>
  doc/Makefile.in | 2 +-
  2 files changed, 2 insertions(+), 6 deletions(-)
 
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -398,11 +398,7 @@
+Index: trunk/Makefile.in
+===================================================================
+--- trunk.orig/Makefile.in
++++ trunk/Makefile.in
+@@ -402,11 +402,7 @@ top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
  SUBDIRS = include lib sanei backend frontend tools doc po testsuite
  DIST_SUBDIRS = include lib sanei backend frontend tools doc po japi testsuite
@@ -28,9 +30,11 @@ Original Author: Julien BLACHE <jblache@debian.org>
  
  EXTRA_DIST = ChangeLog-1.0.0 ChangeLog-1.0.1  ChangeLog-1.0.2 \
   ChangeLog-1.0.3 ChangeLog-1.0.4 ChangeLog-1.0.5 ChangeLog-1.0.6 \
---- a/doc/Makefile.in
-+++ b/doc/Makefile.in
-@@ -410,7 +410,7 @@
+Index: trunk/doc/Makefile.in
+===================================================================
+--- trunk.orig/doc/Makefile.in
++++ trunk/doc/Makefile.in
+@@ -414,7 +414,7 @@ DLH = TEXINPUTS="$(srcdir):$$TEXINPUTS"
  MAN2HTML = nroff -c -man |\
  	  man2html -compress -topm 6 -botm 6 -nodepage -title $${page} \
            -cgiurl '$$title.$$section.html'|\