From cce25a7536cb3e226cd900493faf5c0428637033 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 5 Aug 2017 18:47:08 +0200 Subject: Drop outdated texlive and texlive-latex-extra Build-Dependency; Drop outdated Recommends libsane-extras-dev to libsane-dev --- debian/changelog | 9 +++++++++ debian/control | 3 --- debian/rules | 32 +++++++++++++++++++++++--------- 3 files changed, 32 insertions(+), 12 deletions(-) diff --git a/debian/changelog b/debian/changelog index 665cfef..cb964ea 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +sane-backends (1.0.27-1~experimental3) UNRELEASED; 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. + + -- Jörg Frings-Fürst Wed, 02 Aug 2017 18:20:24 +0200 + sane-backends (1.0.27-1~experimental2) experimental; urgency=medium * debian/rules: diff --git a/debian/control b/debian/control index ae3f16a..cba9436 100644 --- a/debian/control +++ b/debian/control @@ -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 @@ -113,7 +111,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/rules b/debian/rules index ad09a43..b0d0357 100755 --- a/debian/rules +++ b/debian/rules @@ -73,24 +73,38 @@ override_dh_auto_install-arch: # 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: 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 } + dh_auto_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_install-arch: 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 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/ + 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_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 + override_dh_installdocs-arch: dh_installdocs # move files that belong to libsane-dev @@ -99,7 +113,7 @@ 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 +# 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)) -- cgit v1.2.3 From 1af889a21ab4eeba839bcf0ee447b4ffdb8f4eb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 5 Aug 2017 18:49:32 +0200 Subject: Drop create and install the /etc/sane.d/dll.d directory --- debian/changelog | 2 ++ debian/rules | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index cb964ea..b47f1b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ sane-backends (1.0.27-1~experimental3) UNRELEASED; urgency=medium + 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. -- Jörg Frings-Fürst Wed, 02 Aug 2017 18:20:24 +0200 diff --git a/debian/rules b/debian/rules index b0d0357..88e51dd 100755 --- a/debian/rules +++ b/debian/rules @@ -112,8 +112,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)) -- cgit v1.2.3 From 66da2f4601331074484ff3456e676c57a1d0ef49 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 5 Aug 2017 19:21:11 +0200 Subject: d/rules: Move rules --- debian/changelog | 3 +++ debian/rules | 18 +----------------- 2 files changed, 4 insertions(+), 17 deletions(-) diff --git a/debian/changelog b/debian/changelog index b47f1b7..15b9af4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,9 @@ sane-backends (1.0.27-1~experimental3) UNRELEASED; urgency=medium + 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). -- Jörg Frings-Fürst Wed, 02 Aug 2017 18:20:24 +0200 diff --git a/debian/rules b/debian/rules index 88e51dd..81a683c 100755 --- a/debian/rules +++ b/debian/rules @@ -63,7 +63,7 @@ override_dh_auto_clean: # 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,29 +72,16 @@ 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: cp debian/libsane-common.install.in debian/libsane-common.install dh_auto_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_install-arch: 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 @@ -125,7 +112,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/ @@ -145,5 +131,3 @@ override_dh_systemd_enable-arch: 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 {} \; -- cgit v1.2.3 From 68e00695abb9ab3d306f0eec4bc5b93c8abec345 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 5 Aug 2017 19:36:35 +0200 Subject: Move libsane-common.install.in to libsane-common.install --- debian/changelog | 1 + debian/libsane-common.install | 5 +++++ debian/libsane-common.install.in | 5 ----- debian/rules | 2 -- 4 files changed, 6 insertions(+), 7 deletions(-) create mode 100644 debian/libsane-common.install delete mode 100644 debian/libsane-common.install.in diff --git a/debian/changelog b/debian/changelog index 15b9af4..8eab99e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ sane-backends (1.0.27-1~experimental3) UNRELEASED; urgency=medium + 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). + * Move libsane-common.install.in to libsane-common.install. -- Jörg Frings-Fürst Wed, 02 Aug 2017 18:20:24 +0200 diff --git a/debian/libsane-common.install b/debian/libsane-common.install new file mode 100644 index 0000000..9def933 --- /dev/null +++ b/debian/libsane-common.install @@ -0,0 +1,5 @@ +etc/ +usr/share/man/man7 +usr/share/locale/ +usr/share/man/man5/sane-scsi.5 +usr/share/man/man5/sane-usb.5 diff --git a/debian/libsane-common.install.in b/debian/libsane-common.install.in deleted file mode 100644 index 9def933..0000000 --- a/debian/libsane-common.install.in +++ /dev/null @@ -1,5 +0,0 @@ -etc/ -usr/share/man/man7 -usr/share/locale/ -usr/share/man/man5/sane-scsi.5 -usr/share/man/man5/sane-usb.5 diff --git a/debian/rules b/debian/rules index 81a683c..fb48f8f 100755 --- a/debian/rules +++ b/debian/rules @@ -62,7 +62,6 @@ 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/libsane1.udev dh_auto_clean @@ -74,7 +73,6 @@ override_dh_auto_install-arch: $(RM) debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/sane/libsane-dll.* override_dh_auto_install-indep: - cp debian/libsane-common.install.in debian/libsane-common.install dh_auto_install override_dh_install-arch: -- cgit v1.2.3 From 06c412bfa69243f7c18ed7cf1b7a615fd27181e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 5 Aug 2017 20:12:25 +0200 Subject: New debian/patches/0150-genesys-Fix-use-of-uninitialized-variable.patch --- debian/changelog | 6 ++++++ debian/copyright | 2 +- ...genesys-Fix-use-of-uninitialized-variable.patch | 25 ++++++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 debian/patches/0150-genesys-Fix-use-of-uninitialized-variable.patch diff --git a/debian/changelog b/debian/changelog index 8eab99e..0756806 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,12 @@ sane-backends (1.0.27-1~experimental3) UNRELEASED; urgency=medium to override_dh_install-indep and override_dh_auto_install-indep to build the arch all packages without error (CLoses: #870455). * 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 and + Olaf Meeuwissen . -- Jörg Frings-Fürst Wed, 02 Aug 2017 18:20:24 +0200 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 2002-2011 Julien BLACHE 2002-2006 Aurélien Jarno 2013 Mark Buda - 2014-2016 Jörg Frings-Fürst + 2014-2017 Jörg Frings-Fürst License: GPL-2+ with sane exception Files: backend/abaton.* 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 +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 -- cgit v1.2.3 From 68de201c82a0a0f71d2f85072215979278cb3072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 6 Aug 2017 09:15:27 +0200 Subject: Move install of man pages from debian/rules to *.manpages --- debian/changelog | 2 ++ debian/libsane-common.manpages | 1 + debian/rules | 10 ++++++++-- debian/sane-utils.install | 4 ---- debian/sane-utils.manpages | 5 +++++ 5 files changed, 16 insertions(+), 6 deletions(-) create mode 100644 debian/libsane-common.manpages create mode 100644 debian/sane-utils.manpages diff --git a/debian/changelog b/debian/changelog index 0756806..b8d2480 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,6 +16,8 @@ sane-backends (1.0.27-1~experimental3) UNRELEASED; urgency=medium + Initializing usb_mode (Closes:# 869673). Thanks to Florian Lindemann and Olaf Meeuwissen . + * Move install of man pages from debian/rules to libsane-common.manpages and + sane-utils.manpages. -- Jörg Frings-Fürst Wed, 02 Aug 2017 18:20:24 +0200 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/rules b/debian/rules index fb48f8f..0cbf6ad 100755 --- a/debian/rules +++ b/debian/rules @@ -80,8 +80,6 @@ override_dh_install-arch: # 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_install-indep: dh_install @@ -90,6 +88,14 @@ override_dh_install-indep: $(CURDIR)/tools/sane-desc -s $(CURDIR)/doc/descriptions -m hal-new > \ $(CURDIR)/debian/libsane-common/usr/share/hal/fdi/preprobe/10osvendor/20-libsane.fdi +override_dh_installman-indep: + dh_installman + $(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) $(CURDIR)/debian/libsane-common/usr/share/man/man8/saned.8 + override_dh_installdocs-arch: dh_installdocs # move files that belong to libsane-dev 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.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 -- cgit v1.2.3 From 7c4c39a26c0ebe12e0b8825fc41249a702e65cf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 6 Aug 2017 10:31:51 +0200 Subject: remove manpage sane-v4l.5 --- debian/rules | 3 +++ 1 file changed, 3 insertions(+) diff --git a/debian/rules b/debian/rules index 0cbf6ad..1354391 100755 --- a/debian/rules +++ b/debian/rules @@ -90,11 +90,14 @@ override_dh_install-indep: 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) $(CURDIR)/debian/libsane-common/usr/share/man/man8/saned.8 + # remove manpages for not build libs + $(RM) $(CURDIR)/debian/libsane-common/usr/share/man/man5/sane-v4l.5 override_dh_installdocs-arch: dh_installdocs -- cgit v1.2.3 From b6ad4c27eefc9c0e5e545c0b50ff2861379c3993 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 6 Aug 2017 14:05:19 +0200 Subject: Move umax_pp.5 from libsane-common to sane-utils --- debian/changelog | 1 + debian/control | 3 +++ debian/rules | 2 +- debian/sane-utils.links | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index b8d2480..609dbaa 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,7 @@ sane-backends (1.0.27-1~experimental3) UNRELEASED; urgency=medium Olaf Meeuwissen . * Move install of man pages from debian/rules to libsane-common.manpages and sane-utils.manpages. + * Move umax_pp.5 from libsane-common to sane-utils. -- Jörg Frings-Fürst Wed, 02 Aug 2017 18:20:24 +0200 diff --git a/debian/control b/debian/control index cba9436..9f4aad9 100644 --- a/debian/control +++ b/debian/control @@ -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/rules b/debian/rules index 1354391..5621fd8 100755 --- a/debian/rules +++ b/debian/rules @@ -95,7 +95,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 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 -- cgit v1.2.3 From 39c09233bae3769ba717e8fb0fdc7bdf40056452 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sun, 6 Aug 2017 14:42:40 +0200 Subject: d/changelog: change date/time --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 609dbaa..1d97a4a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -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 @@ -20,7 +20,7 @@ sane-backends (1.0.27-1~experimental3) UNRELEASED; urgency=medium sane-utils.manpages. * Move umax_pp.5 from libsane-common to sane-utils. - -- Jörg Frings-Fürst Wed, 02 Aug 2017 18:20:24 +0200 + -- Jörg Frings-Fürst Sun, 06 Aug 2017 14:40:14 +0200 sane-backends (1.0.27-1~experimental2) experimental; urgency=medium -- cgit v1.2.3 From 0da5cb79705618c3672af48d0a1a88f3113f1ba2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 10 Aug 2017 08:52:35 +0200 Subject: d/sane-utils.saned.init: Add parameter to --retry at the stop section --- debian/changelog | 4 +++- debian/sane-utils.saned.init | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1d97a4a..0c8a8e2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,8 +19,10 @@ sane-backends (1.0.27-1~experimental3) experimental; urgency=medium * Move install of man pages from debian/rules to libsane-common.manpages and sane-utils.manpages. * 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). - -- Jörg Frings-Fürst Sun, 06 Aug 2017 14:40:14 +0200 + -- Jörg Frings-Fürst Thu, 10 Aug 2017 08:51:45 +0200 sane-backends (1.0.27-1~experimental2) experimental; urgency=medium 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) -- cgit v1.2.3 From b6eda5b895dc49fc3b04ba78a0dd31960a4a2796 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 17 Aug 2017 16:10:34 +0200 Subject: Some minor changes --- debian/changelog | 27 +++++++++++++++------------ debian/libsane1.README.Debian | 11 +---------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/debian/changelog b/debian/changelog index 0c8a8e2..85e8f70 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,26 +1,29 @@ 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). * 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 and Olaf Meeuwissen . * 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). + - 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. -- Jörg Frings-Fürst Thu, 10 Aug 2017 08:51:45 +0200 @@ -32,13 +35,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/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 , Wed, 16 Feb 2011 19:00:12 +0100 -- cgit v1.2.3 From b539726f930c76df1930e3dd32a31ee380d444ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Thu, 17 Aug 2017 16:11:32 +0200 Subject: d/changelog: Change Date/Time --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 85e8f70..e1a2655 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,7 +25,7 @@ sane-backends (1.0.27-1~experimental3) experimental; urgency=medium - Remove references to the libsane-extras package. * Correct typos in the previous changelog entry. - -- Jörg Frings-Fürst Thu, 10 Aug 2017 08:51:45 +0200 + -- Jörg Frings-Fürst Thu, 17 Aug 2017 16:10:44 +0200 sane-backends (1.0.27-1~experimental2) experimental; urgency=medium -- cgit v1.2.3 From b70b1160b51a71b4c0fdac7e75fdea62bbd6fa86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 17 Oct 2017 20:34:54 +0200 Subject: At dh_systemd_enable use debian/saned.socket instead saned.socket --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index e1a2655..917b879 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,7 @@ sane-backends (1.0.27-1~experimental3) experimental; urgency=medium - 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. * Move libsane-common.install.in to libsane-common.install. * debian/copyright: - Add year 2017 for debian/*. diff --git a/debian/rules b/debian/rules index 5621fd8..2a5ee68 100755 --- a/debian/rules +++ b/debian/rules @@ -134,7 +134,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 -- cgit v1.2.3 From 179c93430628bd47fdf67ad524d717e21ef9182f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 17 Oct 2017 21:42:53 +0200 Subject: Move rm_conffile from libsane-common.preinst to libsane-common.maintscript --- debian/changelog | 2 ++ debian/control | 2 +- debian/libsane-common.maintscript | 1 + debian/libsane-common.preinst | 12 ------------ 4 files changed, 4 insertions(+), 13 deletions(-) create mode 100644 debian/libsane-common.maintscript delete mode 100644 debian/libsane-common.preinst diff --git a/debian/changelog b/debian/changelog index 917b879..06e1e44 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,8 @@ sane-backends (1.0.27-1~experimental3) experimental; urgency=medium * 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 Thu, 17 Aug 2017 16:10:44 +0200 diff --git a/debian/control b/debian/control index 9f4aad9..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 -Standards-Version: 4.0.0 +Standards-Version: 4.1.1 Build-Depends: autoconf, chrpath, 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# -- cgit v1.2.3 From f72304a532bf9524322f7650c04f247628211600 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Tue, 17 Oct 2017 21:47:48 +0200 Subject: d/changelog: change release date/time --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 06e1e44..73ea225 100644 --- a/debian/changelog +++ b/debian/changelog @@ -28,7 +28,7 @@ sane-backends (1.0.27-1~experimental3) experimental; urgency=medium * 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 Thu, 17 Aug 2017 16:10:44 +0200 + -- Jörg Frings-Fürst Tue, 17 Oct 2017 21:47:01 +0200 sane-backends (1.0.27-1~experimental2) experimental; urgency=medium -- cgit v1.2.3 From a94931d5e099821bc89867a0a68af318bf5fef7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 28 Oct 2017 13:26:17 +0200 Subject: Use DEB* vars via default.mk instead own functions --- debian/changelog | 1 + debian/rules | 17 ++--------------- 2 files changed, 3 insertions(+), 15 deletions(-) diff --git a/debian/changelog b/debian/changelog index 73ea225..af9757a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ sane-backends (1.0.27-1~experimental3) experimental; urgency=medium 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/*. diff --git a/debian/rules b/debian/rules index 2a5ee68..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 @@ -137,4 +124,4 @@ override_dh_systemd_enable-arch: 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 -- cgit v1.2.3 From 9ec2719599329a797985443f8f32150e62a718c2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 28 Oct 2017 13:27:02 +0200 Subject: d/changelog: Change date / time --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index af9757a..af8671c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,7 +29,7 @@ sane-backends (1.0.27-1~experimental3) experimental; urgency=medium * 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 Tue, 17 Oct 2017 21:47:01 +0200 + -- Jörg Frings-Fürst Sat, 28 Oct 2017 13:26:26 +0200 sane-backends (1.0.27-1~experimental2) experimental; urgency=medium -- cgit v1.2.3