[SCM] marble packaging branch, master, updated. debian/16.08.3-1-154-g84802f6

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit fe9b965e89fec82db95642f901c64f26d8941f2e
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Jul 8 13:09:08 2016 +0100

    add override for a NoDisplay .desktop file
---
 debian/copyright                     | 1 -
 debian/marble-data.lintian-overrides | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/copyright b/debian/copyright
index 2eb0e2f..acadb5a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2751,7 +2751,6 @@ Copyright: 2010, Christian Vetter <veaac.fdirct at gmail.com>
            2007, Free Software Foundation, Inc. <http://fsf.org/>
 License: GPL-3+
 
-<<<<<<< HEAD
 Files: src/lib/marble/MarbleZip.cpp
        src/lib/marble/MarbleZipReader.h
        src/lib/marble/MarbleZipWriter.h
diff --git a/debian/marble-data.lintian-overrides b/debian/marble-data.lintian-overrides
new file mode 100644
index 0000000..38115f0
--- /dev/null
+++ b/debian/marble-data.lintian-overrides
@@ -0,0 +1 @@
+marble-data: desktop-command-not-in-package usr/share/applications/marble_geojson.desktop marble

-- 
marble packaging