diff --git a/packaging/debian/lsiutil/changelog b/packaging/debian/lsiutil/changelog index 3d4a1ba..dc6dd93 100644 --- a/packaging/debian/lsiutil/changelog +++ b/packaging/debian/lsiutil/changelog @@ -1,3 +1,9 @@ +lsiutil (1.60-3) unstable; urgency=medium + + * Use lsb-release to generate unique distribution tag in pkgs version. + + -- Adam Cecile Tue, 02 Jul 2019 23:18:57 +0200 + lsiutil (1.60-2) unstable; urgency=medium * Invert uudecode file and args to get it working with newer version. diff --git a/packaging/debian/lsiutil/control b/packaging/debian/lsiutil/control index c6a5623..3a4d17b 100644 --- a/packaging/debian/lsiutil/control +++ b/packaging/debian/lsiutil/control @@ -2,7 +2,7 @@ Source: lsiutil Section: admin Priority: optional Maintainer: Adam Cécile (Le_Vert) -Build-Depends: debhelper (>= 5), sharutils +Build-Depends: debhelper (>= 5), sharutils, lsb-release Standards-Version: 3.8.0 Homepage: http://www.lsi.com @@ -10,5 +10,5 @@ Package: lsiutil Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: LSI Logic Fusion MPT Command Line Interface management tool - This packages contains the "lsiutil" command line tool to manage LSI Fusion + This package contains the "lsiutil" command line tool to manage LSI Fusion MPT RAID HBAs. diff --git a/packaging/debian/lsiutil/rules b/packaging/debian/lsiutil/rules index d3188ae..dbfd7d7 100755 --- a/packaging/debian/lsiutil/rules +++ b/packaging/debian/lsiutil/rules @@ -2,6 +2,16 @@ DESTDIR = $(CURDIR)/debian/lsiutil +# 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)" + debian/user_guide.pdf: uudecode -o $@ $@.uu @@ -30,9 +40,10 @@ binary-arch: build install dh_strip dh_compress -Xusr/share/doc/lsiutil/user_guide.pdf 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