[SCM] marble packaging branch, master, updated. ubuntu/15.08.0-0ubuntu4-36-g97d384f

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit d35d8408e6fc1a3b180db74c14bb39df1b84b81e
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Sep 10 17:33:13 2015 +0200

    Re add removed patch
---
 debian/patches/debian-avoid_installing_pruned_files.patch | 8 ++++----
 debian/patches/series                                     | 1 +
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/debian/patches/debian-avoid_installing_pruned_files.patch b/debian/patches/debian-avoid_installing_pruned_files.patch
index 0d8836c..8141ac7 100644
--- a/debian/patches/debian-avoid_installing_pruned_files.patch
+++ b/debian/patches/debian-avoid_installing_pruned_files.patch
@@ -1,8 +1,8 @@
 Index: marble/data/CMakeLists.txt
 ===================================================================
---- marble.orig/data/CMakeLists.txt	2015-06-12 17:16:29.442375420 +0200
-+++ marble/data/CMakeLists.txt	2015-06-12 17:19:21.483536302 +0200
-@@ -101,7 +101,6 @@
+--- marble.orig/data/CMakeLists.txt	2015-09-10 17:33:20.156894226 +0200
++++ marble/data/CMakeLists.txt	2015-09-10 17:33:20.152894386 +0200
+@@ -105,7 +105,6 @@
  DESTINATION ${MARBLE_DATA_INSTALL_PATH}/maps/earth/plain)
  
  install (FILES
@@ -10,7 +10,7 @@ Index: marble/data/CMakeLists.txt
  maps/earth/openstreetmap/openstreetmap-preview.png
  maps/earth/openstreetmap/legend.html
  maps/earth/openstreetmap/tour.kml
-@@ -152,7 +151,6 @@
+@@ -156,7 +155,6 @@
  install (FILES
  maps/earth/temp-july/temp-july.jpg
  maps/earth/temp-july/temp-july-preview.png
diff --git a/debian/patches/series b/debian/patches/series
index b5697b8..d4450f3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ fix_qmake_fallback.diff
 do_not_install_private_headers
 kubuntu_disable-MarbleRunnerManagerTest.diff
 upstream_fix-vtable-linking.diff
+debian-avoid_installing_pruned_files.patch

-- 
marble packaging