From f7bb1be5414854235b90e9863b37b8a79ade446c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 19 Dec 2024 18:56:14 +0100 Subject: Fix FTBFS on non-Linux architectures --- debian/changelog | 7 +++++++ debian/control | 2 +- debian/rules | 8 +++++++- 3 files changed, 15 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ea3cab2..88caaa6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +sane-backends (1.3.1-2) UNRELEASED; urgency=medium + + * Fix FTBFS on non-Linux architectures (Closes: #1090801). + Thanks to Pino Toscano . + + -- Jörg Frings-Fürst Thu, 19 Dec 2024 18:48:26 +0100 + sane-backends (1.3.1-1) unstable; urgency=medium * New upstream release. diff --git a/debian/control b/debian/control index e25d36b..1d27dc2 100644 --- a/debian/control +++ b/debian/control @@ -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/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 -- cgit v1.2.3 From 72ab47faa8f59fbb0c5effdb21fc969c466e5eb9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 16 Mar 2025 09:13:50 +0100 Subject: Move addgroup from d/libsane1.postinst to d/libsane1.preinst --- debian/changelog | 2 ++ debian/libsane1.postinst | 19 ------------------- debian/libsane1.preinst | 7 +++++++ debian/patches/series | 1 + 4 files changed, 10 insertions(+), 19 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 88caaa6..b2c9b43 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ sane-backends (1.3.1-2) UNRELEASED; urgency=medium * Fix FTBFS on non-Linux architectures (Closes: #1090801). Thanks to Pino Toscano . + * Move addgroup from debian/libsane1.postinst to debian/libsane1.preinst + (Closes: #1095956). -- Jörg Frings-Fürst Thu, 19 Dec 2024 18:48:26 +0100 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/series b/debian/patches/series index 5b54a3b..d68ad4b 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 +0160-fix_scanimage_help.patch -- cgit v1.2.3 From 84c41e071611a4129f1b02c401e9add1ac463ecd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 16 Mar 2025 09:33:09 +0100 Subject: New d/p/0190-Fix_scanimage_help.patch --- debian/changelog | 2 ++ debian/patches/0190-Fix_scanimage_help.patch | 20 ++++++++++++++++++++ debian/patches/series | 1 + 3 files changed, 23 insertions(+) create mode 100644 debian/patches/0190-Fix_scanimage_help.patch (limited to 'debian') 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 . * 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 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 +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 -- cgit v1.2.3 From caf547bc2928fa6f75c21672c41fb221f13836d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 16 Mar 2025 11:12:46 +0100 Subject: d/sane-utils.links: Add link from sane-umax_pp.5.gz to umax_pp.5.gz --- debian/changelog | 2 ++ debian/patches/series | 1 - debian/sane-utils.links | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 084ea77..88f6d22 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,8 @@ sane-backends (1.3.1-2) UNRELEASED; urgency=medium (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. -- Jörg Frings-Fürst Thu, 19 Dec 2024 18:48:26 +0100 diff --git a/debian/patches/series b/debian/patches/series index 19fc427..1eb3e67 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -15,4 +15,3 @@ 0180-Escl_force_idle_status.patch 0185-fix_memory.patch 0190-Fix_scanimage_help.patch -0160-fix_scanimage_help.patch 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 -- cgit v1.2.3 From 994f1cea5bfe98739b8fc25c73b62d83679f6dde Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 16 Mar 2025 11:19:00 +0100 Subject: d/changelog: Change distribution to unstable, Change date and time --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 88f6d22..72fb9bc 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -sane-backends (1.3.1-2) UNRELEASED; urgency=medium +sane-backends (1.3.1-2) unstable; urgency=medium * Fix FTBFS on non-Linux architectures (Closes: #1090801). Thanks to Pino Toscano . @@ -9,7 +9,7 @@ sane-backends (1.3.1-2) UNRELEASED; urgency=medium * debian/sane-utils.links: Add link from sane-umax_pp.5.gz to umax_pp.5.gz to make lintian happy. - -- Jörg Frings-Fürst Thu, 19 Dec 2024 18:48:26 +0100 + -- Jörg Frings-Fürst Sun, 16 Mar 2025 11:16:49 +0100 sane-backends (1.3.1-1) unstable; urgency=medium -- cgit v1.2.3 From f746a92eae13ee89cde415303a4c4f0a687a9932 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 16 Mar 2025 11:33:57 +0100 Subject: Declare compliance with Debian Policy 4.7.2 --- debian/changelog | 1 + debian/control | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 72fb9bc..f49b209 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ sane-backends (1.3.1-2) unstable; urgency=medium 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). -- Jörg Frings-Fürst Sun, 16 Mar 2025 11:16:49 +0100 diff --git a/debian/control b/debian/control index 1d27dc2..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 -Standards-Version: 4.7.0.1 +Standards-Version: 4.7.2 Build-Depends: autoconf, autoconf-archive, -- cgit v1.2.3 From b6cb8ec4fe51f365c0c960838a11c3450463a0d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 16 Mar 2025 11:35:26 +0100 Subject: d/copyright: Add 2025 to myself --- debian/changelog | 2 ++ debian/copyright | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f49b209..f8c4042 100644 --- a/debian/changelog +++ b/debian/changelog @@ -22,6 +22,8 @@ sane-backends (1.3.1-1) unstable; urgency=medium * New debian/patches/0185-fix_memory.patch: - Fix memory handling at backends/hp5590_low.c (Closes: #1071658, #1071660). + * debian/copyright: + - Add 2025 to myself. -- Jörg Frings-Fürst Sun, 08 Dec 2024 19:33:14 +0100 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 2013 Mark Buda 2018 Laurent Bigonville 2019 John Paul Adrian Glaubitz - 2014-2024 Jörg Frings-Fürst + 2014-2025 Jörg Frings-Fürst License: GPL-2+ with sane exception Files: .editorconfig -- cgit v1.2.3 From d9a6b93363df665f4b9b997932abfb707548ed59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 16 Mar 2025 11:36:17 +0100 Subject: d/changelog: Change date and time --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f8c4042..26f19c9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,7 @@ sane-backends (1.3.1-2) unstable; urgency=medium to make lintian happy. * Declare compliance with Debian Policy 4.7.2 (No changes needed). - -- Jörg Frings-Fürst Sun, 16 Mar 2025 11:16:49 +0100 + -- Jörg Frings-Fürst Sun, 16 Mar 2025 11:35:53 +0100 sane-backends (1.3.1-1) unstable; urgency=medium -- cgit v1.2.3 From 9e8d5523b1163d7ba68b8be12ee741c4454a08ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 16 Mar 2025 11:45:19 +0100 Subject: d/changelog: Fix typo --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 26f19c9..fd4f15a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ sane-backends (1.3.1-2) unstable; urgency=medium * 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 Sun, 16 Mar 2025 11:35:53 +0100 @@ -22,8 +24,6 @@ sane-backends (1.3.1-1) unstable; urgency=medium * New debian/patches/0185-fix_memory.patch: - Fix memory handling at backends/hp5590_low.c (Closes: #1071658, #1071660). - * debian/copyright: - - Add 2025 to myself. -- Jörg Frings-Fürst Sun, 08 Dec 2024 19:33:14 +0100 -- cgit v1.2.3 From 10565e4849cc13582e4c577f71df8b57a8d46606 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 16 Mar 2025 11:45:51 +0100 Subject: d/changelog: Change date and time --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fd4f15a..cd97d2a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,7 +12,7 @@ sane-backends (1.3.1-2) unstable; urgency=medium * debian/copyright: - Add 2025 to myself. - -- Jörg Frings-Fürst Sun, 16 Mar 2025 11:35:53 +0100 + -- Jörg Frings-Fürst Sun, 16 Mar 2025 11:45:27 +0100 sane-backends (1.3.1-1) unstable; urgency=medium -- cgit v1.2.3