From 5cb641c75f11518b06a955e6d817b622fe7ed10f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 30 Sep 2020 16:34:40 +0200 Subject: d/sane-utils.postrm: On purge remove pid file if sysvinit are used --- debian/changelog | 7 +++++++ debian/sane-utils.postrm | 7 +++++++ 2 files changed, 14 insertions(+) diff --git a/debian/changelog b/debian/changelog index 32b0aa4..cc95758 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +sane-backends (1.0.31-3) UNRELEASED; urgency=medium + + * debian/sane-utils.postrm (Closed: #941625). + - On purge remove pid file if sysvinit are used. + + -- Jörg Frings-Fürst Wed, 30 Sep 2020 16:12:47 +0200 + sane-backends (1.0.31-2) unstable; urgency=medium * Upload into unstable (Closes: #969592). diff --git a/debian/sane-utils.postrm b/debian/sane-utils.postrm index 288b511..275eee6 100644 --- a/debian/sane-utils.postrm +++ b/debian/sane-utils.postrm @@ -44,6 +44,13 @@ if [ "$1" = purge ] ; then if [ -d /var/lib/systemd/deb-systemd-helper-masked ]; then rmdir --ignore-fail-on-non-empty /var/lib/systemd/deb-systemd-helper-masked fi +# +# remove pid file +# + if [ -f /var/run/saned.pid ]; then + rm -f /var/run/saned.pid + fi + fi -- cgit v1.2.3 From 48bb1feef2e1b36a4cb7f014e58146ad18402364 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Wed, 30 Sep 2020 18:33:48 +0200 Subject: d/99-libsane1.rules: Add condition to run setfacl only on usb scanners --- debian/99-libsane1.rules | 2 +- debian/changelog | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/99-libsane1.rules b/debian/99-libsane1.rules index ada47b4..42d0dd4 100644 --- a/debian/99-libsane1.rules +++ b/debian/99-libsane1.rules @@ -1,2 +1,2 @@ -ENV{libsane_matched}=="yes", RUN+="/bin/setfacl -m g:scanner:rw $env{DEVNAME}" +ENV{DEVNAME}!="", ENV{libsane_matched}=="yes", RUN+="/bin/setfacl -m g:scanner:rw $env{DEVNAME}" diff --git a/debian/changelog b/debian/changelog index cc95758..fdc0acd 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,9 @@ sane-backends (1.0.31-3) UNRELEASED; urgency=medium - * debian/sane-utils.postrm (Closed: #941625). + * debian/sane-utils.postrm (Closes: #941625): - On purge remove pid file if sysvinit are used. + * debian/99-libsane1.rules (Closes: #960083): + - Add contition ENV{DEVNAME}!="" to run setfacl only on usb scanners. -- Jörg Frings-Fürst Wed, 30 Sep 2020 16:12:47 +0200 -- cgit v1.2.3 From 736573a8db4bd098da28a4831ce4c601f880aacd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 12 Oct 2020 10:24:53 +0200 Subject: Add creation for the lock directory --- debian/changelog | 5 ++++- debian/libsane1.postinst | 5 +++++ debian/patches/0055-Fix_build_error.patch | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index fdc0acd..462cbb7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,7 +3,10 @@ sane-backends (1.0.31-3) UNRELEASED; urgency=medium * debian/sane-utils.postrm (Closes: #941625): - On purge remove pid file if sysvinit are used. * debian/99-libsane1.rules (Closes: #960083): - - Add contition ENV{DEVNAME}!="" to run setfacl only on usb scanners. + - Add condition ENV{DEVNAME}!="" to run setfacl only on usb scanners. + * debian/libsane1.postinst: + - Add creation for the lock directory + (Thanks to Andreas Tscharner ). -- Jörg Frings-Fürst Wed, 30 Sep 2020 16:12:47 +0200 diff --git a/debian/libsane1.postinst b/debian/libsane1.postinst index 971103e..88528f0 100644 --- a/debian/libsane1.postinst +++ b/debian/libsane1.postinst @@ -9,6 +9,11 @@ case "$1" in addgroup --quiet --system scanner || true fi + if [ -d /var/lock/sane ]; then + mkdir /var/lock/sane + fi + chown saned:saned /var/lock/sane + ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/patches/0055-Fix_build_error.patch b/debian/patches/0055-Fix_build_error.patch index 3816692..b1b09b1 100644 --- a/debian/patches/0055-Fix_build_error.patch +++ b/debian/patches/0055-Fix_build_error.patch @@ -13,7 +13,7 @@ Index: trunk/po/POTFILES.in backend/p5_device.c backend/pixma/pixma.c -backend/pixma/pixma_sane_options.c -+#backend/pixma/pixma_sane_options.c ++backend/pixma/pixma_sane_options.c backend/plustek.c backend/plustek_pp.c backend/pnm.c -- cgit v1.2.3 From f5c5e5a246e58ebdeeccde80fc451ddcfc0349e4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 12 Oct 2020 10:52:41 +0200 Subject: d/rules: Replace the --enable-avahi option with an --with-avahi --- debian/changelog | 2 ++ debian/rules | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 462cbb7..2471905 100644 --- a/debian/changelog +++ b/debian/changelog @@ -7,6 +7,8 @@ sane-backends (1.0.31-3) UNRELEASED; urgency=medium * debian/libsane1.postinst: - Add creation for the lock directory (Thanks to Andreas Tscharner ). + * debian/rules: + - Replace the --enable-avahi option with an --with-avahi. -- Jörg Frings-Fürst Wed, 30 Sep 2020 16:12:47 +0200 diff --git a/debian/rules b/debian/rules index 8bab3c0..4da0191 100755 --- a/debian/rules +++ b/debian/rules @@ -52,7 +52,7 @@ endif --enable-static \ --enable-pthread \ --with-gphoto2 \ - --enable-avahi \ + --with-avahi \ --enable-pnm-backend \ --with-usb \ --without-v4l \ -- cgit v1.2.3 From 530414c4c087586bbc42ee75c77cdc2d7591e977 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 2 Nov 2020 07:48:56 +0100 Subject: d/rule: Remove the --enable-locking option from dh_auto_configure --- debian/changelog | 5 ++--- debian/libsane1.postinst | 5 ----- debian/rules | 1 - 3 files changed, 2 insertions(+), 9 deletions(-) diff --git a/debian/changelog b/debian/changelog index 2471905..d12645a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,11 +4,10 @@ sane-backends (1.0.31-3) UNRELEASED; urgency=medium - On purge remove pid file if sysvinit are used. * debian/99-libsane1.rules (Closes: #960083): - Add condition ENV{DEVNAME}!="" to run setfacl only on usb scanners. - * debian/libsane1.postinst: - - Add creation for the lock directory - (Thanks to Andreas Tscharner ). * debian/rules: - Replace the --enable-avahi option with an --with-avahi. + - Remove the --enable-locking option from dh_auto_configure (Closes: #973490, + #971584). -- Jörg Frings-Fürst Wed, 30 Sep 2020 16:12:47 +0200 diff --git a/debian/libsane1.postinst b/debian/libsane1.postinst index 88528f0..971103e 100644 --- a/debian/libsane1.postinst +++ b/debian/libsane1.postinst @@ -9,11 +9,6 @@ case "$1" in addgroup --quiet --system scanner || true fi - if [ -d /var/lock/sane ]; then - mkdir /var/lock/sane - fi - chown saned:saned /var/lock/sane - ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/rules b/debian/rules index 4da0191..45233ca 100755 --- a/debian/rules +++ b/debian/rules @@ -48,7 +48,6 @@ endif --datadir=\$${prefix}/share \ --mandir=\$${prefix}/share/man \ --docdir=\$${prefix}/share/doc/libsane \ - --enable-locking \ --enable-static \ --enable-pthread \ --with-gphoto2 \ -- cgit v1.2.3 From 1bb3f01b7b3abe557e204016894544fe49d63cd7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Mon, 2 Nov 2020 08:22:50 +0100 Subject: d/changelog: Change distribution to unstable, Change date and time --- debian/changelog | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index d12645a..71738d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -sane-backends (1.0.31-3) UNRELEASED; urgency=medium +sane-backends (1.0.31-3) unstable; urgency=medium * debian/sane-utils.postrm (Closes: #941625): - On purge remove pid file if sysvinit are used. @@ -6,10 +6,10 @@ sane-backends (1.0.31-3) UNRELEASED; urgency=medium - Add condition ENV{DEVNAME}!="" to run setfacl only on usb scanners. * debian/rules: - Replace the --enable-avahi option with an --with-avahi. - - Remove the --enable-locking option from dh_auto_configure (Closes: #973490, - #971584). + - Remove the --enable-locking option from dh_auto_configure + (Closes: #973490, #971584). - -- Jörg Frings-Fürst Wed, 30 Sep 2020 16:12:47 +0200 + -- Jörg Frings-Fürst Mon, 02 Nov 2020 08:19:03 +0100 sane-backends (1.0.31-2) unstable; urgency=medium -- cgit v1.2.3