[SCM] qtbase packaging branch, experimental, updated. debian/5.8.0+dfsg-2-6-g281c2e3

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit c025dd4a48187f56a0f0740736113a566109920e
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Thu Feb 16 11:18:23 2017 +0300

    Drop no_dbus_dependency.diff.
    
    We do not run tests so it is not needed.
---
 debian/changelog                       |  1 +
 debian/patches/no_dbus_dependency.diff | 22 ----------------------
 debian/patches/series                  |  1 -
 3 files changed, 1 insertion(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 71746cb..f3e593b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ qtbase-opensource-src (5.8.0+dfsg-3) UNRELEASED; urgency=medium
   * Mark hurd_tilde.diff as applied upstream.
   * Replace qvncscreen_semicolon.diff with a more complete patch from
     Shawn Rutledge (vnc_big_endian.diff).
+  * Drop no_dbus_dependency.diff. We do not run tests so it is not needed.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 16 Feb 2017 10:51:02 +0300
 
diff --git a/debian/patches/no_dbus_dependency.diff b/debian/patches/no_dbus_dependency.diff
deleted file mode 100644
index a1db8a9..0000000
--- a/debian/patches/no_dbus_dependency.diff
+++ /dev/null
@@ -1,22 +0,0 @@
-Description: do not fail when D-Bus is not available on configure time
- According to comments in https://codereview.qt-project.org/125499, this check
- will be dropped before the final Qt 5.6 release.
- .
- According to comments in https://codereview.qt-project.org/174643, upstream
- have changed their mind since then.
-Author: Dmitry Shachnev <mitya57 at debian.org>
-Last-Update: 2017-01-24
-
---- a/tests/auto/auto.pro
-+++ b/tests/auto/auto.pro
-@@ -34,10 +34,6 @@
- # Disable the QtDBus tests if we can't connect to the session bus
- !cross_compile:qtHaveModule(dbus) {
-     !system("dbus-send --session --type=signal / local.AutotestCheck.Hello >/dev/null 2>&1") {
--        qtConfig(dbus-linked): \
--            error("QtDBus is enabled but session bus is not available. Please check the installation.")
--        else: \
--            warning("QtDBus is enabled with runtime support, but session bus is not available. Skipping QtDBus tests.")
-         SUBDIRS -= dbus
-     }
- }
diff --git a/debian/patches/series b/debian/patches/series
index 1f330aa..120b00b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,7 +7,6 @@ hurd_tilde.diff
 vnc_big_endian.diff
 
 # Debian specific.
-no_dbus_dependency.diff
 gnukfreebsd.diff
 no_htmlinfo_example.diff
 remove_privacy_breachs.diff

-- 
qtbase packaging