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