[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=388a5cf

The following commit has been merged in the master branch:
commit 388a5cf3b88d036604cb398b7930ce5a62091505
Author: Harald Sitter <sitter at kde.org>
Date:   Thu Aug 17 12:12:21 2017 +0200

    appdata must be next to desktop file must be next to bin
---
 debian/control             | 2 ++
 debian/marble-data.install | 1 -
 debian/marble.install      | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/debian/control b/debian/control
index ad69e44..dddb992 100644
--- a/debian/control
+++ b/debian/control
@@ -57,6 +57,8 @@ Depends: marble-data (>= ${source:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Suggests: gosmore, monav-routing-daemon, routino
+Replaces: marble-data (<< ${source:Version}~ciBuild)
+Breaks: marble-data (<< ${source:Version}~ciBuild)
 Description: globe and map widget
  Marble is a generic geographical map widget and framework for KDE
  applications. The Marble widget shows the earth as a sphere but does not
diff --git a/debian/marble-data.install b/debian/marble-data.install
index 5718c34..cfe556e 100644
--- a/debian/marble-data.install
+++ b/debian/marble-data.install
@@ -1,4 +1,3 @@
-usr/share/*/org.kde.marble.appdata.xml
 usr/share/applications/marble_geojson.desktop
 usr/share/config.kcfg/marble.kcfg
 usr/share/doc/HTML/*/marble/
diff --git a/debian/marble.install b/debian/marble.install
index 78e49a6..06a9ef2 100644
--- a/debian/marble.install
+++ b/debian/marble.install
@@ -5,6 +5,7 @@ usr/lib/*/qt5/plugins/libmarblethumbnail.so
 usr/lib/*/qt5/plugins/plasma_runner_marble.so
 usr/lib/*/qt5/qml/org/kde/marble/private/plasma/libmarblequick.so
 usr/lib/*/qt5/qml/org/kde/marble/private/plasma/qmldir
+usr/share/*/org.kde.marble.appdata.xml
 usr/share/applications/marble_geo.desktop
 usr/share/applications/marble_gpx.desktop
 usr/share/applications/marble_kml.desktop

-- 
marble packaging