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/rules | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) (limited to 'debian/rules') 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/rules | 2 -- 1 file changed, 2 deletions(-) (limited to 'debian/rules') 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/rules | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) (limited to 'debian/rules') 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/rules | 2 -- 1 file changed, 2 deletions(-) (limited to 'debian/rules') 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 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/rules | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'debian/rules') 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 -- 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(+) (limited to 'debian/rules') 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/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') 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 -- 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/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian/rules') 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 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/rules | 17 ++--------------- 1 file changed, 2 insertions(+), 15 deletions(-) (limited to 'debian/rules') 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