From d5af5e5b44d40be20cf0da5394ef8d5640b9eafa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 26 Oct 2014 08:07:17 +0100 Subject: Correct some *.(postrm|preinst) scripts, remove useless parts --- .gitignore | 3 ++- debian/changelog | 10 ++++++++++ debian/libsane-common.postrm | 11 +++++++++++ debian/libsane-common.preinst | 32 ++++++++++++++++++++++++++++++++ debian/libsane.postrm | 11 ----------- debian/libsane.preinst | 36 ------------------------------------ debian/rules | 8 ++++---- 7 files changed, 59 insertions(+), 52 deletions(-) create mode 100644 debian/libsane-common.postrm create mode 100644 debian/libsane-common.preinst delete mode 100644 debian/libsane.postrm delete mode 100644 debian/libsane.preinst diff --git a/.gitignore b/.gitignore index 507c8f7..6c270cd 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .bzr -.bzrignore \ No newline at end of file +.bzrignore +.pc \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index b33bb5c..940843b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,13 @@ +sane-backends (1.0.24-4) UNRELEASED; urgency=medium + + * debian/rules: + - Move the creation of /etc/sane.d/dll.d to libsane-common. + * Move libsane.(postrm|preinst) to libsane-common.* to handle + in the right package. + * Remose useless ( < "1.0.19-25" ) from libsane-common.preinst. + + -- Jörg Frings-Fürst Sat, 25 Oct 2014 09:34:09 +0200 + sane-backends (1.0.24-3) unstable; urgency=medium * debian/rules: diff --git a/debian/libsane-common.postrm b/debian/libsane-common.postrm new file mode 100644 index 0000000..0212416 --- /dev/null +++ b/debian/libsane-common.postrm @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +#DEBHELPER# + +# remove directory /etc/sane.d/ +if [ "$1" = "purge" ]; then + echo "Removing directory /etc/sane.d/ ..." + rmdir --ignore-fail-on-non-empty /etc/sane.d/ +fi diff --git a/debian/libsane-common.preinst b/debian/libsane-common.preinst new file mode 100644 index 0000000..6dad339 --- /dev/null +++ b/debian/libsane-common.preinst @@ -0,0 +1,32 @@ +#!/bin/sh +set -e + +# From http://wiki.debian.org/DpkgConffileHandling +# Remove a no-longer used conffile +rm_conffile() { + PKGNAME="$1" + CONFFILE="$2" + if [ -e "$CONFFILE" ]; then + md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" + old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`" + if [ "$md5sum" != "$old_md5sum" ]; then + echo "Obsolete conffile $CONFFILE has been modified by you." + echo "Saving as $CONFFILE.dpkg-bak ..." + mv -f "$CONFFILE" "$CONFFILE".dpkg-bak + else + echo "Removing obsolete conffile $CONFFILE ..." + rm -f "$CONFFILE" + fi + fi +} + +if [ "$1" = install ] || [ "$1" = upgrade ]; then + ## Transition from the old-style udev setup to the old-style dh_installudev setup + ## Then dh_installudev will take care of the transition to the new dh_installudev setup + if [ -e "/etc/udev/rules.d/025_libsane.rules" ]; then + mv /etc/udev/rules.d/025_libsane.rules /etc/udev/rules.d/z60_libsane.rules + fi + +fi + +#DEBHELPER# diff --git a/debian/libsane.postrm b/debian/libsane.postrm deleted file mode 100644 index 0212416..0000000 --- a/debian/libsane.postrm +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -set -e - -#DEBHELPER# - -# remove directory /etc/sane.d/ -if [ "$1" = "purge" ]; then - echo "Removing directory /etc/sane.d/ ..." - rmdir --ignore-fail-on-non-empty /etc/sane.d/ -fi diff --git a/debian/libsane.preinst b/debian/libsane.preinst deleted file mode 100644 index 6489e3a..0000000 --- a/debian/libsane.preinst +++ /dev/null @@ -1,36 +0,0 @@ -#!/bin/sh -set -e - -# From http://wiki.debian.org/DpkgConffileHandling -# Remove a no-longer used conffile -rm_conffile() { - PKGNAME="$1" - CONFFILE="$2" - if [ -e "$CONFFILE" ]; then - md5sum="`md5sum \"$CONFFILE\" | sed -e \"s/ .*//\"`" - old_md5sum="`dpkg-query -W -f='${Conffiles}' $PKGNAME | sed -n -e \"\\\\' $CONFFILE '{s/ obsolete$//;s/.* //p}\"`" - if [ "$md5sum" != "$old_md5sum" ]; then - echo "Obsolete conffile $CONFFILE has been modified by you." - echo "Saving as $CONFFILE.dpkg-bak ..." - mv -f "$CONFFILE" "$CONFFILE".dpkg-bak - else - echo "Removing obsolete conffile $CONFFILE ..." - rm -f "$CONFFILE" - fi - fi -} - -if [ "$1" = install ] || [ "$1" = upgrade ]; then - ## Transition from the old-style udev setup to the old-style dh_installudev setup - ## Then dh_installudev will take care of the transition to the new dh_installudev setup - if [ -e "/etc/udev/rules.d/025_libsane.rules" ]; then - mv /etc/udev/rules.d/025_libsane.rules /etc/udev/rules.d/z60_libsane.rules - fi - - ## Remove obsolete /etc/modprobe.d/libsane conffile - if dpkg --compare-versions "$2" le "1.0.19-25"; then - rm_conffile libsane /etc/modprobe.d/libsane - fi -fi - -#DEBHELPER# diff --git a/debian/rules b/debian/rules index 9370932..ea7d0c4 100755 --- a/debian/rules +++ b/debian/rules @@ -98,8 +98,8 @@ override_dh_installdocs: # move the html files into html/ install -d debian/libsane-common/usr/share/doc/libsane/html mv debian/tmp/usr/share/doc/libsane/*.html debian/libsane-common/usr/share/doc/libsane/html/ - # create the /etc/sane.d/dll.d directory in libsane - install -d debian/libsane/etc/sane.d/dll.d + # create the /etc/sane.d/dll.d directory in libsane-common + install -d debian/libsane-common/etc/sane.d/dll.d $(RM) debian/libsane-common/etc/sane.d/saned.conf ifeq (kfreebsd,$(DEB_HOST_ARCH_OS)) cp README.freebsd debian/libsane-common/usr/share/doc/libsane/ @@ -107,8 +107,8 @@ endif ifeq (linux,$(DEB_HOST_ARCH_OS)) cp README.linux debian/libsane-common/usr/share/doc/libsane/ endif - $(RM) -f $(CURDIR)/debian/libsane-common/usr/share/doc/libsane/*.html - $(RM) -f $(CURDIR)/debian/tmp/usr/share/doc/libsane/*.html + $(RM) $(CURDIR)/debian/libsane-common/usr/share/doc/libsane/*.html + $(RM) $(CURDIR)/debian/tmp/usr/share/doc/libsane/*.html override_dh_installudev: ifeq (linux,$(DEB_HOST_ARCH_OS)) -- cgit v1.2.3