[SCM] marble packaging branch, kubuntu_wily_archive, updated. debian/4.14.2-1-29-gac5b088

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit ac5b08840ebb8e96df814f2d53712944d66564cf
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Wed Aug 12 23:21:16 2015 +0100

     New upstream release
    
    * New upstream release
    * Port to frameworks 5
---
 debian/changelog      |  9 +++++++--
 debian/control        | 18 +++++++++---------
 debian/patches/series |  6 +++---
 debian/rules          |  4 ++--
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fcba3b3..0d07a6d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,14 @@
-marble (4:15.04.2-0ubuntu3) UNRELEASED; urgency=medium
+marble (4:15.07.90-0ubuntu1) UNRELEASED; urgency=medium
 
+  [ José Manuel Santamaría Lema ]
   * Update symbols: mark as optional symbols gone after building with
     GCC 5
 
- -- José Manuel Santamaría Lema <panfaust at gmail.com>  Sat, 25 Jul 2015 11:37:52 +0200
+  [ Jonathan Riddell ]
+  * New upstream release
+  * Port to frameworks 5
+
+ -- Jonathan Riddell <jriddell at ubuntu.com>  Wed, 12 Aug 2015 12:59:17 +0100
 
 marble (4:15.04.2-0ubuntu2) wily; urgency=medium
 
diff --git a/debian/control b/debian/control
index b281944..5ec4c11 100644
--- a/debian/control
+++ b/debian/control
@@ -5,21 +5,21 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Sune Vuorela <sune at debian.org>, Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake,
                debhelper (>= 9),
-               kde-sc-dev-latest (>= 4:4.12),
-               kdelibs5-dev,
-               libgps-dev (>= 2.90),
-               libphonon-dev,
-               libqextserialport-dev,
-               libqtwebkit-dev,
-               libquazip-dev,
+               libgps-dev,
+               libkf5runner-dev,
+               libphonon4qt5-dev,
+               libqt5svg5-dev,
+               libquazip-qt5-dev,
                libshp-dev,
                libwlocate-dev,
                libx11-dev,
                pkg-config,
                pkg-kde-tools (>= 0.12),
-               qtmobility-dev [linux-any],
+               qtbase5-dev,
+               qtdeclarative5-dev,
+               qttools5-dev,
                shared-mime-info
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 XS-Testsuite: autopkgtest
 Homepage: http://edu.kde.org/
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-applications/marble.git/
diff --git a/debian/patches/series b/debian/patches/series
index 201f2fc..8aa31ed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,3 @@
-fix_qmake_fallback.diff
-do_not_install_private_headers
-kubuntu_disable-MarbleRunnerManagerTest.diff
+#fix_qmake_fallback.diff
+#do_not_install_private_headers
+#kubuntu_disable-MarbleRunnerManagerTest.diff
diff --git a/debian/rules b/debian/rules
index c888ba8..5dd25be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,8 @@
 #!/usr/bin/make -f
 
-include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
-include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/3/library-packages.mk
 
 marble_soversion := $(shell dh_listpackages | sed -n '/^libmarblewidget/{s/^libmarblewidget//p}')
 marble_plugin_path = /usr/lib/kde4/plugins/marble/$(marble_soversion)

-- 
marble packaging