[SCM] qtsystems packaging branch, master, updated. 00b5912400b45fbcf7486370b08f9c2b4b88fbaf

[Timo Jyrinki]

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

The following commit has been merged in the master branch:
commit dc422fd6b5a2a46bf45329005b70344d269a93c1
Author: Timo Jyrinki <timo.jyrinki at canonical.com>
Date:   Tue Jul 15 07:30:50 2014 +0000

    debian/patches/build_with_udisk.patch:
    
    * debian/patches/build_with_udisk.patch:
      - Build with udisks support
---
 debian/changelog                      |  2 ++
 debian/patches/build_with_udisk.patch | 21 +++++++++++++++++++++
 2 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index d8a2ca5..80d3602 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,5 +6,7 @@ qtsystems-opensource-src (5.0~git20130712-1) UNRELEASED; urgency=low
     - Revert to non-zero version number
   * debian/patches/add_license_files.patch:
     - Include license files not yet in upstream (submitted for inclusion)
+  * debian/patches/build_with_udisk.patch:
+    - Build with udisks support
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Wed, 30 Jan 2013 14:15:42 +0200
diff --git a/debian/patches/build_with_udisk.patch b/debian/patches/build_with_udisk.patch
new file mode 100644
index 0000000..9cfd009
--- /dev/null
+++ b/debian/patches/build_with_udisk.patch
@@ -0,0 +1,21 @@
+--- qtsystems-opensource-src-5.0~git20130712/doc/src/systeminfo/systeminfo.qdoc	2013-07-12 09:41:04.000000000 +0200
++++ qtsystems-opensource-src-5.0~git20130712.build/doc/src/systeminfo/systeminfo.qdoc	2013-08-09 10:18:23.750054794 +0200
+@@ -47,6 +47,7 @@
+ 
+      * CONFIG+=upower (linux) will build the UPower dbus backend.
+      * CONFIG+=ofono (linux) will build the Ofono dbus backend.
++     * CONFIG+=udisk (linux) will build the Udisk dbus backend.
+      * CONFIG+=nox11option (linux) Turns off the use of x11 in QScreenSaver (and screen blanking
+      disabling and enabling will not work)
+ 
+--- qtsystems-opensource-src-5.0~git20130712/src/systeminfo/systeminfo.pro	2013-07-12 09:41:04.000000000 +0200
++++ qtsystems-opensource-src-5.0~git20130712.build/src/systeminfo/systeminfo.pro	2013-08-09 10:17:33.546053282 +0200
+@@ -92,7 +92,7 @@
+             DEFINES += QT_NO_OFONO
+         }
+ 
+-        config_udisks {
++        contains(CONFIG,udisks): {
+             QT_PRIVATE += dbus
+         } else: {
+             DEFINES += QT_NO_UDISKS

-- 
qtsystems packaging