summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog33
-rw-r--r--debian/control4
-rw-r--r--debian/copyright6
-rw-r--r--debian/libsane1.postinst19
-rw-r--r--debian/libsane1.preinst7
-rw-r--r--debian/patches/0190-Fix_scanimage_help.patch20
-rw-r--r--debian/patches/0205-ftbfs_with_GCC-15.patch22
-rw-r--r--debian/patches/series2
-rw-r--r--debian/po/tr.po115
-rwxr-xr-xdebian/rules8
-rw-r--r--debian/sane-utils.links1
-rw-r--r--debian/sane-utils.postinst6
12 files changed, 220 insertions, 23 deletions
diff --git a/debian/changelog b/debian/changelog
index ea3cab2..e51c729 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,36 @@
+sane-backends (1.3.1-4) unstable; urgency=medium
+
+ * New debian/patches/0205-ftbfs_with_GCC-15.patch (Closes: #1097841).
+ - Fix ftbfs with GCC-15.
+ * New debian/po/tr.po (Closes: #1104475).
+
+ -- Jörg Frings-Fürst <debian@jff.email> Sat, 10 May 2025 08:40:04 +0200
+
+sane-backends (1.3.1-3) unstable; urgency=medium
+
+ * sane-utils.postinst:
+ - Add addgroup (Closes: #1100848, #1095956).
+ * debian/libsane1.preinst:
+ - Run addgroup every time.
+
+ -- Jörg Frings-Fürst <debian@jff.email> Wed, 19 Mar 2025 19:23:37 +0100
+
+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..da8004e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -15,7 +15,11 @@ 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: debian/po/tr.po
+Copyright: 2025 Nuri KÜÇÜKLER <nurikucukler@yahoo.com>
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..1f02da9 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/0205-ftbfs_with_GCC-15.patch b/debian/patches/0205-ftbfs_with_GCC-15.patch
new file mode 100644
index 0000000..54a7421
--- /dev/null
+++ b/debian/patches/0205-ftbfs_with_GCC-15.patch
@@ -0,0 +1,22 @@
+Description: Fix ftbfs with GCC-15
+Author: <name and email of author, optional>
+Origin: https://gitlab.com/sane-project/backends/-/commit/f5736eb50c3be88428f7d629b20c5c514df85b82
+Bug: https://gitlab.com/sane-project/backends/-/issues/796
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1097841
+Last-Update: 2025-03-22
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+Index: trunk/backend/sm3600.h
+===================================================================
+--- trunk.orig/backend/sm3600.h
++++ trunk/backend/sm3600.h
+@@ -77,7 +77,8 @@ Start: 2.4.2001
+
+ /* ====================================================================== */
+
+-typedef enum { false, true } TBool;
++#include <stdbool.h>
++typedef bool TBool;
+
+ typedef SANE_Status TState;
+
diff --git a/debian/patches/series b/debian/patches/series
index 5b54a3b..6e62f3f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -14,3 +14,5 @@
0610-fix_groff_font_warnings.patch
0180-Escl_force_idle_status.patch
0185-fix_memory.patch
+0190-Fix_scanimage_help.patch
+0205-ftbfs_with_GCC-15.patch
diff --git a/debian/po/tr.po b/debian/po/tr.po
new file mode 100644
index 0000000..022dab9
--- /dev/null
+++ b/debian/po/tr.po
@@ -0,0 +1,115 @@
+# Turkish debconf translation of sane-backends package
+# This file is distributed under the same license as the sane-backends package.
+# Nuri KÜÇÜKLER <nurikucukler@yahoo.com>, 2025.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: sane-backends\n"
+"Report-Msgid-Bugs-To: sane-backends@packages.debian.org\n"
+"POT-Creation-Date: 2009-12-12 13:14+0100\n"
+"PO-Revision-Date: 2025-04-25 15:12+0300\n"
+"Last-Translator: Nuri KÜÇÜKLER <nurikucukler@yahoo.com>\n"
+"Language-Team: Debian L10n Turkish <debian-l10n-turkish@lists.debian.org>\n"
+"Language: tr\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Poedit 3.2.2\n"
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:1001
+msgid "Enable saned as a standalone server?"
+msgstr "saned tek başına sunucu olarak etkinleştirilsin mi?"
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:1001
+msgid ""
+"The saned server, when enabled, makes scanners available over the network."
+msgstr ""
+"saned sunucusu, etkinleştirildiğinde tarayıcıları ağ üzerinde kullanılabilir "
+"kılar."
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:1001
+msgid ""
+"There are two ways of running saned:\n"
+" - as an inetd service, started by the inetd superserver. In this mode,\n"
+"saned is started on demand when a client connects to the server;\n"
+" - as a standalone daemon, started at system boot. In this mode, saned\n"
+"runs in the background all by itself and listens for client connections."
+msgstr ""
+"saned çalıştırmanın iki yolu vardır:\n"
+" - inetd süpersunucusu ile başlatılan, inetd hizmeti olarak. Bu kipte,\n"
+"saned istemci sunucuya bağlandığında talep üzerine başlatılır.\n"
+" - sistem önyüklemesi sırasında başlatılan, tek başına artalan hizmeti "
+"olarak.\n"
+"Bu kipte, saned tamamen kendi başına arkaplanda çalışır ve istemci "
+"bağlantılarını dinler."
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:1001
+msgid ""
+"When run in standalone mode, saned advertises itself on the network and can "
+"be detected automatically by the SANE clients with no configuration on the "
+"client side. You still need to configure the server to accept connections "
+"from your clients. This feature is experimental and requires a running Avahi "
+"daemon."
+msgstr ""
+"saned tek başına kipinde çalıştığında, ağ üzerinde kendini tanıtır ve SANE "
+"istemcileri tarafından istemci tarafında bir yapılandırma olmadan otomatik "
+"olarak algılanır. Yine de, sunucuyu istemcilerden gelecek bağlantıları kabul "
+"etmesi için yapılandırmanız gerekir. Bu özellik deneysel durumdadır ve "
+"çalışan bir Avahi artalan hizmeti gerektirir."
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:1001
+msgid "Accept this option if you want to make use of this feature."
+msgstr "Bu özelliğin kullanılması için bu seçeneği kabul edin."
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:2001
+msgid "Add saned user to the scanner group?"
+msgstr "saned kullanıcısı scanner grubuna eklensin mi?"
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:2001
+msgid ""
+"The saned server, when enabled, makes scanners available over the network. "
+"By applying different permissions to the different scanners connected to "
+"your machine, you can control which ones will be made available over the "
+"network."
+msgstr ""
+"saned sunucusu etkinleştirildiğinde, tarayıcıları ağ üzerinde kullanılabilir "
+"kılar. Makinenize bağlanan farklı tarayıcılara farklı yetkiler vererek, "
+"hangilerinin ağ üzerinde kullanılabilir hale getirileceğini "
+"denetleyebilirsiniz."
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:2001
+msgid ""
+"Read /usr/share/doc/sane-utils/README.Debian for details on how to manage "
+"permissions for saned. By default, saned is run under the saned user and "
+"group."
+msgstr ""
+"saned yetkilerinin yönetilmesinin detayları için okuyun: /usr/share/doc/sane-"
+"utils/README.Debian. Öntanımlı olarak saned, saned kullanıcısı ve grubuna "
+"ait olarak çalışır."
+
+#. Type: boolean
+#. Description
+#: ../sane-utils.templates:2001
+msgid ""
+"Accept this option if you want to make all your scanners available over the "
+"network without restriction."
+msgstr ""
+"Tüm tarayıcılarınızı ağ üzerinde herhangi bir kısıtlama olmadan "
+"kullanılabilir duruma getirmek için bu seçeneği kabul edin."
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
diff --git a/debian/sane-utils.postinst b/debian/sane-utils.postinst
index b334d59..553cfce 100644
--- a/debian/sane-utils.postinst
+++ b/debian/sane-utils.postinst
@@ -41,6 +41,12 @@ if [ "$1" = "configure" ] || [ "$1" = "reconfigure" ]; then
# Stop debconf; output to stdout after this point. update-inetd needs debconf.
db_stop
+ # 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
+
# Create saned user/group if they do not exist
if ! getent passwd | grep -q "^saned:"; then
echo "Adding saned group and user..."