Refresh / remove applied patchesexperimental/1.0.25+git20150927-1

10 files changed, 58 insertions, 35 deletions

diff --git a/debian/changelog b/debian/changelog
index 84e4748..ac7f265 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,18 @@
-sane-backends (1.0.25+git20150528-2) experimental; urgency=medium
+sane-backends (1.0.25+git20150927-1) experimental; urgency=medium
 
+  * Build from daily snapshot sane-backends-git20150927.tar.gz.
+  * Refresh patches:
+    - debian/patches/001-scanimage_manpage.patch
+    - debian/patches/frontend_libs.patch
+    - debian/patches/multiarch_dll_search_path.patch
+    - debian/patches/ppc64el.patch
+    - debian/patches/0510-disable-html-tests.patch
+    - debian/patches/libsane_deps.patch
+    - debian/patches/multiarch_manpages_libdir.patch
+    - debian/patches/unneeded_doc.patch
+  * Remove applied patches from debian/patches:
+    - 0500-systemd_configure.patch
+    - 0105-fuj-126a.patch
   * Architecture-dependent binaries (Closes: #798657):
     - debian/control:
       + New package libsane-bin:
diff --git a/debian/patches/001-scanimage_manpage.patch b/debian/patches/001-scanimage_manpage.patch
index 08e5cc1..4a7238c 100644
--- a/debian/patches/001-scanimage_manpage.patch
+++ b/debian/patches/001-scanimage_manpage.patch
@@ -5,11 +5,11 @@ Forwarded:
 Last-Update: 2015-01-18
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/doc/scanimage.man
+Index: experimental/doc/scanimage.man
 ===================================================================
---- trunk.orig/doc/scanimage.man
-+++ trunk/doc/scanimage.man
-@@ -73,6 +73,9 @@ To print all available options:
+--- experimental.orig/doc/scanimage.man
++++ experimental/doc/scanimage.man
+@@ -74,6 +74,9 @@ To print all available options:
    scanimage \-h
  
  .SH OPTIONS
diff --git a/debian/patches/0510-disable-html-tests.patch b/debian/patches/0510-disable-html-tests.patch
index f54ccf2..64369ec 100644
--- a/debian/patches/0510-disable-html-tests.patch
+++ b/debian/patches/0510-disable-html-tests.patch
@@ -24,7 +24,7 @@ Index: experimental/testsuite/tools/Makefile.in
 ===================================================================
 --- experimental.orig/testsuite/tools/Makefile.in
 +++ experimental/testsuite/tools/Makefile.in
-@@ -499,7 +499,7 @@ check: check.local
+@@ -501,7 +501,7 @@ check: check.local
  
  check.local: 
  	@echo "**** Testing $(SANEDESC) with $(TESTFILE)"
diff --git a/debian/patches/frontend_libs.patch b/debian/patches/frontend_libs.patch
index 8c9c123..3a02ffb 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: experimental/frontend/Makefile.in
+===================================================================
+--- experimental.orig/frontend/Makefile.in
++++ experimental/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 @@
+@@ -363,7 +363,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 ff8f99a..f938249 100644
--- a/debian/patches/libsane_deps.patch
+++ b/debian/patches/libsane_deps.patch
@@ -14,7 +14,7 @@ Index: experimental/backend/Makefile.in
 ===================================================================
 --- experimental.orig/backend/Makefile.in
 +++ experimental/backend/Makefile.in
-@@ -2692,10 +2692,9 @@ libsane_dll_la_LIBADD = $(COMMON_LIBS) l
+@@ -2723,10 +2723,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_dll_search_path.patch b/debian/patches/multiarch_dll_search_path.patch
index 7c24d21..b20995e 100644
--- a/debian/patches/multiarch_dll_search_path.patch
+++ b/debian/patches/multiarch_dll_search_path.patch
@@ -11,7 +11,7 @@ Index: experimental/backend/dll.c
  
    if (path)
      {
--      src_len = strlen (path) + strlen (STRINGIFY (LIBDIR)) + 1 + 1;
+-      src_len = strlen (path) + strlen (LIBDIR) + 1 + 1;
 +      src_len = strlen (path) + strlen (DEB_DLL_LIBDIR) + 1 + 1;
        src = malloc (src_len);
        if (!src)
@@ -20,12 +20,12 @@ Index: experimental/backend/dll.c
  	  return SANE_STATUS_NO_MEM;
  	}
        orig_src = src;
--      snprintf (src, src_len, "%s:%s", path, STRINGIFY (LIBDIR));
+-      snprintf (src, src_len, "%s:%s", path, LIBDIR);
 +      snprintf (src, src_len, "%s:%s", path, DEB_DLL_LIBDIR);
      }
    else
      {
--      src = STRINGIFY (LIBDIR);
+-      src = LIBDIR;
 -      src = strdup (src);
 +      src = strdup (DEB_DLL_LIBDIR);
        if (!src)
@@ -35,11 +35,11 @@ Index: experimental/backend/Makefile.in
 ===================================================================
 --- experimental.orig/backend/Makefile.in
 +++ experimental/backend/Makefile.in
-@@ -1887,7 +1887,7 @@ target_alias = @target_alias@
+@@ -1911,7 +1911,7 @@ target_alias = @target_alias@
  top_build_prefix = @top_build_prefix@
  top_builddir = @top_builddir@
  top_srcdir = @top_srcdir@
--AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -DLIBDIR="$(libdir)/sane"
+-AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -DLIBDIR="\"$(libdir)/sane\""
 +AM_CPPFLAGS = -I. -I$(srcdir) -I$(top_builddir)/include -I$(top_srcdir)/include -DLIBDIR="$(libdir)/sane" -DDEB_DLL_LIBDIR="\"$(libdir)/sane:$(prefix)/lib/sane\""
  AM_LDFLAGS = @STRICT_LDFLAGS@
  # The -rpath option is added because we are creating _LTLIBRARIES based
diff --git a/debian/patches/multiarch_manpages_libdir.patch b/debian/patches/multiarch_manpages_libdir.patch
index 12b66a0..0f5c840 100644
--- a/debian/patches/multiarch_manpages_libdir.patch
+++ b/debian/patches/multiarch_manpages_libdir.patch
@@ -7,7 +7,7 @@ Index: experimental/doc/Makefile.in
 ===================================================================
 --- experimental.orig/doc/Makefile.in
 +++ experimental/doc/Makefile.in
-@@ -902,7 +902,7 @@ all: bemans $(STANDARD) html-pages
+@@ -904,7 +904,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..f25da05 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: experimental/configure
+===================================================================
+--- experimental.orig/configure
++++ experimental/configure
+@@ -13143,7 +13143,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 @@
+@@ -13161,7 +13161,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 @@
+@@ -13180,7 +13183,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: experimental/m4/libtool.m4
+===================================================================
+--- experimental.orig/m4/libtool.m4
++++ experimental/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 5a1f96c..61d3f9d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -21,8 +21,8 @@ nousbtest.patch
 ppc64el.patch
 #hp5370c.patch
 #out_of_bounds.patch
-0500-systemd_configure.patch
+#0500-systemd_configure.patch
 #0100-usb3-corrections.patch
 001-scanimage_manpage.patch
 0510-disable-html-tests.patch
-0105-fuj-126a.patch
+#0105-fuj-126a.patch
diff --git a/debian/patches/unneeded_doc.patch b/debian/patches/unneeded_doc.patch
index 39f5fa5..51fb2e4 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: experimental/Makefile.in
+===================================================================
+--- experimental.orig/Makefile.in
++++ experimental/Makefile.in
+@@ -400,11 +400,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: experimental/doc/Makefile.in
+===================================================================
+--- experimental.orig/doc/Makefile.in
++++ experimental/doc/Makefile.in
+@@ -412,7 +412,7 @@ DLH = TEXINPUTS="$(srcdir):$$TEXINPUTS"
  MAN2HTML = nroff -c -man |\
  	  man2html -compress -topm 6 -botm 6 -nodepage -title $${page} \
            -cgiurl '$$title.$$section.html'|\