From b25d28838e42bb0d0a53e9df01ca3f274e412a47 Mon Sep 17 00:00:00 2001 From: Adam Cecile Date: Tue, 2 Jul 2019 21:47:07 +0200 Subject: [PATCH] Update adaptec-storage-manager-linux-32bit packaging --- .../adaptec-storage-manager-linux-32bit/changelog | 7 +++++++ .../adaptec-storage-manager-linux-32bit/control | 4 ++-- .../debian/adaptec-storage-manager-linux-32bit/rules | 12 +++++++++++- 3 files changed, 20 insertions(+), 3 deletions(-) diff --git a/packaging/debian/adaptec-storage-manager-linux-32bit/changelog b/packaging/debian/adaptec-storage-manager-linux-32bit/changelog index 05844c3..f8bc1d1 100644 --- a/packaging/debian/adaptec-storage-manager-linux-32bit/changelog +++ b/packaging/debian/adaptec-storage-manager-linux-32bit/changelog @@ -1,3 +1,10 @@ +adaptec-storage-manager-linux-32bit (7.31.18856-2) unstable; urgency=medium + + * Use lsb-release to generate unique distribution tag in pkgs version. + * Add alternative for JRE for newer distributions. + + -- Adam Cecile Tue, 02 Jul 2019 21:38:02 +0200 + adaptec-storage-manager-linux-32bit (7.31.18856-1) unstable; urgency=low * New upstream release. diff --git a/packaging/debian/adaptec-storage-manager-linux-32bit/control b/packaging/debian/adaptec-storage-manager-linux-32bit/control index f4ce0f7..b5c8862 100644 --- a/packaging/debian/adaptec-storage-manager-linux-32bit/control +++ b/packaging/debian/adaptec-storage-manager-linux-32bit/control @@ -2,7 +2,7 @@ Source: adaptec-storage-manager-linux-32bit Section: admin Priority: optional Maintainer: Adam Cécile (Le_Vert) -Build-Depends: debhelper (>= 5), libwrap0, libstdc++5, quilt +Build-Depends: debhelper (>= 5), libwrap0, libstdc++5, quilt, lsb-release Homepage: http://www.adaptec.com/en-US/support/raid/sas_raid/SAS-5805Z/ Standards-Version: 3.9.3 @@ -30,7 +30,7 @@ Description: Adaptec HostRaid HBAs command line tool Package: adaptec-storage-manager-common Architecture: i386 -Depends: ${shlibs:Depends}, ${misc:Depends}, sun-java6-jre | sun-java5-jre +Depends: ${shlibs:Depends}, ${misc:Depends}, default-jre-headless | java8-runtime-headless | java8-runtime | sun-java6-jre | sun-java5-jre Description: Common files for storage-manager-gui and storage-manager-agent This package contains shared files between storage-manager-gui and storage-manager-agent. diff --git a/packaging/debian/adaptec-storage-manager-linux-32bit/rules b/packaging/debian/adaptec-storage-manager-linux-32bit/rules index 92655f1..25726ca 100755 --- a/packaging/debian/adaptec-storage-manager-linux-32bit/rules +++ b/packaging/debian/adaptec-storage-manager-linux-32bit/rules @@ -6,6 +6,16 @@ include /usr/share/quilt/quilt.make # 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)" + # Example: # debian/rules repack FILE=../repack/manager/StorMan-7.31.i386.rpm VERSION=7.31.18856 repack: @@ -63,7 +73,7 @@ binary-arch: build install dh_strip dh_installdeb dh_shlibdeps - dh_gencontrol + dh_gencontrol -- -v"$(PKG_VERSION_TAG)" $(SUBSTVARS_BINARY_VERSION) $(SUBSTVARS_SOURCE_VERSION) dh_md5sums dh_builddeb