diff options
| author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-11-12 13:54:29 +0100 |
|---|---|---|
| committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2017-11-12 13:54:29 +0100 |
| commit | 5dd18f2c37356c8b7a27bfa974ff4a4a456eec97 (patch) | |
| tree | ec8a5bf4f74a3d88b45d5849a02bd70529e17a23 /debian/rules | |
| parent | e719a395d1f59b7fbb83296c7a8ef04b8999095b (diff) | |
| parent | dea49f00449b6f64b29dc7afd400a219ea7bc4ab (diff) | |
Merge tag 'experimental/1.0.27-1_experimental3' into develop
Bugfix relase
Diffstat (limited to 'debian/rules')
| -rwxr-xr-x | debian/rules | 21 |
1 files changed, 4 insertions, 17 deletions
diff --git a/debian/rules b/debian/rules index 1354391..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 @@ -95,7 +82,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 @@ -134,7 +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 + dh_makeshlibs -- -v$(DEB_VERSION_UPSTREAM) -Pdebian/libsane1 -plibsane1 |