[SCM] qtbase packaging branch, master, updated. debian/5.9.2+dfsg-6-2-ga2d2fd7

[Dmitry Shachnev]

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

The following commit has been merged in the master branch:
commit a2d2fd7080a5a2307a5f1f7a63a2dc5076f87ed1
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date:   Fri Jan 19 14:51:40 2018 +0300

    Remove qtlogging.ini file.
    
    The underlying issue has been fixed, and it causes too many problems.
    
    Closes: #886437.
---
 debian/changelog                | 3 +++
 debian/libqt5core5a.install     | 1 -
 debian/libqt5core5a.maintscript | 1 +
 debian/qtlogging.ini            | 2 --
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9ae5790..204d6f9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 qtbase-opensource-src (5.9.2+dfsg-7) UNRELEASED; urgency=medium
 
+  [ Dmitry Shachnev ]
+  * Remove qtlogging.ini file, the underlying issue has been fixed, and
+    it causes too many problems (closes: #886437, LP: #1744260).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Fri, 19 Jan 2018 14:43:25 +0300
 
diff --git a/debian/libqt5core5a.install b/debian/libqt5core5a.install
index 13d1b4b..af93654 100755
--- a/debian/libqt5core5a.install
+++ b/debian/libqt5core5a.install
@@ -1,4 +1,3 @@
 #! /usr/bin/dh-exec
 [any-i386] usr/lib/*/sse2/libQt5Core.so.*
-debian/qtlogging.ini etc/xdg/QtProject/
 usr/lib/*/libQt5Core.so.*
diff --git a/debian/libqt5core5a.maintscript b/debian/libqt5core5a.maintscript
new file mode 100644
index 0000000..d867191
--- /dev/null
+++ b/debian/libqt5core5a.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/xdg/QtProject/qtlogging.ini 5.9.2+dfsg-7~ libqt5core5a
diff --git a/debian/qtlogging.ini b/debian/qtlogging.ini
deleted file mode 100644
index be2bf22..0000000
--- a/debian/qtlogging.ini
+++ /dev/null
@@ -1,2 +0,0 @@
-[Rules]
-*.debug=false

-- 
qtbase packaging