diff options
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | debian/changelog | 10 | ||||
| -rw-r--r-- | debian/libsane-common.postrm (renamed from debian/libsane.postrm) | 0 | ||||
| -rw-r--r-- | debian/libsane-common.preinst (renamed from debian/libsane.preinst) | 4 | ||||
| -rwxr-xr-x | debian/rules | 8 |
5 files changed, 16 insertions, 9 deletions
@@ -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 <debian@jff-webhosting.net> Sat, 25 Oct 2014 09:34:09 +0200 + sane-backends (1.0.24-3) unstable; urgency=medium * debian/rules: diff --git a/debian/libsane.postrm b/debian/libsane-common.postrm index 0212416..0212416 100644 --- a/debian/libsane.postrm +++ b/debian/libsane-common.postrm diff --git a/debian/libsane.preinst b/debian/libsane-common.preinst index 6489e3a..6dad339 100644 --- a/debian/libsane.preinst +++ b/debian/libsane-common.preinst @@ -27,10 +27,6 @@ if [ "$1" = install ] || [ "$1" = upgrade ]; 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)) |