[qmapshack] 01/01: Require at least libroutino-dev 3.1 for Routino_Version symbol.

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository qmapshack.

commit c9f7e1b39b3b63c063f54b27536ffea77cf7fc42
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Mar 6 14:50:02 2016 +0100

    Require at least libroutino-dev 3.1 for Routino_Version symbol.
    
    Drop routino-version.patch, not required for Routino 3.1.
---
 debian/changelog                     |  7 +++++++
 debian/control                       |  2 +-
 debian/patches/routino-version.patch | 21 ---------------------
 debian/patches/series                |  1 -
 4 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7888630..01b195f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qmapshack (1.6.0-2) UNRELEASED; urgency=medium
+
+  * Require at least libroutino-dev 3.1 for Routino_Version symbol.
+  * Drop routino-version.patch, not required for Routino 3.1.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 06 Mar 2016 14:49:54 +0100
+
 qmapshack (1.6.0-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/control b/debian/control
index 5eddf38..296f09c 100644
--- a/debian/control
+++ b/debian/control
@@ -9,7 +9,7 @@ Build-Depends: cmake,
                inkscape,
                libgdal-dev (>= 1.10.1-0~),
                libproj-dev,
-               libroutino-dev,
+               libroutino-dev (>= 3.1),
                libqt5opengl5-dev,
                libqt5webkit5-dev,
                qtbase5-dev,
diff --git a/debian/patches/routino-version.patch b/debian/patches/routino-version.patch
deleted file mode 100644
index 8c26352..0000000
--- a/debian/patches/routino-version.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Don't display Routino version.
- Routino_Version not yet available in Routino 3.0.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: not-needed
-
---- a/src/CAbout.cpp
-+++ b/src/CAbout.cpp
-@@ -35,11 +35,11 @@ CAbout::CAbout(QWidget *parent)
-     labelProj4Version->setText(QString::number(PJ_VERSION));
-     if(Routino_CheckAPIVersion() != ROUTINO_ERROR_NONE)
-     {
--        labelRoutinoVersion->setText(tr("%1 (API V%2, expected V%3)").arg(Routino_Version).arg(ROUTINO_API_VERSION).arg(Routino_APIVersion));
-+        labelRoutinoVersion->setText(tr("(API V%1, expected V%2)").arg(ROUTINO_API_VERSION).arg(Routino_APIVersion));
-     }
-     else
-     {
--        labelRoutinoVersion->setText(tr("%1 (API V%2)").arg(Routino_Version).arg(Routino_APIVersion));
-+        labelRoutinoVersion->setText(tr("(API V%1)").arg(Routino_APIVersion));
-     }
- }
- 
diff --git a/debian/patches/series b/debian/patches/series
index b8df511..7cc6c18 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-routino-version.patch
 original-typo.patch

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