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

[Bas Couwenberg]

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

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

commit 467c4739d447d8eed1fde065544a81fb583f8ce0
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jul 24 18:13:23 2016 +0200

    Rebuild for jessie-backports.
    
    Drop patch to fix upstream issue #149, included upstream.
---
 debian/changelog                                   |  7 ++++
 ...ath-for-systems-without-QMS-configuration.patch | 43 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 7 insertions(+), 44 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a2f08a5..5fccb9d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+qmapshack (1.6.3-1~bpo8+1) jessie-backports; urgency=medium
+
+  * Rebuild for jessie-backports.
+  * Drop patch to fix upstream issue #149, included upstream.
+
+ -- Bas Couwenberg <sebastic at debian.org>  Sun, 24 Jul 2016 18:11:50 +0200
+
 qmapshack (1.6.3-1) unstable; urgency=medium
 
   * New upstream release.
diff --git a/debian/patches/properly-initialize-cachePath-for-systems-without-QMS-configuration.patch b/debian/patches/properly-initialize-cachePath-for-systems-without-QMS-configuration.patch
deleted file mode 100644
index d404cc6..0000000
--- a/debian/patches/properly-initialize-cachePath-for-systems-without-QMS-configuration.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-Description: Properly initialize cachePath for systems without QMS configuration (new installations)
- This fixes Issue #149: An empty (not default-initialized) cachePath causes
- deletion of files in cwd; cachePath should never be empty at all...
- .
- Implemented additional catching of empty cacheRoot in cleanupRemovedMaps,
- even though this should never be triggered
-Author: Christian Eichler <code at christian-eichler.de>
-Origin: https://bitbucket.org/maproom/qmapshack/pull-requests/107/issue-149-properly-initialize-cachepath/diff
-Bug: https://bitbucket.org/maproom/qmapshack/issues/149/warning-this-application-removed-several
-
---- a/src/map/CMapDraw.cpp
-+++ b/src/map/CMapDraw.cpp
-@@ -119,8 +119,13 @@ void CMapDraw::saveMapPath(QSettings& cf
- 
- void CMapDraw::loadMapPath(QSettings& cfg)
- {
--    mapPaths    = cfg.value("mapPath", mapPaths).toStringList();
--    cachePath   = cfg.value("cachePath", cachePath).toString();
-+    mapPaths  = cfg.value("mapPath", mapPaths).toStringList();
-+    cachePath = cfg.value("cachePath", cachePath).toString();
-+
-+    if(cachePath.isEmpty())
-+    {
-+        cachePath = IAppSetup::getPlatformInstance()->defaultCachePath();
-+    }
- }
- 
- 
---- a/src/map/cache/CDiskCache.cpp
-+++ b/src/map/cache/CDiskCache.cpp
-@@ -156,6 +156,12 @@ void CDiskCache::slotCleanup()
- void CDiskCache::cleanupRemovedMaps(const QSet<QString> &maps)
- {
-     QString cacheRoot = CMapDraw::getCacheRoot();
-+
-+    if(cacheRoot.isEmpty()) {
-+        qWarning() << "cacheRoot is empty, that should not happen at all";
-+        return;
-+    }
-+
-     const QStringList &dirs = QDir(cacheRoot).entryList(QStringList("*"), QDir::Dirs | QDir::NoDotAndDotDot);
- 
-     for(const QString &dir : dirs)
diff --git a/debian/patches/series b/debian/patches/series
index b6457b2..7cc6c18 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 original-typo.patch
-properly-initialize-cachePath-for-systems-without-QMS-configuration.patch

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