From 8919d6735810b862fdf27b2145a889b20ffaa346 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Thu, 2 Jul 2015 11:33:44 +0200
Subject: [PATCH 1/2] use planetsplitter from routino package

---
 src/tool/CRoutinoDatabaseBuilder.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/tool/CRoutinoDatabaseBuilder.cpp b/src/tool/CRoutinoDatabaseBuilder.cpp
index 8ba2f55..f5c10d1 100644
--- a/src/tool/CRoutinoDatabaseBuilder.cpp
+++ b/src/tool/CRoutinoDatabaseBuilder.cpp
@@ -155,8 +155,8 @@ void CRoutinoDatabaseBuilder::finished(int exitCode, QProcess::ExitStatus status
         args << QString("--tagging=%1").arg(instance->routinoPath("tagging.xml"));
         args << "--process-only";
 
-        stdOut("planetsplitter " +  args.join(" ") + "\n");
-        cmd.start("planetsplitter", args);
+        stdOut("routino-planetsplitter " +  args.join(" ") + "\n");
+        cmd.start("routino-planetsplitter", args);
 
         last = true;
     }
@@ -181,7 +181,7 @@ void CRoutinoDatabaseBuilder::finished(int exitCode, QProcess::ExitStatus status
         sourceFiles.pop_front();
 
 
-        stdOut("planetsplitter " +  args.join(" ") + "\n");
-        cmd.start("planetsplitter", args);
+        stdOut("routino-planetsplitter " +  args.join(" ") + "\n");
+        cmd.start("routino-planetsplitter", args);
     }
 }
-- 
2.4.3


From f99d70e18513810415e120e3eedf50ef596b4d45 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dan=20Hor=C3=A1k?= <dan@danny.cz>
Date: Fri, 13 Nov 2015 00:14:08 +0100
Subject: [PATCH 2/2] Revert "Show routino version string"

This reverts commit 084ecc6e66836e236dcdc61a188a63fe3ca5a5f3.
---
 src/CAbout.cpp | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/CAbout.cpp b/src/CAbout.cpp
index 7f8b80a..a028bd4 100644
--- a/src/CAbout.cpp
+++ b/src/CAbout.cpp
@@ -33,14 +33,7 @@ CAbout::CAbout(QWidget *parent)
     labelQtVersion->setText(qVersion());
     labelGDALVersion->setText(GDALVersionInfo("--version"));
     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));
-    }
-    else
-    {
-        labelRoutinoVersion->setText(tr("%1 (API V%2)").arg(Routino_Version).arg(Routino_APIVersion));
-    }
+    labelRoutinoVersion->setText(tr("API Version %1 (expected %2)").arg(ROUTINO_API_VERSION).arg(Routino_APIVersion));
 }
 
 CAbout::~CAbout()
-- 
2.4.3