[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=639e55b

The following commit has been merged in the master branch:
commit 639e55bc00ba9eb65044e833fbb60d1816e6e9fc
Author: Rohan Garg <rohan at garg.io>
Date:   Wed Mar 1 16:57:05 2017 +0100

    Revert "Add alt Build-Depends on libqextserialport-dev for Debian"
    
    This reverts commit 98a58acfe33e6bf126a2251758dd283ff0c903b0.
---
 debian/control             | 2 +-
 debian/marble-data.install | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 3267824..1c0657b 100644
--- a/debian/control
+++ b/debian/control
@@ -23,7 +23,7 @@ Build-Depends: cmake (>= 2.8.12~),
                libopencv-imgproc-dev,
                libphonon4qt5-dev,
                libprotobuf-dev,
-               libqextserialport-dev | libqt5extserialport-dev,
+               libqt5extserialport-dev,
                libqt5opengl5-dev,
                libqt5serialport5-dev,
                libqt5svg5-dev (>= 5.4),
diff --git a/debian/marble-data.install b/debian/marble-data.install
index b04ba69..3844b70 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.desktop
 usr/share/plasma/plasmoids/org.kde.plasma.worldclock/metadata.json
+usr/share/plasma/plasmoids/org.kde.plasma.worldclock/metadata.desktop
 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.desktop
 usr/share/plasma/wallpapers/org.kde.plasma.wallpaper.worldmap/metadata.json
+usr/share/plasma/wallpapers/org.kde.plasma.wallpaper.worldmap/metadata.desktop

-- 
marble packaging