Release 1.0.25+git20150102-1

3 files changed, 14 insertions, 27 deletions

diff --git a/debian/patches/0500-systemd_configure.patch b/debian/patches/0500-systemd_configure.patch
index 27121e6..440bf02 100644
--- a/debian/patches/0500-systemd_configure.patch
+++ b/debian/patches/0500-systemd_configure.patch
@@ -5,13 +5,13 @@ Forwarded: https://alioth.debian.org/tracker/index.php?func=detail&aid=314906&gr
 Last-Update: 2014-12-11
 ---
 This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/configure.in
+Index: experimental/configure.in
 ===================================================================
---- trunk.orig/configure.in
-+++ trunk/configure.in
-@@ -344,17 +344,40 @@ else
- 	with_cups="no"
- fi
+--- experimental.orig/configure.in
++++ experimental/configure.in
+@@ -344,17 +344,40 @@ dnl 	$as_echo "in order to autodetect ne
+ dnl 	with_cups="no"
+ dnl fi
  
 +dnl
  dnl added by llagendijk 12/7/2012 to detect systemd for saned
diff --git a/debian/patches/sane-desc.c_debian_mods.patch b/debian/patches/sane-desc.c_debian_mods.patch
index 27520ce..4b9faec 100644
--- a/debian/patches/sane-desc.c_debian_mods.patch
+++ b/debian/patches/sane-desc.c_debian_mods.patch
@@ -859,19 +859,6 @@ Index: sane-backends-1.0.24/testsuite/tools/data/html-backends-split.ref
  <b>Description:</b> Network access to saned servers<br>
  <b>Comment:</b> Can be used to access any scanner supported by SANE over the net. Supports IPv4 and IPv6.<br>
  </p>
-Index: sane-backends-1.0.24/testsuite/tools/Makefile.in
-===================================================================
---- sane-backends-1.0.24.orig/testsuite/tools/Makefile.in	2013-10-05 16:41:07.991355170 -0400
-+++ sane-backends-1.0.24/testsuite/tools/Makefile.in	2013-10-05 16:47:36.395343694 -0400
-@@ -503,7 +503,7 @@
- 	do \
- 	echo "PASS: sane-desc -m $$mode -s $(srcdir)/data"; \
- 	  $(SANEDESC) -m $$mode -s $(srcdir)/data >$$mode.res ;\
--	  if ! diff --ignore-matching-lines="..:..:.. 20[0-9][0-9]" $(srcdir)/data/$$mode.ref $$mode.res ; \
-+	  if ! diff --ignore-matching-lines="by sane-desc .* from sane-backends\|..:..:.. 20[0-9][0-9]" $(srcdir)/data/$$mode.ref $$mode.res ; \
- 	  then \
- 		echo "**** File generated for $$mode mode is different from reference" ;\
- 		exit 1 ;\
 Index: sane-backends-1.0.24/testsuite/tools/data/html-mfgs.ref
 ===================================================================
 --- sane-backends-1.0.24.orig/testsuite/tools/data/html-mfgs.ref	2013-08-25 17:23:27.000000000 -0400
diff --git a/debian/patches/series b/debian/patches/series
index 5586d9d..53b3757 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -6,19 +6,19 @@ dll_backend_conf.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
+#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
+#hp5370c.patch
+#out_of_bounds.patch
 0500-systemd_configure.patch
-0100-usb3-corrections.patch
+#0100-usb3-corrections.patch