[qmapshack] 02/02: Rebuild for jessie-backports.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Sun Nov 22 13:24:53 UTC 2015


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

sebastic pushed a commit to branch jessie-backports
in repository qmapshack.

commit 98ba8c583be6973d54d6c6a7a52fb82c15678380
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Nov 22 14:02:32 2015 +0100

    Rebuild for jessie-backports.
    
    Drop qt53-qFormatLogMessage.patch, included upstream.
---
 debian/changelog                            |  7 +++++++
 debian/patches/qt53-qFormatLogMessage.patch | 18 ------------------
 debian/patches/series                       |  1 -
 3 files changed, 7 insertions(+), 19 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a933f41..ac5e083 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qmapshack (1.4.0-1~bpo8+1) jessie-backports; urgency=medium
+
+  * Rebuild for jessie-backports.
+  * Drop qt53-qFormatLogMessage.patch, included upstream.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 22 Nov 2015 14:01:25 +0100
+
 qmapshack (1.4.0-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/qt53-qFormatLogMessage.patch b/debian/patches/qt53-qFormatLogMessage.patch
deleted file mode 100644
index a56fee1..0000000
--- a/debian/patches/qt53-qFormatLogMessage.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Fix code for outdated Qt libs
-Author: Oliver Eichler <oliver.eichler at gmx.de>
-Origin: https://bitbucket.org/maproom/qmapshack/commits/68afe765a818fa5ece75955cfe646784dcfd8383
-
---- a/src/helpers/CAppSetup.cpp
-+++ b/src/helpers/CAppSetup.cpp
-@@ -112,7 +112,11 @@ void CAppSetup::printToConsole(QtMsgType
- 
- void CAppSetup::consoleMessageHandler(QtMsgType type, const QMessageLogContext &context, const QString &msg)
- {
-+#if QT_VERSION >= 0x050400
-     QString txt = qFormatLogMessage(type, context, msg);
-+#else
-+    QString txt = msg;
-+#endif
-     CAppSetup::getPlattformInstance()->printToConsole(type, txt);
-     CAppSetup::getPlattformInstance()->appendToFile(type, txt);
- }
diff --git a/debian/patches/series b/debian/patches/series
index 128e4e2..b3e1c5f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-qt53-qFormatLogMessage.patch
 routino-version.patch

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



More information about the Pkg-grass-devel mailing list