[SCM] qtbase packaging branch, master, updated. debian/5.7.1-20161021+dfsg-6-14-g8cf2cc2

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit 0506ad5c3b408ee3ff94c91a73620ddbe837bef8
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Wed Dec 14 13:29:54 2016 +0300

    Refresh qsettings_XDG_CONFIG_DIRS.diff and qsettings_simplify_logic.diff.
---
 debian/changelog                              |  1 +
 debian/patches/qsettings_XDG_CONFIG_DIRS.diff | 12 ++++++------
 debian/patches/qsettings_simplify_logic.diff  | 24 ++++++++++++------------
 3 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9827027..04d60c4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qtbase-opensource-src (5.7.1+dfsg-1) UNRELEASED; urgency=medium
 
   [ Dmitry Shachnev ]
   * New upstream final release.
+  * Refresh qsettings_XDG_CONFIG_DIRS.diff and qsettings_simplify_logic.diff.
   * Build with system libdouble-conversion library (closes: #845372).
   * Convert to automatic dbgsym packages.
   * Bump documentation build-dependencies to 5.7.1.
diff --git a/debian/patches/qsettings_XDG_CONFIG_DIRS.diff b/debian/patches/qsettings_XDG_CONFIG_DIRS.diff
index 1c7974b..837ec35 100644
--- a/debian/patches/qsettings_XDG_CONFIG_DIRS.diff
+++ b/debian/patches/qsettings_XDG_CONFIG_DIRS.diff
@@ -26,7 +26,7 @@ Last-Update: 2016-10-22
  typedef QVector<QConfFileCustomFormat> CustomFormatVector;
  
  Q_GLOBAL_STATIC(ConfFileHash, usedHashFunc)
-@@ -1075,22 +1086,22 @@
+@@ -1079,22 +1090,22 @@
         */
  #ifdef Q_OS_WIN
          pathHash->insert(pathHashKey(QSettings::IniFormat, QSettings::UserScope),
@@ -56,7 +56,7 @@ Last-Update: 2016-10-22
  {
      Q_ASSERT((int)QSettings::NativeFormat == 0);
      Q_ASSERT((int)QSettings::IniFormat == 1);
-@@ -1100,14 +1111,23 @@
+@@ -1104,14 +1115,23 @@
      if (pathHash->isEmpty())
          initDefaultPaths(&locker);
  
@@ -82,7 +82,7 @@ Last-Update: 2016-10-22
  QConfFileSettingsPrivate::QConfFileSettingsPrivate(QSettings::Format format,
                                                     QSettings::Scope scope,
                                                     const QString &organization,
-@@ -1127,16 +1147,44 @@
+@@ -1131,16 +1151,44 @@
      QString orgFile = org + extension;
  
      if (scope == QSettings::UserScope) {
@@ -134,7 +134,7 @@ Last-Update: 2016-10-22
  
      initAccess();
  }
-@@ -2187,9 +2235,10 @@
+@@ -2191,9 +2239,10 @@
      \list 1
      \li 
-- 
qtbase packaging