Merge branch 'release/debian/1.3.1-2'HEADdebian/1.3.1-2master

9 files changed, 55 insertions, 23 deletions

diff --git a/debian/changelog b/debian/changelog
index ea3cab2..cd97d2a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+sane-backends (1.3.1-2) unstable; urgency=medium
+
+  * Fix FTBFS on non-Linux architectures (Closes: #1090801).
+    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).
+  * debian/sane-utils.links: Add link from sane-umax_pp.5.gz to umax_pp.5.gz
+    to make lintian happy.
+  * Declare compliance with Debian Policy 4.7.2 (No changes needed).
+  * debian/copyright:
+    - Add 2025 to myself.
+
+ -- Jörg Frings-Fürst <debian@jff.email>  Sun, 16 Mar 2025 11:45:27 +0100
+
 sane-backends (1.3.1-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index e25d36b..77fc0ce 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: sane-backends
 Section: graphics
 Priority: optional
 Maintainer: Jörg Frings-Fürst <debian@jff.email>
-Standards-Version: 4.7.0.1
+Standards-Version: 4.7.2
 Build-Depends:
  autoconf,
  autoconf-archive,
@@ -23,7 +23,7 @@ Build-Depends:
  libsystemd-dev [linux-any],
  libtiff-dev,
  libusb-1.0-0-dev,
- libv4l-dev,
+ libv4l-dev [linux-any],
  libxml2-dev,
  pkgconf,
  po-debconf,
diff --git a/debian/copyright b/debian/copyright
index 1b084ce..fc0d808 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,7 +15,7 @@ Copyright: 1997-2002 Kevin Dalley <kevind@rahul.net>
            2013      Mark Buda <hermit@acm.org>
            2018      Laurent Bigonville <bigon@debian.org>
            2019      John Paul Adrian Glaubitz <glaubitz@physik.fu-berlin.de>
-           2014-2024 Jörg Frings-Fürst <debian@jff.email>
+           2014-2025 Jörg Frings-Fürst <debian@jff.email>
 License: GPL-2+ with sane exception
 
 Files: .editorconfig
diff --git a/debian/libsane1.postinst b/debian/libsane1.postinst
index 7c747f6..b5da9aa 100644
--- a/debian/libsane1.postinst
+++ b/debian/libsane1.postinst
@@ -18,24 +18,5 @@ if [ "$1" = "configure" ]; then
 fi
 # end-remove-after
 
-case "$1" in
-    configure)
-    # Add the scanner system group if it doesn't exist
-    if ! getent group | grep -q "^scanner:"; then
-	echo "Adding scanner group..."
-	addgroup --quiet --system scanner || true
-    fi
-
-    ;;
-
-    abort-upgrade|abort-remove|abort-deconfigure)
-    ;;
-
-    *)
-    echo "$0 called with unknown argument '$1'" >&2
-    exit 1
-    ;;
-esac
-
 
 #DEBHELPER#
diff --git a/debian/libsane1.preinst b/debian/libsane1.preinst
index 4ceccd3..153f3a2 100644
--- a/debian/libsane1.preinst
+++ b/debian/libsane1.preinst
@@ -18,5 +18,12 @@ if [ "$1" = "upgrade" ]; then
 fi
 # end-remove-after
 
+if [ "$1" = "upgrade" ]; then
+    # Add the scanner system group if it doesn't exist
+    if ! getent group | grep -q "^scanner:"; then
+	echo "Adding scanner group..."
+	addgroup --quiet --system scanner || true
+    fi
+fi
 #DEBHELPER#
 
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 5b54a3b..1eb3e67 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,4 @@
 0610-fix_groff_font_warnings.patch
 0180-Escl_force_idle_status.patch
 0185-fix_memory.patch
+0190-Fix_scanimage_help.patch
diff --git a/debian/rules b/debian/rules
index d9f933e..1b0243f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,11 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_STRIP_FLAG = ""
 	STRIP = ""
 endif
+ifeq (linux,$(DEB_HOST_ARCH_OS))
+	EXTRA_CONFIGURE_ARGS += --with-v4l
+else
+	EXTRA_CONFIGURE_ARGS += --without-v4l
+endif
 
 %:
 	dh $@
@@ -48,7 +53,8 @@ endif
 		--with-avahi \
 		--enable-pnm-backend \
 		--with-usb \
-		--disable-locking
+		--disable-locking \
+		$(EXTRA_CONFIGURE_ARGS)
 
 override_dh_autoreconf:
 	dh_autoreconf -Xlibtool.m4
diff --git a/debian/sane-utils.links b/debian/sane-utils.links
index 8f6000d..93fb67d 100644
--- a/debian/sane-utils.links
+++ b/debian/sane-utils.links
@@ -1 +1,2 @@
 /dev/null  /usr/lib/systemd/system/saned.service
+/usr/share/man/man5/sane-umax_pp.5.gz /usr/share/man/man5/umax_pp.5.gz