[SCM] qtlocation packaging branch, experimental, updated. debian/5.3.2-2-9-g4986213

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 4986213402888a2fcb1aaf0dbebe61e09372e6fa
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Dec 27 16:32:53 2014 +0300

    Disable building qtlocation module for now.
---
 debian/changelog                        |  1 +
 debian/patches/disable_qtlocation.patch | 32 ++++++++++++++++++++++++++++++++
 debian/patches/series                   |  1 +
 3 files changed, 34 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1fe5bf2..d0819d5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ qtlocation-opensource-src (5.4.0-1) UNRELEASED; urgency=medium
   * New upstream release.
   * Bump Qt build-dependencies to 5.4.0.
   * Drop disable_qgeocircle_extendShape_tests.patch, no longer needed.
+  * Disable building qtlocation module for now.
   * Build-depend on qtbase5-doc-html, for docs linking.
   * Update debian/copyright.
   * Bump Standards-Version to 3.9.6, no changes needed.
diff --git a/debian/patches/disable_qtlocation.patch b/debian/patches/disable_qtlocation.patch
new file mode 100644
index 0000000..af0d586
--- /dev/null
+++ b/debian/patches/disable_qtlocation.patch
@@ -0,0 +1,32 @@
+Description: disable qtlocation for now, it is not yet part of Qt
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: not-needed
+Last-Update: 2014-12-27
+
+--- a/src/src.pro
++++ b/src/src.pro
+@@ -12,24 +12,3 @@
+ 
+     SUBDIRS += positioning_doc_snippets
+ }
+-
+-qtHaveModule(quick) {
+-    SUBDIRS += 3rdparty
+-
+-    location.depends = positioning 3rdparty
+-    SUBDIRS += location
+-
+-    plugins.depends += location
+-    imports.depends += location
+-
+-    contains(QT_CONFIG, private_tests) {
+-        location_doc_snippets.subdir = location/doc/snippets
+-        #plugin dependency required during static builds
+-        location_doc_snippets.depends = location plugins
+-
+-        SUBDIRS += location_doc_snippets
+-    }
+-
+-    imports.depends += positioning
+-    SUBDIRS += imports
+-}
diff --git a/debian/patches/series b/debian/patches/series
index 726d5ba..fd4ecc3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 disable_failing_tests.patch
+disable_qtlocation.patch

-- 
qtlocation packaging