[metview] 05/14: Set version in debian/CONFIG.site.in via ./rules

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository metview.

commit 4a3b8a84e4492cea1a6ac4e4d86a140ce5187b4a
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Oct 4 14:06:41 2017 +0100

    Set version in debian/CONFIG.site.in via ./rules
---
 debian/CONFIG.site.in | 4 ++--
 debian/changelog      | 1 +
 debian/rules          | 4 +++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/debian/CONFIG.site.in b/debian/CONFIG.site.in
index e0e7c69..11a64dc 100644
--- a/debian/CONFIG.site.in
+++ b/debian/CONFIG.site.in
@@ -30,8 +30,8 @@ MV_ODB1_VERSION=
 
 ##MV_ODB1_BIN=/usr/local/apps/odb/CY37R3.001/pgf90/LP64/bin
 ##MV_ODB1_USE_SCRIPT=/usr/local/share/ecmwf/use/sh.odb
-METVIEW_RELEASE=4.9.0
-METVIEW_VERSION_TITLE="Metview 4.9.0  (Debian)"
+METVIEW_RELEASE=@UPSTREAM_VERSION@
+METVIEW_VERSION_TITLE="Metview @UPSTREAM_VERSION@  (Debian)"
 LD_LIBRARY_PATH=":${LD_LIBRARY_PATH}"
 METVIEW_GUI_BUILT=true
 
diff --git a/debian/changelog b/debian/changelog
index 4b684ed..ce0e8cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ metview (4.9.0-1) UNRELEASED; urgency=medium
 
   * New upstream release
   * Standards-Version: 4.1.1
+  * Set version in debian/CONFIG.site.in via ./rules
 
  -- Alastair McKinstry <mckinstry at debian.org>  Wed, 04 Oct 2017 11:41:56 +0100
 
diff --git a/debian/rules b/debian/rules
index 4e9769c..1af9c1b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,7 @@ DEB_CFLAGS_MAINT_APPEND:= -Wall -pedantic -fPIC
 export DEB_BUILD_MAINT_OPTIONS DEB_CFLAGS_MAINT_APPEND DEB_LDFLAGS_MAINT_PREPEND
 export QT_SELECT=5
 CXXFLAGS:= $(shell dpkg-buildflags --get CXXFLAGS) -std=c++11
+UPSTREAM_VERSION=$(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' | sed -e 's/\+.*//; s/^[0-9]://')
 
 # Needed for sbuild. metview creates temp directories during build
 export HOME:=/tmp
@@ -72,7 +73,8 @@ override_dh_auto_configure:
 	for f in ${AUTOGENERATED} ; do \
                 sed -e 's%@ARCH@%${DEB_HOST_MULTIARCH}%g' < debian/$$f.in  > debian/$$f ; \
                 done
-	sed -e 's%@ARCH@%${DEB_HOST_MULTIARCH}%g'  < debian/CONFIG.site.in \
+	sed -e 's%@ARCH@%${DEB_HOST_MULTIARCH}%g'  < debian/CONFIG.site.in  | \
+		sed -e 's%@UPSTREAM_VERSION@%${UPSTREAM_VERSION}%g' |
 		> $(METVIEW_DIR_DEV)/scripts/CONFIG.site 
 	# These get generated ok on a machine with network connection, but fail on sbuilds, etc.
 	# so copy pre-generated versions stored in etc

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/metview.git