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

3 files changed, 17 insertions, 2 deletions

diff --git a/debian/changelog b/debian/changelog
index cd97d2a..c2f5330 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+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).
diff --git a/debian/libsane1.preinst b/debian/libsane1.preinst
index 153f3a2..1f02da9 100644
--- a/debian/libsane1.preinst
+++ b/debian/libsane1.preinst
@@ -18,12 +18,12 @@ if [ "$1" = "upgrade" ]; then
 fi
 # end-remove-after
 
-if [ "$1" = "upgrade" ]; then
+#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
+#fi
 #DEBHELPER#
 
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..."