[SCM] marble packaging branch, kubuntu_stable, updated. ubuntu/15.08.0-0ubuntu4-14-gef28b11

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_stable branch:
commit ef28b114553cda8f4dedd95e880a1d25f6b9f056
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Tue Sep 22 15:56:19 2015 +0100

    merge
---
 debian/patches/series                    |  1 -
 debian/patches/upstream_find-quazip.diff | 15 ---------------
 2 files changed, 16 deletions(-)

diff --git a/debian/patches/series b/debian/patches/series
index f88cbb0..201f2fc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
 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
deleted file mode 100644
index 876e647..0000000
--- a/debian/patches/upstream_find-quazip.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-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