[merkaartor] 10/23: Add patch to fix version detection for tarball releases.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository merkaartor.

commit e1f6d4d6bfbaedc0a3478e4980a44265bdcd4dfa
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Sep 18 11:24:53 2015 +0200

    Add patch to fix version detection for tarball releases.
---
 debian/changelog                                   |  1 +
 .../0001-Fixed-version-info-in-tarballs.patch      | 27 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 29 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0a465ac..b904e24 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,6 +18,7 @@ merkaartor (0.18.2-1) UNRELEASED; urgency=medium
   * Update Vcs-Browser URL to use HTTPS.
   * Override dh_install to use --list-missing.
   * Rename old style config sections in gbp.conf.
+  * Add patch to fix version detection for tarball releases.
 
  -- Bas Couwenberg <sebastic at debian.org>  Fri, 18 Sep 2015 01:17:53 +0200
 
diff --git a/debian/patches/0001-Fixed-version-info-in-tarballs.patch b/debian/patches/0001-Fixed-version-info-in-tarballs.patch
new file mode 100644
index 0000000..4adce0b
--- /dev/null
+++ b/debian/patches/0001-Fixed-version-info-in-tarballs.patch
@@ -0,0 +1,27 @@
+From a6f3d9f2133e3656b9c63441c600a7219b54450c Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ladislav=20L=C3=A1ska?= <krakonos at krakonos.org>
+Date: Mon, 27 Jul 2015 11:01:52 +0200
+Subject: Fixed version info in tarballs.
+Origin: https://github.com/openstreetmap/merkaartor/commit/a6f3d9f2133e3656b9c63441c600a7219b54450c
+
+---
+ src/Config.pri | 9 +++++++--
+ 1 file changed, 7 insertions(+), 2 deletions(-)
+
+--- a/src/Config.pri
++++ b/src/Config.pri
+@@ -1,7 +1,12 @@
+ # see http://merkaartor.be/wiki/merkaartor/Compiling
+ 
+-REVISION = $$system(git describe --tags)
+-VERSION = $$system(git describe --tags | sed "'s/-g.*//;s/-/./g'")
++REVISION = $$system(git describe --tags 2> /dev/null)
++VERSION = $$system(git describe --tags 2> /dev/null | sed "'s/-g.*//;s/-/./g'")
++isEmpty( REVISION ) {
++	REVISION = $$system(head -n 1 ../CHANGELOG | sed "'s/^v//'")
++	VERSION = $$REVISION
++}
++
+ ARCH=""
+ BITS=""
+ win32 {
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c0e662b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Fixed-version-info-in-tarballs.patch

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