diff --git a/packaging/debian/megaide-status/README.Debian b/packaging/debian/megaide-status/README.Debian index 8fd1e73..d8684ef 100644 --- a/packaging/debian/megaide-status/README.Debian +++ b/packaging/debian/megaide-status/README.Debian @@ -4,7 +4,7 @@ README.Debian for megaide-status package Required configuration: ----------------------- -This software uses informations from /proc/megaide/. +This software uses information from /proc/megaide/. However the megaide kernel module report all disk controller ports, even if there are not used. So there is now way to figure out if a disk is not used or if it's offline. @@ -13,7 +13,7 @@ That's why I added /etc/megaide-status.conf configuration file which should be filled with "in-use" disks ids. The syntaxe is 'cup'. -In exemple, first disk on second logicial volume and third controller is: +In example, first disk on second logicial volume and third controller is: c2u1p0 The default configuration file is suitable for regular SATA systems with diff --git a/packaging/debian/megaide-status/changelog b/packaging/debian/megaide-status/changelog index 70d7489..bfcae14 100644 --- a/packaging/debian/megaide-status/changelog +++ b/packaging/debian/megaide-status/changelog @@ -1,3 +1,16 @@ +megaide-status (0.4) unstable; urgency=medium + + * Use lsb-release to generate unique distribution tag in pkgs version. + + -- Adam Cecile Wed, 03 Jul 2019 10:57:27 +0200 + +megaide-status (0.3) unstable; urgency=medium + + * Bump debhelper compat to 5 because 4 is not supported anymore + on Debian Stretch. + + -- Adam Cecile Wed, 02 Aug 2017 00:36:03 +0200 + megaide-status (0.2) unstable; urgency=low * Packaging cleanup. diff --git a/packaging/debian/megaide-status/compat b/packaging/debian/megaide-status/compat index b8626c4..7ed6ff8 100644 --- a/packaging/debian/megaide-status/compat +++ b/packaging/debian/megaide-status/compat @@ -1 +1 @@ -4 +5 diff --git a/packaging/debian/megaide-status/control b/packaging/debian/megaide-status/control index 6944062..3c52d90 100644 --- a/packaging/debian/megaide-status/control +++ b/packaging/debian/megaide-status/control @@ -2,12 +2,12 @@ Source: megaide-status Section: admin Priority: optional Maintainer: Adam Cécile (Le_Vert) -Build-Depends: debhelper (>= 4) +Build-Depends: debhelper (>= 5), lsb-release Standards-Version: 3.8.0 Package: megaide-status Architecture: all -Depends: ${shlibs:Depends}, ${misc:Depends}, python, lsb-base, daemon, mailx +Depends: ${shlibs:Depends}, ${misc:Depends}, python, lsb-base, daemon, bsd-mailx | mailx Description: get RAID status out of LSI MegaIDE Software RAID controllers The megaide-status software is a query tool to access the running configuration and status of LSI MegaIDE HBAs. diff --git a/packaging/debian/megaide-status/megaide-status.megaide-statusd.init b/packaging/debian/megaide-status/megaide-status.megaide-statusd.init index 6ec878b..3c01f4e 100644 --- a/packaging/debian/megaide-status/megaide-status.megaide-statusd.init +++ b/packaging/debian/megaide-status/megaide-status.megaide-statusd.init @@ -34,7 +34,7 @@ RUN_DAEMON=yes test -x /usr/sbin/megaide-status || exit 0 . /lib/lsb/init-functions -. /etc/default/rcS +[ -e /etc/default/rcS ] && . /etc/default/rcS if [ $RUN_DAEMON = "no" ] ; then log_begin_msg "megaide-statusd is disabled in /etc/default/megaide-statusd, not starting." diff --git a/packaging/debian/megaide-status/rules b/packaging/debian/megaide-status/rules index 4e60a8c..3843b14 100755 --- a/packaging/debian/megaide-status/rules +++ b/packaging/debian/megaide-status/rules @@ -3,7 +3,19 @@ # 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: clean: dh_testdir @@ -30,7 +42,7 @@ binary-indep: build install dh_fixperms -i dh_installdeb -i dh_shlibdeps -i - dh_gencontrol -i + dh_gencontrol -i -- -v"$(PKG_VERSION_TAG)" $(SUBSTVARS_BINARY_VERSION) $(SUBSTVARS_SOURCE_VERSION) dh_md5sums -i dh_builddeb -i