[SCM] marble packaging branch, kubuntu_wily_archive, updated. ubuntu/15.08.0-0ubuntu4-13-g402c405

[Jonathan Riddell]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/marble.git;a=commitdiff;h=402c405

The following commit has been merged in the kubuntu_wily_archive branch:
commit 402c4054cae7006b92d9dc823a676ab4113ae96b
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Tue Sep 22 15:55:55 2015 +0100

    Add upstream_find-quazip.diff to fix finding library
---
 debian/changelog                         |  1 +
 debian/marble.install                    |  3 +++
 debian/patches/series                    |  1 +
 debian/patches/upstream_find-quazip.diff | 15 +++++++++++++++
 4 files changed, 20 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1db7b69..46f09ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ marble (4:15.08.1-0ubuntu1) UNRELEASED; urgency=medium
 
   [ Jonathan Riddell ]
   * Add missing marble-qt.install file
+  * Add upstream_find-quazip.diff to fix finding library
 
   [ Clive Johnston ]
   * New upstream release (15.08.1)
diff --git a/debian/marble.install b/debian/marble.install
index accba08..40563df 100644
--- a/debian/marble.install
+++ b/debian/marble.install
@@ -6,12 +6,15 @@ usr/share/applications/marble.desktop
 usr/share/applications/marble_geo.desktop
 usr/share/applications/marble_gpx.desktop
 usr/share/applications/marble_kml.desktop
+usr/share/applications/marble_kmz.desktop
 usr/share/applications/marble_osm.desktop
 usr/share/applications/marble_shp.desktop
 usr/share/applications/marble_worldwind.desktop
 usr/share/kservices5/marble_part.desktop
 usr/share/kservices5/marble_part_gpx.desktop
 usr/share/kservices5/marble_part_kml.desktop
+usr/share/kservices5/marble_part_kmz.desktop
 usr/share/kservices5/marble_part_osm.desktop
 usr/share/kservices5/marble_part_shp.desktop
+usr/share/kservices5/marble_thumbnail_kmz.desktop
 usr/share/kservices5/plasma-runner-marble.desktop
diff --git a/debian/patches/series b/debian/patches/series
index 201f2fc..f88cbb0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 fix_qmake_fallback.diff
 do_not_install_private_headers
 kubuntu_disable-MarbleRunnerManagerTest.diff
+upstream_find-quazip.diff
diff --git a/debian/patches/upstream_find-quazip.diff b/debian/patches/upstream_find-quazip.diff
new file mode 100644
index 0000000..876e647
--- /dev/null
+++ b/debian/patches/upstream_find-quazip.diff
@@ -0,0 +1,15 @@
+Index: marble-15.08.1/cmake/modules/Findquazip.cmake
+===================================================================
+--- marble-15.08.1.orig/cmake/modules/Findquazip.cmake
++++ marble-15.08.1/cmake/modules/Findquazip.cmake
+@@ -7,8 +7,8 @@ if(QUAZIP_INCLUDE_DIR AND QUAZIP_LIBRARI
+ else(QUAZIP_INCLUDE_DIR AND QUAZIP_LIBRARIES)
+ 
+   if(QT5BUILD)
+-  find_path(QUAZIP_INCLUDE_DIR NAMES quazip.h PATH_SUFFIXES quazip5)
+-  find_library(QUAZIP_LIBRARIES NAMES quazip5)
++  find_path(QUAZIP_INCLUDE_DIR NAMES quazip.h PATH_SUFFIXES quazip5 quazip)
++  find_library(QUAZIP_LIBRARIES NAMES quazip5 quazip-qt5)
+   else(QT5BUILD)
+   find_path(QUAZIP_INCLUDE_DIR NAMES quazip.h PATH_SUFFIXES quazip)
+   find_library(QUAZIP_LIBRARIES NAMES quazip)

-- 
marble packaging