From 6d3b7f04e8d085fa4ba6ae5a6d0a7383de256a72 Mon Sep 17 00:00:00 2001 From: Adam Cecile Date: Tue, 2 Jul 2019 23:37:06 +0200 Subject: [PATCH] Update sas2ircu-status packaging --- packaging/debian/sas2ircu-status/changelog | 6 ++++++ packaging/debian/sas2ircu-status/control | 4 ++-- packaging/debian/sas2ircu-status/rules | 12 +++++++++++- 3 files changed, 19 insertions(+), 3 deletions(-) diff --git a/packaging/debian/sas2ircu-status/changelog b/packaging/debian/sas2ircu-status/changelog index 741d45e..2cf6189 100644 --- a/packaging/debian/sas2ircu-status/changelog +++ b/packaging/debian/sas2ircu-status/changelog @@ -1,3 +1,9 @@ +sas2ircu-status (0.8) unstable; urgency=medium + + * Use lsb-release to generate unique distribution tag in pkgs version. + + -- Adam Cecile Tue, 02 Jul 2019 23:32:26 +0200 + sas2ircu-status (0.7) unstable; urgency=medium * New release with better disk handling (Closes: GitHub#23). diff --git a/packaging/debian/sas2ircu-status/control b/packaging/debian/sas2ircu-status/control index be64035..2f867a8 100644 --- a/packaging/debian/sas2ircu-status/control +++ b/packaging/debian/sas2ircu-status/control @@ -1,8 +1,8 @@ Source: sas2ircu-status Section: admin -Priority: extra +Priority: optional Maintainer: Adam Cécile (Le_Vert) -Build-Depends: debhelper (>= 5) +Build-Depends: debhelper (>= 5), lsb-release Standards-Version: 3.9.5 Package: sas2ircu-status diff --git a/packaging/debian/sas2ircu-status/rules b/packaging/debian/sas2ircu-status/rules index 335eafd..0f1cd29 100755 --- a/packaging/debian/sas2ircu-status/rules +++ b/packaging/debian/sas2ircu-status/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: build-arch: build-indep: @@ -35,7 +45,7 @@ binary-indep: install dh_fixperms dh_installdeb dh_shlibdeps - dh_gencontrol + dh_gencontrol -- -v"$(PKG_VERSION_TAG)" $(SUBSTVARS_BINARY_VERSION) $(SUBSTVARS_SOURCE_VERSION) dh_md5sums dh_builddeb