From c8d4751fb8036a82385e4664e259b41a579f7bff Mon Sep 17 00:00:00 2001 From: Adam Cecile Date: Tue, 2 Jul 2019 21:31:32 +0200 Subject: [PATCH] Update aacraid-status packaging --- packaging/debian/aacraid-status/changelog | 13 +++++++++++++ packaging/debian/aacraid-status/control | 4 ++-- packaging/debian/aacraid-status/rules | 12 +++++++++++- 3 files changed, 26 insertions(+), 3 deletions(-) diff --git a/packaging/debian/aacraid-status/changelog b/packaging/debian/aacraid-status/changelog index 7edf1e2..ec6a45b 100644 --- a/packaging/debian/aacraid-status/changelog +++ b/packaging/debian/aacraid-status/changelog @@ -1,3 +1,16 @@ +aacraid-status (0.23) unstable; urgency=medium + + * Use lsb-release to generate unique distribution tag in pkgs version. + + -- Adam Cecile Tue, 02 Jul 2019 21:27:47 +0200 + +aacraid-status (0.22) unstable; urgency=medium + + * Various parsing fixes related to arcconf 2.x. + * Now fails if not controller are detected. + + -- Adam Cécile (Le_Vert) Wed, 14 Dec 2016 20:30:44 +0100 + aacraid-status (0.21) unstable; urgency=medium * Simple volume drives now handled correctly. diff --git a/packaging/debian/aacraid-status/control b/packaging/debian/aacraid-status/control index 4756215..efcb802 100644 --- a/packaging/debian/aacraid-status/control +++ b/packaging/debian/aacraid-status/control @@ -1,8 +1,8 @@ Source: aacraid-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.3 Package: aacraid-status diff --git a/packaging/debian/aacraid-status/rules b/packaging/debian/aacraid-status/rules index 0131cf2..1c81ff4 100755 --- a/packaging/debian/aacraid-status/rules +++ b/packaging/debian/aacraid-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: @@ -34,7 +44,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