[merkaartor] 06/07: Refresh patches.

[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 1051baa3da55986f16344068b16207bd79650a24
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Sep 6 16:51:01 2016 +0200

    Refresh patches.
---
 debian/changelog                    | 1 +
 debian/patches/no-git-version.patch | 7 ++-----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b298294..2856123 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ merkaartor (0.18.3+ds-1) UNRELEASED; urgency=medium
 
   * New upstream release (from modified release tag).
   * Fix filenamemangle in watch file.
+  * Refresh patches.
 
  -- Bas Couwenberg <sebastic at debian.org>  Tue, 06 Sep 2016 15:48:33 +0200
 
diff --git a/debian/patches/no-git-version.patch b/debian/patches/no-git-version.patch
index 6156169..2caec09 100644
--- a/debian/patches/no-git-version.patch
+++ b/debian/patches/no-git-version.patch
@@ -4,7 +4,7 @@ Forwarded: not-needed
 
 --- a/src/Config.pri
 +++ b/src/Config.pri
-@@ -1,9 +1,9 @@
+@@ -1,7 +1,7 @@
  # see http://merkaartor.be/wiki/merkaartor/Compiling
  
 -REVISION = $$system( git describe --tags )
@@ -12,8 +12,5 @@ Forwarded: not-needed
 +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//'")
+ 	REVISION = $$system(head -n 3 ../CHANGELOG | tail -n 1 | sed "'s/^v//'")
  	VERSION = $$REVISION
- }
- 

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