[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=4b78339

The following commit has been merged in the master branch:
commit 4b783398bdae26ed811df53be8c9d52d755d28ca
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Tue Jul 26 17:52:25 2016 +0100

    revert appstream and .desktop file which differ with this frameworks
---
 debian/marble-data.install | 1 -
 debian/marble.install      | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/debian/marble-data.install b/debian/marble-data.install
index 39feb03..e4c318c 100644
--- a/debian/marble-data.install
+++ b/debian/marble-data.install
@@ -1,4 +1,3 @@
-usr/share/appdata/org.kde.marble.appdata.xml
 usr/share/applications/marble_geojson.desktop
 usr/share/config.kcfg/marble.kcfg
 usr/share/doc/HTML/en/marble/
diff --git a/debian/marble.install b/debian/marble.install
index d16b1e5..32cd820 100644
--- a/debian/marble.install
+++ b/debian/marble.install
@@ -2,6 +2,7 @@ usr/bin/marble
 usr/lib/*/qt5/plugins/libmarble_part.so
 usr/lib/*/qt5/plugins/libmarblethumbnail.so
 usr/lib/*/qt5/plugins/plasma_runner_marble.so
+usr/share/applications/marble.desktop
 usr/share/applications/marble_geo.desktop
 usr/share/applications/marble_gpx.desktop
 usr/share/applications/marble_kml.desktop
@@ -9,7 +10,6 @@ usr/share/applications/marble_kmz.desktop
 usr/share/applications/marble_osm.desktop
 usr/share/applications/marble_shp.desktop
 usr/share/applications/marble_worldwind.desktop
-usr/share/applications/org.kde.marble.desktop
 usr/share/kservices5/marble_part.desktop
 usr/share/kservices5/marble_thumbnail_kmz.desktop
 usr/share/kservices5/plasma-runner-marble.desktop

-- 
marble packaging