[SCM] marble packaging branch, master, updated. debian/4.14.2-1-39-g7f40cfd

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit e42742fa0427e1f69ba7ddbcff86de641a43764b
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Jun 12 17:20:25 2015 +0200

    New patch: debian-avoid_installing_pruned_files.patch
---
 debian/changelog                                     |  1 +
 .../debian-avoid_installing_pruned_files.patch       | 20 ++++++++++++++++++++
 debian/patches/series                                |  1 +
 3 files changed, 22 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 0ffce75..53dfb84 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ marble (4:15.04.2+dfsg-1~) UNRELEASED; urgency=medium
   * Update copyright information.
   * Prune CC-BY-SA-2.0 licensed files, (not dfsg compatible license).
   * Refresh patches
+  * New patch: debian-avoid_installing_pruned_files.patch
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 12 Jun 2015 16:35:36 +0200
 
diff --git a/debian/patches/debian-avoid_installing_pruned_files.patch b/debian/patches/debian-avoid_installing_pruned_files.patch
new file mode 100644
index 0000000..0d8836c
--- /dev/null
+++ b/debian/patches/debian-avoid_installing_pruned_files.patch
@@ -0,0 +1,20 @@
+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 @@
+ DESTINATION ${MARBLE_DATA_INSTALL_PATH}/maps/earth/plain)
+ 
+ install (FILES
+-maps/earth/openstreetmap/openstreetmap.dgml
+ maps/earth/openstreetmap/openstreetmap-preview.png
+ maps/earth/openstreetmap/legend.html
+ maps/earth/openstreetmap/tour.kml
+@@ -152,7 +151,6 @@
+ install (FILES
+ maps/earth/temp-july/temp-july.jpg
+ maps/earth/temp-july/temp-july-preview.png
+-maps/earth/temp-july/temp-july.dgml
+ DESTINATION ${MARBLE_DATA_INSTALL_PATH}/maps/earth/temp-july)
+ 
+ install (FILES
diff --git a/debian/patches/series b/debian/patches/series
index 4dd8fd0..4901661 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 fix_qmake_fallback.diff
 do_not_install_private_headers
 disable-MarbleRunnerManagerTest.diff
+debian-avoid_installing_pruned_files.patch

-- 
marble packaging