diff --git a/packaging/debian/spy/changelog b/packaging/debian/spy/changelog index 18a3e3a..ecf89b2 100644 --- a/packaging/debian/spy/changelog +++ b/packaging/debian/spy/changelog @@ -1,3 +1,16 @@ +spy (7.24.26-5) unstable; urgency=medium + + * Use lsb-release to generate unique distribution tag in pkgs version. + + -- Adam Cecile Tue, 02 Jul 2019 23:11:15 +0200 + +spy (7.24.26-4) unstable; urgency=medium + + * Bump debhelper compat level to 5 because 4 is not supported anymore + on Debian Stretch. + + -- Adam Cecile Wed, 02 Aug 2017 00:28:17 +0200 + spy (7.24.26-3) unstable; urgency=low * Relax debhelper bdep to allow Sarge builds. diff --git a/packaging/debian/spy/compat b/packaging/debian/spy/compat index b8626c4..7ed6ff8 100644 --- a/packaging/debian/spy/compat +++ b/packaging/debian/spy/compat @@ -1 +1 @@ -4 +5 diff --git a/packaging/debian/spy/control b/packaging/debian/spy/control index 7338a70..c6636dc 100644 --- a/packaging/debian/spy/control +++ b/packaging/debian/spy/control @@ -2,7 +2,7 @@ Source: spy Section: admin Priority: optional Maintainer: Adam Cécile (Le_Vert) -Build-Depends: debhelper (>= 4) +Build-Depends: debhelper (>= 5), lsb-release Standards-Version: 3.8.0 Homepage: http://www.lsilogic.com diff --git a/packaging/debian/spy/rules b/packaging/debian/spy/rules index b23157f..c98bd33 100755 --- a/packaging/debian/spy/rules +++ b/packaging/debian/spy/rules @@ -3,6 +3,16 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 +# Get version from changelog as well as lsb_release +# to compute unique build version (useful for repo mirroring systems doing file pooling) +PKG_VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | cut -f2 -d' ') +DIST_NAME := $(shell lsb_release -si) +DIST_RELEASE := $(shell lsb_release -sc) +DIST_VERSION := $(shell lsb_release -sr) +PKG_VERSION_TAG := $(PKG_VERSION)+$(DIST_NAME).$(DIST_RELEASE).$(DIST_VERSION) +SUBSTVARS_BINARY_VERSION := -Vbinary:Version="$(PKG_VERSION_TAG)" +SUBSTVARS_SOURCE_VERSION := -Vsource:Version="$(PKG_VERSION_TAG)" + build: clean: @@ -29,9 +39,10 @@ binary-arch: build install dh_strip dh_compress dh_fixperms + dh_makeshlibs dh_installdeb dh_shlibdeps - dh_gencontrol + dh_gencontrol -- -v"$(PKG_VERSION_TAG)" $(SUBSTVARS_BINARY_VERSION) $(SUBSTVARS_SOURCE_VERSION) dh_md5sums dh_builddeb