[SCM] qtbase packaging branch, experimental, updated. debian/5.9.1+dfsg-10-3-g040fae7

Dmitry Shachnev mitya57 at moszumanska.debian.org
Sat Sep 23 20:40:28 UTC 2017


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

The following commit has been merged in the experimental branch:
commit 496ca1beab8c31a1366df63a5c6b24d3f15098e9
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Sat Sep 23 23:38:58 2017 +0300

    Drop fix_atspi_condition.diff, it was coming from upstream.
---
 debian/changelog                        |  1 +
 debian/patches/fix_atspi_condition.diff | 15 ---------------
 debian/patches/series                   |  1 -
 3 files changed, 1 insertion(+), 16 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d15f0db..0267e85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtbase-opensource-src (5.9.2+dfsg-1) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * New upstream release.
+  * Drop fix_atspi_condition.diff, it was coming from upstream.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 23 Sep 2017 23:28:13 +0300
 
diff --git a/debian/patches/fix_atspi_condition.diff b/debian/patches/fix_atspi_condition.diff
deleted file mode 100644
index 0d55f89..0000000
--- a/debian/patches/fix_atspi_condition.diff
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: fix accessibility-atspi-bridge enablement condition
-Origin: upstream, https://code.qt.io/cgit/qt/qtbase.git/commit/?id=386af91c57948b88
-Last-Update: 2017-06-30
-
---- a/src/gui/configure.json
-+++ b/src/gui/configure.json
-@@ -434,7 +434,7 @@
-     "features": {
-         "accessibility-atspi-bridge": {
-             "label": "ATSPI Bridge",
--            "condition": "features.accessibility && features.xcb && features.dbus && config.atspi",
-+            "condition": "features.accessibility && features.xcb && features.dbus && libs.atspi",
-             "output": [ "privateFeature", "feature" ]
-         },
-         "angle": {
diff --git a/debian/patches/series b/debian/patches/series
index 3a414d6..ed90b49 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,5 +1,4 @@
 # Backported from upstream.
-fix_atspi_condition.diff
 
 # Debian specific.
 gnukfreebsd.diff

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list