From e831dc180e98b8455618389e3a1f4d38a6c6e161 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= <debian@jff-webhosting.net>
Date: Mon, 24 Aug 2020 19:28:46 +0200
Subject: New upstream release; refresh patches
---
debian/changelog | 3 ++-
debian/patches/0100-source_spelling.patch | 4 ++--
debian/patches/0125-multiarch_dll_search_path.patch | 4 ++--
debian/patches/0155-hurd_PATH_MAX.patch | 10 +++++-----
debian/patches/0725-fix_link_60-libsane_rule.patch | 2 +-
debian/patches/series | 10 +++++-----
6 files changed, 17 insertions(+), 16 deletions(-)
(limited to 'debian')
diff --git a/debian/changelog b/debian/changelog
index e45cc4d..de3e42c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
-sane-backends (1.0.30-1~experimental3) UNRELEASED; urgency=medium
+sane-backends (1.0.31-1~experimental1) UNRELEASED; urgency=medium
+ * New upstream release (Closes: #968949).
* Add back libsane transitional package, to ease upgrades (Closes: #962936):
- debian/control: Add package libsane as oldlibs.
Thanks to Gianfranco Costamagna <locutusofborg@debian.org>.
diff --git a/debian/patches/0100-source_spelling.patch b/debian/patches/0100-source_spelling.patch
index baca168..7a29ebf 100644
--- a/debian/patches/0100-source_spelling.patch
+++ b/debian/patches/0100-source_spelling.patch
@@ -63,7 +63,7 @@ Index: trunk/doc/sane-pixma.man
===================================================================
--- trunk.orig/doc/sane-pixma.man
+++ trunk/doc/sane-pixma.man
-@@ -307,7 +307,7 @@ This will cause all further statements i
+@@ -328,7 +328,7 @@ This will cause all further statements i
.IP -
A line that contains
.B auto_detection=no
@@ -72,7 +72,7 @@ Index: trunk/doc/sane-pixma.man
.SH USB SUPPORT
USB scanners will be auto-detected and require no configuration.
.SH NETWORKING SUPPORT
-@@ -337,7 +337,7 @@ common subnet for scanning.
+@@ -358,7 +358,7 @@ common subnet for scanning.
.PP
Scanner detection is slightly more complicated. The pixma backend sends
a broadcast on all direct connected subnets it can find (provided your OS
diff --git a/debian/patches/0125-multiarch_dll_search_path.patch b/debian/patches/0125-multiarch_dll_search_path.patch
index a213060..a420f82 100644
--- a/debian/patches/0125-multiarch_dll_search_path.patch
+++ b/debian/patches/0125-multiarch_dll_search_path.patch
@@ -7,7 +7,7 @@ Index: trunk/backend/dll.c
===================================================================
--- trunk.orig/backend/dll.c
+++ trunk/backend/dll.c
-@@ -466,7 +466,7 @@ load (struct backend *be)
+@@ -470,7 +470,7 @@ load (struct backend *be)
if (path)
{
@@ -16,7 +16,7 @@ Index: trunk/backend/dll.c
src = malloc (src_len);
if (!src)
{
-@@ -476,11 +476,11 @@ load (struct backend *be)
+@@ -480,11 +480,11 @@ load (struct backend *be)
if (orig_src)
free (orig_src);
orig_src = src;
diff --git a/debian/patches/0155-hurd_PATH_MAX.patch b/debian/patches/0155-hurd_PATH_MAX.patch
index 4a76248..41952c6 100644
--- a/debian/patches/0155-hurd_PATH_MAX.patch
+++ b/debian/patches/0155-hurd_PATH_MAX.patch
@@ -20,7 +20,7 @@ Index: trunk/backend/escl/escl.h
===================================================================
--- trunk.orig/backend/escl/escl.h
+++ trunk/backend/escl/escl.h
-@@ -61,6 +61,10 @@
+@@ -62,6 +62,10 @@
# define DBGDUMP(level, buf, size)
#endif
@@ -30,7 +30,7 @@ Index: trunk/backend/escl/escl.h
+
#define ESCL_CONFIG_FILE "escl.conf"
- typedef struct {
+
Index: trunk/backend/canon630u.c
===================================================================
--- trunk.orig/backend/canon630u.c
@@ -110,7 +110,7 @@ Index: trunk/backend/hp5400_sane.c
===================================================================
--- trunk.orig/backend/hp5400_sane.c
+++ trunk/backend/hp5400_sane.c
-@@ -109,6 +109,9 @@
+@@ -88,6 +88,9 @@
#define NUM_GAMMA_ENTRIES 65536
@@ -349,8 +349,8 @@ Index: trunk/backend/pixma/pixma_bjnp.c
===================================================================
--- trunk.orig/backend/pixma/pixma_bjnp.c
+++ trunk/backend/pixma/pixma_bjnp.c
-@@ -110,6 +110,12 @@
- # define SSIZE_MAX LONG_MAX
+@@ -117,6 +117,12 @@
+ # endif
#endif
+#ifndef HOST_NAME_MAX
diff --git a/debian/patches/0725-fix_link_60-libsane_rule.patch b/debian/patches/0725-fix_link_60-libsane_rule.patch
index 018e796..ec851cf 100644
--- a/debian/patches/0725-fix_link_60-libsane_rule.patch
+++ b/debian/patches/0725-fix_link_60-libsane_rule.patch
@@ -9,7 +9,7 @@ Index: trunk/tools/sane-desc.c
===================================================================
--- trunk.orig/tools/sane-desc.c
+++ trunk/tools/sane-desc.c
-@@ -3665,7 +3665,7 @@ print_udevhwdb_header (void)
+@@ -3651,7 +3651,7 @@ print_udevhwdb_header (void)
("#\n"
"# udev rules file for supported USB and SCSI devices\n"
"#\n"
diff --git a/debian/patches/series b/debian/patches/series
index 75a0ddc..a3a660d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,13 +2,13 @@
0040-remove_git.patch
0100-source_spelling.patch
0125-multiarch_dll_search_path.patch
-0140-avahi.patch
-0145-avahi.patch
+#0140-avahi.patch
+#0145-avahi.patch
0600-scanimage_manpage.patch
-0700-mk_reproducible_results.patch
+#0700-mk_reproducible_results.patch
0705-kfreebsd.patch
-0715-20-sane.hwdb_multi-arch.patch
+#0715-20-sane.hwdb_multi-arch.patch
0725-fix_link_60-libsane_rule.patch
0150-i386-test.patch
0155-hurd_PATH_MAX.patch
-0160-big_endian.patch
+#0160-big_endian.patch
--
cgit v1.2.3