[SCM] qtlocation packaging branch, ubuntu+1, updated. ubuntu/5.5.1-3ubuntu1-20-g519aed5

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu+1 branch:
commit d179ff8f145e89561d9b2b05722ef29aa4fb6889
Merge: ed32ad9b3fd80c4a8bde9da9e30c965296960c38 370d10fbeb1958a08dcf76ffc2077ae8c2a2487b
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Wed Apr 13 08:04:16 2016 +0000

    Merge branch 'experimental' into ubuntu+1

 debian/changelog | 39 ++++++++++++++++++++++++++++++---------
 debian/control   | 27 ++++++++++++---------------
 debian/copyright |  5 -----
 debian/rules     |  1 +
 4 files changed, 43 insertions(+), 29 deletions(-)

diff --cc debian/changelog
index e8b00da,e10c379..d95edad
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,36 -1,32 +1,57 @@@
- qtlocation-opensource-src (5.6.0~beta-0ubuntu1) UNRELEASED; urgency=medium
++qtlocation-opensource-src (5.6.0-1ubuntu1) UNRELEASED; urgency=medium
 +
 +  * New upstream release.
 +  * Drop patches merged to Qt 5.6:
 +    - debian/patches/Isolate-the-default-cache-directory.patch
 +    - debian/patches/Check-if-GenericCacheLocation-is-writable-before-tru.patch
 +  * Update symbols.
 +
 + -- Timo Jyrinki <timo-jyrinki at ubuntu.com>  Mon, 01 Feb 2016 07:38:59 +0000
 +
+ qtlocation-opensource-src (5.6.0-1) experimental; urgency=medium
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * New upstream release.
+     - Bump Qt build dependencies.
+   * Make qtlocation5-examples depend on qml-module-qtpositioning.
+   * Make libqt5positioning5 recommend geoclue-2.0. It will connect to it by
+     using dbus.
+ 
+   [ Dmitry Shachnev ]
+   * Use recommended https URIs for Vcs fields.
+   * Simplify the command for running the tests.
+   * Install the GeoClue plugin again.
+   * Update symbols files for 5.6.0.
+   * Bump Standards-Version to 3.9.7, no changes needed.
+   * Drop debian/copyright entries for removed code.
+ 
+  -- Dmitry Shachnev <mitya57 at debian.org>  Wed, 30 Mar 2016 23:38:01 +0200
+ 
+ qtlocation-opensource-src (5.5.1-4) unstable; urgency=medium
+ 
+   * Make qtlocation5-examples depend upon qml-module-qtlocation, required by some
+     examples.
+   * Remove GeoClue support (Closes: #788108). The code has not switched to
+     GeoClue 2. On Qt 5.6 it seems to use DBus to connect to GeoClue, so this
+     feature should come back soon.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Thu, 03 Mar 2016 23:29:49 -0300
+ 
 +qtlocation-opensource-src (5.5.1-3ubuntu1) xenial; 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>  Mon, 30 Nov 2015 12:48:15 +0000
 +
- qtlocation-opensource-src (5.5.1-4) UNRELEASED; urgency=medium
- 
-   [ Lisandro Damián Nicanor Pérez Meyer ]
-   * Make qtlocation5-examples depend upon qml-module-qtlocation, required by some
-     examples.
- 
-  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 24 Oct 2015 13:19:16 -0300
- 
  qtlocation-opensource-src (5.5.1-3) unstable; urgency=medium
  
    [ Dmitry Shachnev ]
diff --cc debian/control
index f431844,3a1c097..bd05205
--- a/debian/control
+++ b/debian/control
@@@ -8,26 -7,18 +8,21 @@@ Uploaders: Timo Jyrinki <timo at debian.or
             Dmitry Shachnev <mitya57 at debian.org>
  Build-Depends: dbus,
                 debhelper (>= 9.0.0),
-                geoclue,
-                geoclue-hostip,
-                geoclue-localnet,
-                geoclue-nominatim,
                 libgconf2-dev,
-                libgeoclue-dev,
-                libqt5opengl5-dev (>= 5.5.1+dfsg~),
+                libqt5opengl5-dev (>= 5.6.0+dfsg~),
                 pkg-kde-tools,
-                qtbase5-private-dev (>= 5.5.1+dfsg~),
-                qtdeclarative5-private-dev (>= 5.5.1~),
-                qml-module-qtquick2 (>= 5.5.1~),
++               qml-module-qtquick2 (>= 5.6.0~),
+                qtbase5-private-dev (>= 5.6.0+dfsg~),
+                qtdeclarative5-private-dev (>= 5.6.0~)
 +               xauth,
 +               xvfb
- 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
+ Build-Depends-Indep: libqt5sql5-sqlite (>= 5.6.0+dfsg~),
+                      qtbase5-doc-html (>= 5.6.0+dfsg~),
+                      qttools5-dev-tools (>= 5.6.0~)
+ Standards-Version: 3.9.7
  Homepage: http://qt-project.org/
- Vcs-Git: git://anonscm.debian.org/pkg-kde/qt/qtlocation.git
- Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/qt/qtlocation.git
+ Vcs-Git: https://anonscm.debian.org/git/pkg-kde/qt/qtlocation.git
+ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/qt/qtlocation.git
  
  Package: libqt5location5
  Architecture: any
diff --cc debian/rules
index 6becb9b,709e83a..96ce0e4
--- a/debian/rules
+++ b/debian/rules
@@@ -41,9 -41,7 +41,10 @@@ override_dh_install
  	dh_install --fail-missing
  
  override_dh_auto_test-arch:
 -	dbus-run-session -- dh_auto_test -- QT_QPA_PLATFORM=minimal
 +ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 +	xvfb-run -a -s '-screen 0 640x480x24' dh_auto_test -- QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
++	#dbus-run-session -- dh_auto_test -- QT_QPA_PLATFORM=minimal
 +endif
  
  override_dh_auto_test-indep:
  

-- 
qtlocation packaging