diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-11-02 12:15:59 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2020-11-02 12:15:59 +0100 |
| commit | eaf0048d0a6900c5b4a52742f2bf8ec68ef51ebe (patch) | |
| tree | 7d766dbbb9bfe3a9ec0695df40917b6e398d864c | |
| parent | b9eccdd1582457ebfc52b3daf9d3dcbedc418b30 (diff) | |
| parent | 1bb3f01b7b3abe557e204016894544fe49d63cd7 (diff) | |
Merge branch 'release/debian/1.0.31-3' into masterdebian/1.0.31-3
| -rw-r--r-- | debian/99-libsane1.rules | 2 | ||||
| -rw-r--r-- | debian/changelog | 13 | ||||
| -rw-r--r-- | debian/patches/0055-Fix_build_error.patch | 2 | ||||
| -rwxr-xr-x | debian/rules | 3 | ||||
| -rw-r--r-- | debian/sane-utils.postrm | 7 |
5 files changed, 23 insertions, 4 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 32b0aa4..71738d5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +sane-backends (1.0.31-3) unstable; urgency=medium + + * debian/sane-utils.postrm (Closes: #941625): + - 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/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 <debian@jff.email> Mon, 02 Nov 2020 08:19:03 +0100 + sane-backends (1.0.31-2) unstable; urgency=medium * Upload into unstable (Closes: #969592). 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 diff --git a/debian/rules b/debian/rules index 8bab3c0..45233ca 100755 --- a/debian/rules +++ b/debian/rules @@ -48,11 +48,10 @@ endif --datadir=\$${prefix}/share \ --mandir=\$${prefix}/share/man \ --docdir=\$${prefix}/share/doc/libsane \ - --enable-locking \ --enable-static \ --enable-pthread \ --with-gphoto2 \ - --enable-avahi \ + --with-avahi \ --enable-pnm-backend \ --with-usb \ --without-v4l \ 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 |