diff options
| -rw-r--r-- | debian/changelog | 2 | ||||
| -rw-r--r-- | debian/libsane1.postinst | 19 | ||||
| -rw-r--r-- | debian/libsane1.preinst | 7 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
4 files changed, 10 insertions, 19 deletions
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 <pino@debian.org>. + * Move addgroup from debian/libsane1.postinst to debian/libsane1.preinst + (Closes: #1095956). -- Jörg Frings-Fürst <debian@jff.email> 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 |