[SCM] qtbase packaging branch, experimental, updated. debian/5.7.0+dfsg-3-8-g4669c77

[Dmitry Shachnev]

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

The following commit has been merged in the experimental branch:
commit 3a7cbea8faf716e35d0f3f4de22ffd30539ece53
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Oct 21 10:55:04 2016 +0300

    Drop debian/patches/qdevicediscovery_dummy.diff, applied upstream.
---
 debian/changelog                           |  1 +
 debian/patches/qdevicediscovery_dummy.diff | 34 ------------------------------
 debian/patches/series                      |  1 -
 3 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index bed8cd8..c96247c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtbase-opensource-src (5.7.1~20161021+dfsg-1) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * New upstream snapshot.
+  * Drop debian/patches/qdevicediscovery_dummy.diff, applied upstream.
 
   [ Lisandro Damián Nicanor Pérez Meyer ]
   * Require pkg-kde-tools (>= 0.15.17~) to allow using backported versions.
diff --git a/debian/patches/qdevicediscovery_dummy.diff b/debian/patches/qdevicediscovery_dummy.diff
deleted file mode 100644
index ca3365e..0000000
--- a/debian/patches/qdevicediscovery_dummy.diff
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: remove linux only-dependency from devicediscovery
-Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=dd8745e1d4beedfb
-Last-Update: 2016-07-03
-
---- a/src/platformsupport/devicediscovery/devicediscovery.pri
-+++ b/src/platformsupport/devicediscovery/devicediscovery.pri
-@@ -1,18 +1,14 @@
- HEADERS += $$PWD/qdevicediscovery_p.h
- 
--linux {
--    contains(QT_CONFIG, libudev) {
--        SOURCES += $$PWD/qdevicediscovery_udev.cpp
--        HEADERS += $$PWD/qdevicediscovery_udev_p.h
--        INCLUDEPATH += $$QMAKE_INCDIR_LIBUDEV
--        LIBS_PRIVATE += $$QMAKE_LIBS_LIBUDEV
--    } else: contains(QT_CONFIG, evdev) {
--        SOURCES += $$PWD/qdevicediscovery_static.cpp
--        HEADERS += $$PWD/qdevicediscovery_static_p.h
--    } else {
--        SOURCES += $$PWD/qdevicediscovery_dummy.cpp
--        HEADERS += $$PWD/qdevicediscovery_dummy_p.h
--    }
-+contains(QT_CONFIG, libudev) {
-+    SOURCES += $$PWD/qdevicediscovery_udev.cpp
-+    HEADERS += $$PWD/qdevicediscovery_udev_p.h
-+    INCLUDEPATH += $$QMAKE_INCDIR_LIBUDEV
-+    LIBS_PRIVATE += $$QMAKE_LIBS_LIBUDEV
-+} else: contains(QT_CONFIG, evdev) {
-+    SOURCES += $$PWD/qdevicediscovery_static.cpp
-+    HEADERS += $$PWD/qdevicediscovery_static_p.h
- } else {
-     SOURCES += $$PWD/qdevicediscovery_dummy.cpp
-+    HEADERS += $$PWD/qdevicediscovery_dummy_p.h
- }
diff --git a/debian/patches/series b/debian/patches/series
index ce2e1a1..c7b0d06 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,5 +7,4 @@ no_htmlinfo_example.diff
 remove_privacy_breachs.diff
 link_fbclient.diff
 gnukfreebsd_cloexec.diff
-qdevicediscovery_dummy.diff
 armv4.diff

-- 
qtbase packaging