summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog2
-rw-r--r--debian/patches/0190-Fix_scanimage_help.patch20
-rw-r--r--debian/patches/series1
3 files changed, 23 insertions, 0 deletions
diff --git a/debian/changelog b/debian/changelog
index b2c9b43..084ea77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ sane-backends (1.3.1-2) UNRELEASED; urgency=medium
Thanks to Pino Toscano <pino@debian.org>.
* Move addgroup from debian/libsane1.postinst to debian/libsane1.preinst
(Closes: #1095956).
+ * New debian/patches/0190-Fix_scanimage_help.patch to Fix_output of
+ scanimage --help (Closes: #1094671).
-- Jörg Frings-Fürst <debian@jff.email> Thu, 19 Dec 2024 18:48:26 +0100
diff --git a/debian/patches/0190-Fix_scanimage_help.patch b/debian/patches/0190-Fix_scanimage_help.patch
new file mode 100644
index 0000000..9d0901f
--- /dev/null
+++ b/debian/patches/0190-Fix_scanimage_help.patch
@@ -0,0 +1,20 @@
+Description: Fix scanimage --help output
+Author: Jörg Frings-Fürst <debian@jff.email>
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1094671
+Forwarded: https://gitlab.com/sane-project/backends/-/issues/795
+Last-Update: 2025-03-16
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/frontend/scanimage.c
+===================================================================
+--- trunk.orig/frontend/scanimage.c
++++ trunk/frontend/scanimage.c
+@@ -2372,7 +2372,7 @@ Parameters are separated by a blank from
+ %%n (newline)\n\
+ -b, --batch[=FORMAT] working in batch mode, FORMAT is `out%%d.pnm' `out%%d.tif'\n\
+ `out%%d.png' or `out%%d.jpg' by default depending on --format\n\
+- This option is incompatible with --output-file.");
++ This option is incompatible with --output-file.\n");
+ printf ("\
+ --batch-start=# page number to start naming files with\n\
+ --batch-count=# how many pages to scan in batch mode\n\
diff --git a/debian/patches/series b/debian/patches/series
index d68ad4b..19fc427 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,4 +14,5 @@
0610-fix_groff_font_warnings.patch
0180-Escl_force_idle_status.patch
0185-fix_memory.patch
+0190-Fix_scanimage_help.patch
0160-fix_scanimage_help.patch