[merkaartor] 05/06: Add patch to extract version from CHANGELOG, not git.

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository merkaartor.

commit 7dbc5e463e9da873ffd69068aa06c419c169c002
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Aug 23 23:17:32 2016 +0200

    Add patch to extract version from CHANGELOG, not git.
---
 debian/changelog                    |  1 +
 debian/patches/no-git-version.patch | 19 +++++++++++++++++++
 debian/patches/series               |  1 +
 3 files changed, 21 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2591cb7..3399281 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ merkaartor (0.18.3-1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Drop patches applied upstream. Refresh remaining patch.
+  * Add patch to extract version from CHANGELOG, not git.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 23 Aug 2016 21:57:47 +0200
 
diff --git a/debian/patches/no-git-version.patch b/debian/patches/no-git-version.patch
new file mode 100644
index 0000000..6156169
--- /dev/null
+++ b/debian/patches/no-git-version.patch
@@ -0,0 +1,19 @@
+Description: Extract version from CHANGELOG, not git.
+Author: Bas Couwenberg <sebastic at debian.org>
+Forwarded: not-needed
+
+--- a/src/Config.pri
++++ b/src/Config.pri
+@@ -1,9 +1,9 @@
+ # see http://merkaartor.be/wiki/merkaartor/Compiling
+ 
+-REVISION = $$system( git describe --tags )
+-VERSION = $$system( git describe --tags HEAD | sed "'s/-g.*//;s/-/./g'" )
++REVISION = ""
++VERSION = ""
+ isEmpty( REVISION ) {
+-	REVISION = $$system(head -n 1 ../CHANGELOG | sed "'s/^v//'")
++	REVISION = $$system(head -n 3 ../CHANGELOG | tail -n 1 | sed "'s/^v//'")
+ 	VERSION = $$REVISION
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 2016e86..618e4c2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 qmake-config-nostrip.patch
+no-git-version.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/merkaartor.git