[SCM] qtbase packaging branch, master, updated. debian/5.7.1-20161021+dfsg-5-3-g83c19ef
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Tue Nov 15 11:32:17 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=83c19ef
The following commit has been merged in the master branch:
commit 83c19ef276dab723580bbf2d57e74d551ded6a1f
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Tue Nov 15 14:32:07 2016 +0300
Mark no_dbus_dependency.diff as not applied upstream.
---
debian/patches/no_dbus_dependency.diff | 5 ++++-
debian/patches/series | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/debian/patches/no_dbus_dependency.diff b/debian/patches/no_dbus_dependency.diff
index 736b893..e5cd0c1 100644
--- a/debian/patches/no_dbus_dependency.diff
+++ b/debian/patches/no_dbus_dependency.diff
@@ -1,8 +1,11 @@
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: 2015-12-29
+Last-Update: 2016-11-15
--- a/tests/auto/auto.pro
+++ b/tests/auto/auto.pro
diff --git a/debian/patches/series b/debian/patches/series
index a82eee8..9d04087 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,9 @@
# Backported from upstream
qsettings_simplify_logic.diff
qsettings_XDG_CONFIG_DIRS.diff
-no_dbus_dependency.diff
# Debian specific.
+no_dbus_dependency.diff
gnukfreebsd.diff
no_htmlinfo_example.diff
remove_privacy_breachs.diff
--
qtbase packaging
More information about the pkg-kde-commits
mailing list