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

Maximiliano Curia maxy at moszumanska.debian.org
Tue Nov 21 15:12:04 UTC 2017


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

The following commit has been merged in the master branch:
commit c59a385769989ae9307e3da8e5cf1c890a79d19e
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Mar 22 10:57:58 2017 +0000

    qml depends
---
 debian/control             | 6 +++++-
 debian/marble-data.install | 4 ++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 10c1d7c..19d8427 100644
--- a/debian/control
+++ b/debian/control
@@ -100,7 +100,11 @@ Description: globe and map widget (no KDE dependencies)
 Package: marble-data
 Architecture: all
 Section: misc
-Depends: ${misc:Depends}
+Depends: plasma-framework,
+         qml-module-qtquick-controls,
+         qml-module-qtquick-layouts,
+         qml-module-qtquick2,
+         ${misc:Depends}
 Breaks: marble (<= 4:15.08.0+dfsg-1)
 Replaces: marble (<= 4:15.08.0+dfsg-1)
 Description: data files for Marble
diff --git a/debian/marble-data.install b/debian/marble-data.install
index 3844b70..b04ba69 100644
--- a/debian/marble-data.install
+++ b/debian/marble-data.install
@@ -32,10 +32,10 @@ usr/share/plasma/plasmoids/org.kde.plasma.worldclock/contents/config/main.xml
 usr/share/plasma/plasmoids/org.kde.plasma.worldclock/contents/ui/configMapDisplay.qml
 usr/share/plasma/plasmoids/org.kde.plasma.worldclock/contents/ui/configTimeZones.qml
 usr/share/plasma/plasmoids/org.kde.plasma.worldclock/contents/ui/main.qml
-usr/share/plasma/plasmoids/org.kde.plasma.worldclock/metadata.json
 usr/share/plasma/plasmoids/org.kde.plasma.worldclock/metadata.desktop
+usr/share/plasma/plasmoids/org.kde.plasma.worldclock/metadata.json
 usr/share/plasma/wallpapers/org.kde.plasma.wallpaper.worldmap/contents/config/main.xml
 usr/share/plasma/wallpapers/org.kde.plasma.wallpaper.worldmap/contents/ui/config.qml
 usr/share/plasma/wallpapers/org.kde.plasma.wallpaper.worldmap/contents/ui/main.qml
-usr/share/plasma/wallpapers/org.kde.plasma.wallpaper.worldmap/metadata.json
 usr/share/plasma/wallpapers/org.kde.plasma.wallpaper.worldmap/metadata.desktop
+usr/share/plasma/wallpapers/org.kde.plasma.wallpaper.worldmap/metadata.json

-- 
marble packaging



More information about the pkg-kde-commits mailing list