[SCM] marble packaging branch, master, updated. debian/15.08.1+dfsg-2-5-g2d88e17

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 2d88e173c2b86462b3327a6dbc098f2a31617a6a
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Oct 12 17:46:25 2015 +0200

    Remove the excluded files rule. (Closes: #799382) Thanks to Torsten Rahn
---
 debian/changelog                                     |  3 +++
 debian/copyright                                     |  2 --
 .../debian-avoid_installing_pruned_files.patch       | 20 --------------------
 3 files changed, 3 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7aab613..639ea74 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ marble (4:15.08.2-1~) UNRELEASED; urgency=medium
 
   * New upstream release (15.08.2).
   * New upstream patch: upstream_clarify_license_of_the_dgml_files.diff
+  * Drop patch: debian-avoid_installing_pruned_files.patch
+  * Remove the excluded files rule. (Closes: #799382) Thanks to Torsten
+    Rahn
 
  -- Maximiliano Curia <maxy at debian.org>  Mon, 12 Oct 2015 17:31:36 +0200
 
diff --git a/debian/copyright b/debian/copyright
index ef4e6a0..e1b8f6d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,8 +4,6 @@ Source: git://anongit.kde.org/marble.git
 Comment: This package was developed for Ubuntu by the Kubuntu Developers and
  modified to be included in Debian. See below the copyright holders for debian/*
  files.
-Files-Excluded: data/maps/earth/openstreetmap/openstreetmap.dgml
-                data/maps/earth/vectorosm/vectorosm.dgml
 
 Files: *
 Copyright: 2012, Ander Pijoan <ander.pijoan at deusto.es>
diff --git a/debian/patches/debian-avoid_installing_pruned_files.patch b/debian/patches/debian-avoid_installing_pruned_files.patch
deleted file mode 100644
index 8141ac7..0000000
--- a/debian/patches/debian-avoid_installing_pruned_files.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: marble/data/CMakeLists.txt
-===================================================================
---- 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
--maps/earth/openstreetmap/openstreetmap.dgml
- maps/earth/openstreetmap/openstreetmap-preview.png
- maps/earth/openstreetmap/legend.html
- maps/earth/openstreetmap/tour.kml
-@@ -156,7 +155,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

-- 
marble packaging