[SCM] qtlocation packaging branch, ubuntu, updated. debian/5.5.1-1-20-g2798942

[Timo Jyrinki]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtlocation.git;a=commitdiff;h=2798942

The following commit has been merged in the ubuntu branch:
commit 2798942c2aad619b84cc72ef23fb7b0bb283433f
Merge: 9da3b200e1a9d5c3a8f5e30402ded549e3580110 8555a7f00d8a2670da571e1aae260b45436187c2
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Oct 19 11:28:32 2015 +0000

    Merge branch 'experimental' into ubuntu

 debian/changelog |  9 ++++++++-
 debian/control   | 15 +++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diff --cc debian/changelog
index 08b0f7c,517811d..c2c2bfe
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,10 +1,25 @@@
- qtlocation-opensource-src (5.5.1-0ubuntu1) UNRELEASED; urgency=medium
++qtlocation-opensource-src (5.5.1-1ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +  * Update .install files.
 +  * Update symbols from build logs.
 +  * Rebase debian/patches/appSpecificTileCache.diff.
 +  * Skip qmlinterface tests since they fail to use the module.
 +  * Build depend on libqt5xcbqpa5 to be able to run tests under xvfb.
 +  * Bump build deps.
 +  * Replace appSpecificTileCache.diff with two upstream patches:
 +    - Check-if-GenericCacheLocation-is-writable-before-tru.patch
 +    - Isolate-the-default-cache-directory.patch
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Fri, 27 Mar 2015 07:03:26 +0000
 +
+ qtlocation-opensource-src (5.5.1-1) experimental; urgency=medium
+ 
+   * New upstream release.
+   * Bump Qt build-dependencies to 5.5.1.
+ 
+  -- Timo Jyrinki <timo at debian.org>  Mon, 19 Oct 2015 11:22:42 +0000
+ 
  qtlocation-opensource-src (5.5.0-1) experimental; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index bc51fa7,0c00f88..b3c3c56
--- a/debian/control
+++ b/debian/control
@@@ -14,17 -13,13 +14,16 @@@ Build-Depends: dbus
                 geoclue-nominatim,
                 libgconf2-dev,
                 libgeoclue-dev,
-                libqt5opengl5-dev (>= 5.5.0+dfsg~),
-                libqt5xcbqpa5,
+                libqt5opengl5-dev (>= 5.5.1+dfsg~),
                 pkg-kde-tools,
-                qtbase5-private-dev (>= 5.5.0+dfsg~),
-                qtdeclarative5-private-dev (>= 5.5.0~),
-                qml-module-qtquick2 (>= 5.5.0~),
+                qtbase5-private-dev (>= 5.5.1+dfsg~),
 -               qtdeclarative5-private-dev (>= 5.5.1~)
++               qtdeclarative5-private-dev (>= 5.5.1~),
++               qml-module-qtquick2 (>= 5.5.1~),
 +               xauth,
 +               xvfb
- Build-Depends-Indep: libqt5sql5-sqlite (>= 5.5.0+dfsg~),
-                      qtbase5-doc-html (>= 5.5.0+dfsg~),
-                      qttools5-dev-tools (>= 5.5.0~)
+ Build-Depends-Indep: libqt5sql5-sqlite (>= 5.5.1+dfsg~),
+                      qtbase5-doc-html (>= 5.5.1+dfsg~),
+                      qttools5-dev-tools (>= 5.5.1~)
  Standards-Version: 3.9.6
  Homepage: http://qt-project.org/
  Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtlocation.git

-- 
qtlocation packaging