[SCM] qtsensors packaging branch, master, updated. debian/5.2.0+dfsg-2

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit c82c416d1c7a29754e6840fb47a0ef8ec5c67f5c
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Tue Oct 29 21:34:13 2013 +0400

    Add new patch (fix_grue_qmldir_path.diff).
    
    This patch sets correct qmldir.path for grue example to fix FTBFS.
---
 debian/changelog                         |  2 ++
 debian/patches/fix_grue_qmldir_path.diff | 16 ++++++++++++++++
 debian/patches/series                    |  1 +
 3 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index feab202..9b8a5cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 qtsensors-opensource-src (5.2.0~beta1+dfsg-1) UNRELEASED; urgency=low
 
   * New upstream beta release.
+  * debian/patches/fix_grue_qmldir_path.diff: correctly set qmldir.path for
+    grue example to fix FTBFS.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 29 Oct 2013 21:31:54 +0400
 
diff --git a/debian/patches/fix_grue_qmldir_path.diff b/debian/patches/fix_grue_qmldir_path.diff
new file mode 100644
index 0000000..08fe5e0
--- /dev/null
+++ b/debian/patches/fix_grue_qmldir_path.diff
@@ -0,0 +1,16 @@
+Description: set qmldir.path correctly
+Author: Dmitry Shachnev <mitya57 at gmail.com>
+Forwarded: yes, https://codereview.qt-project.org/69586
+Last-Update: 2013-10-29
+
+--- a/examples/sensors/grue/import/import.pro
++++ b/examples/sensors/grue/import/import.pro
+@@ -21,7 +21,7 @@
+ INSTALLS += target
+ 
+ qmldir.files=$$PWD/qmldir
+-qmldir.path=$$DESTDIR
++qmldir.path=$$DESTPATH
+ INSTALLS += qmldir
+ 
+ OTHER_FILES += \
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d9902c9
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_grue_qmldir_path.diff

-- 
qtsensors packaging