diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/changelog | 41 | ||||
| -rw-r--r-- | debian/control | 8 | ||||
| -rw-r--r-- | debian/copyright | 2 | ||||
| -rw-r--r-- | debian/libsane-common.install (renamed from debian/libsane-common.install.in) | 0 | ||||
| -rw-r--r-- | debian/libsane-common.maintscript | 1 | ||||
| -rw-r--r-- | debian/libsane-common.manpages | 1 | ||||
| -rw-r--r-- | debian/libsane-common.preinst | 12 | ||||
| -rw-r--r-- | debian/libsane1.README.Debian | 11 | ||||
| -rw-r--r-- | debian/patches/0150-genesys-Fix-use-of-uninitialized-variable.patch | 25 | ||||
| -rw-r--r-- | debian/patches/series | 1 | ||||
| -rwxr-xr-x | debian/rules | 58 | ||||
| -rw-r--r-- | debian/sane-utils.install | 4 | ||||
| -rw-r--r-- | debian/sane-utils.links | 1 | ||||
| -rw-r--r-- | debian/sane-utils.manpages | 5 | ||||
| -rw-r--r-- | debian/sane-utils.saned.init | 2 |
15 files changed, 102 insertions, 70 deletions
diff --git a/debian/changelog b/debian/changelog index 665cfef..af8671c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,36 @@ +sane-backends (1.0.27-1~experimental3) experimental; urgency=medium + + * debian/control: + - Drop outdated Recommends libsane-extras-dev to libsane-dev + binary package (Closes: #868265). + - 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 + 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/*. + * New debian/patches/0150-genesys-Fix-use-of-uninitialized-variable.patch: + - 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 (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> Sat, 28 Oct 2017 13:26:26 +0200 + sane-backends (1.0.27-1~experimental2) experimental; urgency=medium * debian/rules: @@ -6,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 ae3f16a..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, @@ -20,8 +20,6 @@ Build-Depends: libusb-1.0-0-dev, pkg-config, po-debconf, - texlive, - texlive-latex-extra, xutils-dev Homepage: http://www.sane-project.org Vcs-Git: git://anonscm.debian.org/collab-maint/sane-backends.git @@ -36,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 @@ -58,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 @@ -113,7 +114,6 @@ Multi-Arch: same Depends: libsane1 (= ${binary:Version}), ${misc:Depends} -Recommends: libsane-extras-dev Description: API development library for scanners [development 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/copyright b/debian/copyright index 5590146..7a672b5 100644 --- a/debian/copyright +++ b/debian/copyright @@ -13,7 +13,7 @@ Copyright: 1997-2002 Kevin Dalley <kevind@rahul.net> 2002-2011 Julien BLACHE <jblache@debian.org> 2002-2006 Aurélien Jarno <aurel32@debian.org> 2013 Mark Buda <hermit@acm.org> - 2014-2016 Jörg Frings-Fürst <debian@jff-webhosting.net> + 2014-2017 Jörg Frings-Fürst <debian@jff-webhosting.net> License: GPL-2+ with sane exception Files: backend/abaton.* diff --git a/debian/libsane-common.install.in b/debian/libsane-common.install index 9def933..9def933 100644 --- a/debian/libsane-common.install.in +++ b/debian/libsane-common.install 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.manpages b/debian/libsane-common.manpages new file mode 100644 index 0000000..d8b3598 --- /dev/null +++ b/debian/libsane-common.manpages @@ -0,0 +1 @@ +doc/*.man 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/patches/0150-genesys-Fix-use-of-uninitialized-variable.patch b/debian/patches/0150-genesys-Fix-use-of-uninitialized-variable.patch new file mode 100644 index 0000000..0311975 --- /dev/null +++ b/debian/patches/0150-genesys-Fix-use-of-uninitialized-variable.patch @@ -0,0 +1,25 @@ +From dd61ef1cc84299781e382b9258d97102cee192b4 Mon Sep 17 00:00:00 2001 +From: Olaf Meeuwissen <paddy-hack@member.fsf.org> +Date: Thu, 3 Aug 2017 18:50:05 +0900 +Subject: [PATCH] genesys: Fix use of uninitialized variable + +See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=869673 +--- + backend/genesys.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/backend/genesys.c b/backend/genesys.c +index 1c1bbf4..0b644c4 100644 +--- a/backend/genesys.c ++++ b/backend/genesys.c +@@ -6237,6 +6237,7 @@ attach (SANE_String_Const devname, Genesys_Device ** devp, SANE_Bool may_wait) + dev->model = genesys_usb_device_list[i].model; + dev->vendorId = genesys_usb_device_list[i].vendor; + dev->productId = genesys_usb_device_list[i].product; ++ dev->usb_mode = 0; /* i.e. unset */ + dev->already_initialized = SANE_FALSE; + + DBG (DBG_info, "attach: found %s flatbed scanner %s at %s\n", +-- +2.1.4 + diff --git a/debian/patches/series b/debian/patches/series index 3820487..02949a2 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -21,3 +21,4 @@ 0140-avahi.patch 0145-avahi.patch 0100-source_spelling.patch +0150-genesys-Fix-use-of-uninitialized-variable.patch diff --git a/debian/rules b/debian/rules index ad09a43..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 @@ -62,8 +49,7 @@ override_dh_auto_clean: $(RM) include/byteorder.h include/_stdint.h # Add here commands to clean up after the build process. [ ! -f Makefile ] || $(MAKE) distclean - $(RM) debian/libsane-common.install - $(RM) debian/libsane.udev + $(RM) debian/libsane1.udev dh_auto_clean override_dh_auto_install-arch: @@ -72,24 +58,33 @@ override_dh_auto_install-arch: $(RM) debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/sane/libsane.so.1 # remove libsane-dll, same as regular libsane $(RM) debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/sane/libsane-dll.* - # install only the manpages for the backends which have been built - cp debian/libsane-common.install.in debian/libsane-common.install - ls debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/sane/*.so | sed -e \ - "s#.*/lib\([^.]\+\)[.]so#usr/share/man/man5/\1.5#" | { while read mp; do \ - test -e debian/tmp/$$mp && echo $$mp >> debian/libsane-common.install; done } + +override_dh_auto_install-indep: + dh_auto_install override_dh_install-arch: dh_install + # Install the pkg-config file + mkdir -p debian/libsane-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/ + cp tools/sane-backends.pc debian/libsane-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/ + +override_dh_install-indep: + dh_install # Install HAL fdi file mkdir -p $(CURDIR)/debian/libsane-common/usr/share/hal/fdi/preprobe/10osvendor $(CURDIR)/tools/sane-desc -s $(CURDIR)/doc/descriptions -m hal-new > \ $(CURDIR)/debian/libsane-common/usr/share/hal/fdi/preprobe/10osvendor/20-libsane.fdi - # Install the pkg-config file - mkdir -p debian/libsane-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/ - cp tools/sane-backends.pc debian/libsane-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig/ - # - mkdir -p $(CURDIR)/debian//sane-utils/usr/share/man/man5/ - cp $(CURDIR)/doc/sane-umax_pp.man $(CURDIR)/debian/sane-utils/usr/share/man/man5/umax_pp.5 + +override_dh_installman-indep: + dh_installman + # remove man files from package sane-utils + $(RM) $(CURDIR)/debian/libsane-common/usr/share/man/man1/gamma4scanimage.1 + $(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) -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 override_dh_installdocs-arch: dh_installdocs @@ -98,8 +93,6 @@ override_dh_installdocs-arch: override_dh_installdocs-indep: dh_installdocs - # create the /etc/sane.d/dll.d directory in libsane-common - install -d debian/libsane-common/etc/sane.d/dll.d # Platform-specific documentation $(RM) debian/libsane-common/etc/sane.d/saned.conf ifeq (kfreebsd,$(DEB_HOST_ARCH_OS)) @@ -113,7 +106,6 @@ override_dh_installudev-arch: ifeq (linux,$(DEB_HOST_ARCH_OS)) # udev support # Generate the udev rules file -# $(CURDIR)/tools/sane-desc -s $(CURDIR)/doc/descriptions -m udev+acl > $(CURDIR)/debian/libsane1.udev $(CURDIR)/tools/sane-desc -s $(CURDIR)/doc/descriptions -m udev+hwdb > $(CURDIR)/debian/libsane1.udev $(CURDIR)/tools/sane-desc -s $(CURDIR)/doc/descriptions -m hwdb > $(CURDIR)/debian/20-sane.hwdb cp $(CURDIR)/debian/20-sane.hwdb $(CURDIR)/debian/libsane1/lib/udev/hwdb.d/ @@ -129,9 +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 - # Empty dependency_libs in all .la files - #find debian -name "*.la" -type f -exec sed -i "/dependency_libs/ s/'.*'/''/" -i {} \; + dh_makeshlibs -- -v$(DEB_VERSION_UPSTREAM) -Pdebian/libsane1 -plibsane1 diff --git a/debian/sane-utils.install b/debian/sane-utils.install index a953300..ed670e4 100644 --- a/debian/sane-utils.install +++ b/debian/sane-utils.install @@ -3,10 +3,6 @@ usr/bin/gamma4scanimage usr/bin/sane-find-scanner usr/bin/scanimage usr/sbin/saned -usr/share/man/man1/gamma4scanimage.1 -usr/share/man/man1/sane-find-scanner.1 -usr/share/man/man1/scanimage.1 -usr/share/man/man8/saned.8 tools/umax_pp usr/bin debian/saned.socket lib/systemd/system debian/saned@.service lib/systemd/system 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.manpages b/debian/sane-utils.manpages new file mode 100644 index 0000000..02e37a7 --- /dev/null +++ b/debian/sane-utils.manpages @@ -0,0 +1,5 @@ +doc/gamma4scanimage.man +doc/sane-find-scanner.man +doc/scanimage.man +doc/saned.man +doc/sane-umax_pp.man 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) |