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