[Debian-ha-commits] [fence-agents] 08/09: Fix version reported by agents

[Valentin Vidic]

This is an automated email from the git hooks/post-receive script.

vvidic-guest pushed a commit to branch master
in repository fence-agents.

commit df7d091a73111c319fe249424fde2967b4a0dbdf
Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
Date:   Sun Feb 18 15:21:24 2018 +0100

    Fix version reported by agents
---
 debian/clean           |  1 +
 debian/patches/series  |  1 +
 debian/patches/version | 16 ++++++++++++++++
 debian/rules           |  3 +++
 4 files changed, 21 insertions(+)

diff --git a/debian/clean b/debian/clean
index 59d276d..d83890e 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1 +1,2 @@
+.tarball-version
 .version
diff --git a/debian/patches/series b/debian/patches/series
index 5385cd3..34e089a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 remove-fence_amt_ws
 disable-network-access
 spelling
+version
diff --git a/debian/patches/version b/debian/patches/version
new file mode 100644
index 0000000..16c72bc
--- /dev/null
+++ b/debian/patches/version
@@ -0,0 +1,16 @@
+Description: Remove trailing @ from version reported by agents
+Author: Valentin Vidic <Valentin.Vidic at CARNet.hr>
+Last-Update: 2018-02-18
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/make/fencebuild.mk
++++ b/make/fencebuild.mk
+@@ -3,7 +3,7 @@
+ 	cat $(abs_srcdir)/$@.py | \
+ 	sed \
+ 		-e 's#@''PYTHON@#${PYTHON}#g' \
+-		-e 's#@''RELEASE_VERSION#${VERSION}#g' \
++		-e 's#@''RELEASE_VERSION@#${VERSION}#g' \
+ 		-e 's#@''FENCEAGENTSLIBDIR@#${FENCEAGENTSLIBDIR}#g' \
+ 		-e 's#@''LOGDIR@#${LOGDIR}#g' \
+ 		-e 's#@''SBINDIR@#${sbindir}#g' \
diff --git a/debian/rules b/debian/rules
index 4180d82..ce910c6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,6 +3,7 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
+include /usr/share/dpkg/pkg-info.mk
 
 get-orig-source:
 	uscan --noconf --force-download --rename --repack --download-current-version --destdir=.
@@ -11,6 +12,8 @@ get-orig-source:
 	dh $@ --with python3
 
 override_dh_autoreconf:
+	# fix version reported by agents
+	echo $(DEB_VERSION_UPSTREAM) > .tarball-version
 	dh_autoreconf ./autogen.sh
 
 override_dh_auto_configure:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-ha/fence-agents.git