diff options
| -rw-r--r-- | debian/changelog | 36 | ||||
| -rw-r--r-- | debian/control | 5 | ||||
| -rw-r--r-- | debian/libsane-common.maintscript | 1 | ||||
| -rw-r--r-- | debian/libsane-common.preinst | 12 | ||||
| -rw-r--r-- | debian/libsane1.README.Debian | 11 | ||||
| -rwxr-xr-x | debian/rules | 21 | ||||
| -rw-r--r-- | debian/sane-utils.links | 1 | ||||
| -rw-r--r-- | debian/sane-utils.saned.init | 2 |
8 files changed, 35 insertions, 54 deletions
diff --git a/debian/changelog b/debian/changelog index b8d2480..af8671c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,25 +1,35 @@ -sane-backends (1.0.27-1~experimental3) UNRELEASED; urgency=medium +sane-backends (1.0.27-1~experimental3) experimental; urgency=medium * debian/control: - + Drop outdated Recommends libsane-extras-dev to libsane-dev + - Drop outdated Recommends libsane-extras-dev to libsane-dev binary package (Closes: #868265). - + Drop outdated texlive and texlive-latex-extra Build-Dependency. + - Drop outdated texlive and texlive-latex-extra Build-Dependency. * debian/rules: - + Drop create and install the /etc/sane.d/dll.d directory. - + Move rules from override_dh_install-arch and override_dh_auto_install-arch + - Drop create and install the /etc/sane.d/dll.d directory. + - Move rules from override_dh_install-arch and override_dh_auto_install-arch to override_dh_install-indep and override_dh_auto_install-indep to build the arch all packages without error (CLoses: #870455). + - At dh_systemd_enable use debian/saned.socket instead saned.socket. + - Use DEB* vars via default.mk instead own functions. * Move libsane-common.install.in to libsane-common.install. * debian/copyright: - + Add year 2017 for debian/*. + - Add year 2017 for debian/*. * New debian/patches/0150-genesys-Fix-use-of-uninitialized-variable.patch: - + Initializing usb_mode (Closes:# 869673). + - Initializing usb_mode (Closes:# 869673). Thanks to Florian Lindemann <linde@bfw-online.de> and Olaf Meeuwissen <paddy-hack@member.fsf.org>. * Move install of man pages from debian/rules to libsane-common.manpages and - sane-utils.manpages. + sane-utils.manpages (Closes: #872366). + * Move umax_pp.5 from libsane-common to sane-utils. + * debian/sane-utils.saned.init: + - Add parameter to --retry at the stop section (Closes: #871543). + * libsane1.README.Debian: + - Remove references to the libsane-extras package. + * Correct typos in the previous changelog entry. + * Declare compliance with Debian Policy 4.1.1 (No changes needed). + * Move rm_conffile from libsane-common.preinst to libsane-common.maintscript. - -- Jörg Frings-Fürst <debian@jff-webhosting.net> Wed, 02 Aug 2017 18:20:24 +0200 + -- Jörg Frings-Fürst <debian@jff-webhosting.net> Sat, 28 Oct 2017 13:26:26 +0200 sane-backends (1.0.27-1~experimental2) experimental; urgency=medium @@ -29,13 +39,13 @@ sane-backends (1.0.27-1~experimental2) experimental; urgency=medium * Rename libsane.udev to libsane1.udev in TROUBLESHOOTING.Debian and libsane1.README.Debian. * debian/control: - + Add Breaks and Replaces against libsane to libsane1 + - Add Breaks and Replaces against libsane to libsane1 binary package (Closes: #868308). - + Remove outdated Recommends libsane-extras to libsane1 + - Remove outdated Recommends libsane-extras to libsane1 binary package (Closes: #868265). - + Remove [!hurd-i386] from libusb-1.0-0-dev Build-Dependency. + - Remove [!hurd-i386] from libusb-1.0-0-dev Build-Dependency. * debian/sane-utils.postrm: - + Add set -e and silence update-inetd calls with "|| true". + - Add set -e and silence update-inetd calls with "|| true". * Regenerate symbols files from build logs (Closes: #868309). * Use the hwdb+udev format (Closes: #869244): - debian/rules: Call sane-desc with -m udev+hwdb and -m hwdb, diff --git a/debian/control b/debian/control index cba9436..798b009 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: sane-backends Section: graphics Priority: optional Maintainer: Jörg Frings-Fürst <debian@jff-webhosting.net> -Standards-Version: 4.0.0 +Standards-Version: 4.1.1 Build-Depends: autoconf, chrpath, @@ -34,6 +34,8 @@ Depends: update-inetd, ${misc:Depends}, ${shlibs:Depends} +Breaks: libsane-common (<<1.0.27-1~) +Replaces: libsane-common (<<1.0.27-1~) Suggests: avahi-daemon, unpaper Description: API library for scanners -- utilities SANE stands for "Scanner Access Now Easy" and is an application @@ -56,6 +58,7 @@ Multi-Arch: foreign Pre-Depends: dpkg (>= 1.15.7.2) Depends: ${misc:Depends} +Breaks: sane-utils (<<1.0.27-1~) Description: API library for scanners -- documentation and support files SANE stands for "Scanner Access Now Easy" and is an application programming interface (API) that provides standardized access to any diff --git a/debian/libsane-common.maintscript b/debian/libsane-common.maintscript new file mode 100644 index 0000000..1438dbe --- /dev/null +++ b/debian/libsane-common.maintscript @@ -0,0 +1 @@ +rm_conffile /etc/sane.d/v4l.conf 1.0.24-10~ diff --git a/debian/libsane-common.preinst b/debian/libsane-common.preinst deleted file mode 100644 index 05714e8..0000000 --- a/debian/libsane-common.preinst +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -set -e - - -if [ "$1" = upgrade ]; then -# -# remove obsolete conffile -# - dpkg-maintscript-helper rm_conffile /etc/sane.d/v4l.conf 1.0.24-10 -- "$@" -fi - -#DEBHELPER# diff --git a/debian/libsane1.README.Debian b/debian/libsane1.README.Debian index ae0cca2..426bf65 100644 --- a/debian/libsane1.README.Debian +++ b/debian/libsane1.README.Debian @@ -14,7 +14,7 @@ file in this directory that doesn't look like a backup file will be treated as a configuration snippet. This facility is used by packages providing external backends (like -libsane-extras, hpoj or hplip) to "register" the backends they provide without +hpoj or hplip) to "register" the backends they provide without much hassle. Each backend has a configuration file which specifies which devices, @@ -169,13 +169,4 @@ tracking system, pleases always provide: Without that, your bug report will take longer to be processed, because we'll need to ask you for each of these items. Please help us help you. - -UNSUPPORTED DEVICES AND SPECIFIC NOTES --------------------------------------- - -If your scanner (or camera, or whatever) is not supported by the regular -SANE distribution, have a look at the libsane-extras package which contains -some backends not yet included in the regular SANE distribution. - - -- Julien BLACHE <jblache@debian.org>, Wed, 16 Feb 2011 19:00:12 +0100 diff --git a/debian/rules b/debian/rules index 1354391..293d798 100755 --- a/debian/rules +++ b/debian/rules @@ -4,20 +4,7 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) -DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) -DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) -DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH) -DEB_HOST_ARCH_OS ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_OS) - -VERSION = $(shell head -n1 debian/changelog | sed -e 's/.*(//;s/-.*).*//;s/\+/\-/') - -ifeq ($(DEB_HOST_ARCH_OS),) - DEB_HOST_ARCH_OS := $(subst -gnu,,$(shell dpkg-architecture -qDEB_HOST_GNU_SYSTEM)) - ifeq ($(DEB_HOST_ARCH_OS),gnu) - DEB_HOST_ARCH_OS := hurd - endif -endif +include /usr/share/dpkg/default.mk ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) CFLAGS += -g @@ -95,7 +82,7 @@ override_dh_installman-indep: $(RM) $(CURDIR)/debian/libsane-common/usr/share/man/man1/sane-find-scanner.1 $(RM) $(CURDIR)/debian/libsane-common/usr/share/man/man1/scanimage.1 $(RM) $(CURDIR)/debian/libsane-common/usr/share/man/man5/sane-umax_pp.5 - $(RM) $(CURDIR)/debian/libsane-common/usr/share/man/man8/saned.8 + $(RM) -r $(CURDIR)/debian/libsane-common/usr/share/man/man8/ # remove manpages for not build libs $(RM) $(CURDIR)/debian/libsane-common/usr/share/man/man5/sane-v4l.5 @@ -134,7 +121,7 @@ override_dh_installinit-arch: dh_installinit -psane-utils --name=saned override_dh_systemd_enable-arch: - dh_systemd_enable --no-enable saned.socket + dh_systemd_enable --no-enable debian/saned.socket override_dh_makeshlibs-arch: - dh_makeshlibs -- -v$(VERSION) -Pdebian/libsane1 -plibsane1 + dh_makeshlibs -- -v$(DEB_VERSION_UPSTREAM) -Pdebian/libsane1 -plibsane1 diff --git a/debian/sane-utils.links b/debian/sane-utils.links index 50ffd0e..dacfe5d 100644 --- a/debian/sane-utils.links +++ b/debian/sane-utils.links @@ -1 +1,2 @@ /dev/null /lib/systemd/system/saned.service +/usr/share/man/man5/sane-umax_pp.5 /usr/share/man/man5/umax_pp.5 diff --git a/debian/sane-utils.saned.init b/debian/sane-utils.saned.init index 5c87fc1..2e624a6 100644 --- a/debian/sane-utils.saned.init +++ b/debian/sane-utils.saned.init @@ -52,7 +52,7 @@ case "$1" in stop) log_daemon_msg "Stopping $DESC" "$NAME" start-stop-daemon --stop --oknodo --quiet --pidfile /var/run/$NAME.pid \ - --retry --exec $DAEMON + --retry 10 --exec $DAEMON log_end_msg $? ;; force-reload) |