summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog4
-rwxr-xr-xdebian/rules8
2 files changed, 6 insertions, 6 deletions
diff --git a/debian/changelog b/debian/changelog
index e255c75..918eb81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
sane-backends (1.0.25-2) unstable; urgency=medium
* Undelete, refresh and rename
- debian/patches/0125-multiarch_dll_search_path.patch.
+ debian/patches/0125-multiarch_dll_search_path.patch (Closes: #804240).
+ * debian/rules:
+ - Remove "UPSTREAM_VERSION" and use "VERSION" instead.
-- Jörg Frings-Fürst <debian@jff-webhosting.net> Sat, 07 Nov 2015 04:49:15 +0100
diff --git a/debian/rules b/debian/rules
index 9a38cfb..7a0e1b5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,6 +10,8 @@ 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)
@@ -26,8 +28,6 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
STRIP = ""
endif
-VERSION = $(shell head -n1 debian/changelog | sed -e 's/.*(//;s/-.*).*//;s/\+/\-/')
-
%:
dh $@ --parallel --with autotools_dev,systemd
@@ -136,7 +136,5 @@ override_dh_systemd_enable:
override_dh_strip:
dh_strip --dbg-package=libsane-dbg
-UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -n '/\(Version:\)/{s/^Version:[[:space:]]\+\([0-9]\+:\)\?\(.*\)/\2/p}' | rev | cut -d- -f 2- | rev)
-
override_dh_makeshlibs:
- dh_makeshlibs -- -v$(UPSTREAM_VERSION) -Pdebian/libsane -plibsane
+ dh_makeshlibs -- -v$(VERSION) -Pdebian/libsane -plibsane