[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=e79c564

The following commit has been merged in the master branch:
commit e79c56468c84b17109ef18da71af3e1862798417
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Jun 12 16:22:11 2015 +0200

    Prune CC-BY-SA-2.0 licensed files
---
 debian/changelog | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9eeb803..d16243f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,12 @@
-marble (4:15.04.2-1~) UNRELEASED; urgency=medium
+marble (4:15.04.2+dfsg-1~) UNRELEASED; urgency=medium
 
   * New upstream release (15.04.0).
   * New upstream release (15.04.1).
   * New upstream release (15.04.2).
   * Update copyright information.
+  * Prune CC-BY-SA-2.0 licensed files, (not dfsg compatible license).
 
- -- Maximiliano Curia <maxy at debian.org>  Fri, 05 Jun 2015 11:26:42 +0200
+ -- Maximiliano Curia <maxy at debian.org>  Fri, 12 Jun 2015 16:35:36 +0200
 
 marble (4:14.12.3-1) experimental; urgency=medium
 

-- 
marble packaging