From 4dcfb6ad1900951c31fbb9170a014bc4e9405a63 Mon Sep 17 00:00:00 2001 From: Adam Cecile Date: Tue, 2 Jul 2019 23:49:59 +0200 Subject: [PATCH] Update megactl packaging --- packaging/debian/megactl/changelog | 13 +++++++++++++ packaging/debian/megactl/compat | 2 +- packaging/debian/megactl/control | 2 +- packaging/debian/megactl/rules | 12 +++++++++++- 4 files changed, 26 insertions(+), 3 deletions(-) diff --git a/packaging/debian/megactl/changelog b/packaging/debian/megactl/changelog index ed1e94d..fc41928 100644 --- a/packaging/debian/megactl/changelog +++ b/packaging/debian/megactl/changelog @@ -1,3 +1,16 @@ +megactl (0.4.1+svn20090725.r6-7) unstable; urgency=medium + + * Use lsb-release to generate unique distribution tag in pkgs version. + + -- Adam Cecile Tue, 02 Jul 2019 23:45:52 +0200 + +megactl (0.4.1+svn20090725.r6-6) unstable; urgency=medium + + * Bump debhelper compat to 5 because 4 is not supported anymore + on Debian Stretch. + + -- Adam Cecile Wed, 02 Aug 2017 00:34:28 +0200 + megactl (0.4.1+svn20090725.r6-5) unstable; urgency=medium * Update 003-Fix_disk_enumeration_loop patch (fix issues with PERC6e). diff --git a/packaging/debian/megactl/compat b/packaging/debian/megactl/compat index b8626c4..7ed6ff8 100644 --- a/packaging/debian/megactl/compat +++ b/packaging/debian/megactl/compat @@ -1 +1 @@ -4 +5 diff --git a/packaging/debian/megactl/control b/packaging/debian/megactl/control index 8ad3a07..694b8bb 100644 --- a/packaging/debian/megactl/control +++ b/packaging/debian/megactl/control @@ -2,7 +2,7 @@ Source: megactl Section: admin Priority: optional Maintainer: Adam Cécile (Le_Vert) -Build-Depends: debhelper (>= 4), dpatch, libc6-dev-i386 [amd64], gcc-multilib [amd64] | libc6-dev-i386 (<< 2.7) [amd64] +Build-Depends: debhelper (>= 5), dpatch, libc6-dev-i386 [amd64], gcc-multilib [amd64] | libc6-dev-i386 (<< 2.7) [amd64], lsb-release Standards-Version: 3.8.2 Homepage: http://sourceforge.net/projects/megactl diff --git a/packaging/debian/megactl/rules b/packaging/debian/megactl/rules index b0ce45e..7bfb9d7 100755 --- a/packaging/debian/megactl/rules +++ b/packaging/debian/megactl/rules @@ -14,6 +14,16 @@ else CFLAGS += -O2 endif +# 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-stamp build-stamp: patch-stamp dh_testdir @@ -50,7 +60,7 @@ binary-arch: build install ifeq ($(ARCH),i386) dh_shlibdeps endif - dh_gencontrol + dh_gencontrol -- -v"$(PKG_VERSION_TAG)" $(SUBSTVARS_BINARY_VERSION) $(SUBSTVARS_SOURCE_VERSION) dh_md5sums dh_builddeb