[SCM] qtlocation packaging branch, ubuntu, updated. debian/5.5.1-3-25-gc830154

[Timo Jyrinki]

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

The following commit has been merged in the ubuntu branch:
commit 444a4c2a11f3ba7ab77310343b070dcaffdab8bb
Merge: 2798942c2aad619b84cc72ef23fb7b0bb283433f de51b93c56275bc7a3d7be3713cd6f16591757b4
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Mon Nov 30 12:48:06 2015 +0000

    Merge branch 'master' into ubuntu

 debian/changelog | 26 ++++++++++++++++++++++++++
 debian/control   |  3 ++-
 debian/rules     |  4 +++-
 3 files changed, 31 insertions(+), 2 deletions(-)

diff --cc debian/changelog
index c2c2bfe,a3ff11b..316e95f
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,18 -1,29 +1,44 @@@
 +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-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 ]
+   * Add empty override_dh_auto_test-indep target, so that tests are really
+     not run during arch-indep builds.
+ 
+   [ Lisandro Damián Nicanor Pérez Meyer ]
+   * Upload to unstable.
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Wed, 21 Oct 2015 19:16:00 -0300
+ 
+ qtlocation-opensource-src (5.5.1-2) experimental; urgency=medium
+ 
+   * Only run test when building arch-dependant packages. The arch: all
+     packages are just doc (Closes: #802344).
+ 
+  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Mon, 19 Oct 2015 15:56:30 -0300
+ 
  qtlocation-opensource-src (5.5.1-1) experimental; urgency=medium
  
    * New upstream release.
diff --cc debian/control
index b3c3c56,7604c95..f431844
--- a/debian/control
+++ b/debian/control
@@@ -93,12 -77,10 +93,12 @@@ Package: qml-module-qtlocatio
  Architecture: any
  Multi-Arch: same
  Pre-Depends: ${misc:Pre-Depends}
 -Depends: libqt5location5-plugins (= ${binary:Version}),
 +Depends: libqt5location5-plugins,
           ${misc:Depends},
 -         ${shlibs:Depends}
 +         ${shlibs:Depends},
 +Breaks: qtdeclarative5-qtlocation-plugin (<< 5.3.2-2~)
 +Replaces: qtdeclarative5-qtlocation-plugin (<< 5.3.2-2~)
- Description: Qt Location module - QML plugin
+ Description: Qt Location QML module
   Qt is a cross-platform C++ application framework. Qt's primary feature
   is its rich set of widgets that provide standard GUI functionality.
   .
diff --cc debian/rules
index 8575551,dad78c0..6becb9b
--- a/debian/rules
+++ b/debian/rules
@@@ -40,11 -40,13 +40,13 @@@ override_dh_auto_install-indep
  override_dh_install:
  	dh_install --fail-missing
  
- override_dh_auto_test:
+ override_dh_auto_test-arch:
  ifeq (,$(findstring nocheck,$(DEB_BUILD_OPTIONS)))
 -	dbus-launch --exit-with-session dh_auto_test -- QT_QPA_PLATFORM=minimal QT_DEBUG_PLUGINS=1 QT_PLUGIN_PATH=$(CURDIR)/plugins
 +	xvfb-run -a -s '-screen 0 640x480x24' dh_auto_test -- QT_PLUGIN_PATH=$(CURDIR)/plugins LD_LIBRARY_PATH=$(CURDIR)/lib
  endif
  
+ override_dh_auto_test-indep:
+ 
  override_dh_auto_clean:
  	dh_auto_clean
  	# Leftover files and all symlinks

-- 
qtlocation packaging