[SCM] qtbase packaging branch, master, updated. debian/5.9.2+dfsg-8-3-g1e80dd4

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Sun Feb 4 01:12:48 UTC 2018


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

The following commit has been merged in the master branch:
commit 92f20bce8a1988d82be3c8253d86b78442aaadf5
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sat Feb 3 22:01:50 2018 -0300

    Fix the maintainer script that removes old xdg directory.
    
    It needs to check for the existance of the directory before trying to
    remove it.
---
 debian/changelog             | 4 ++++
 debian/libqt5core5a.postinst | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 6b49b1c..34ff3d7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,9 @@
 qtbase-opensource-src (5.9.2+dfsg-9) UNRELEASED; urgency=medium
 
+  [ Lisandro Damián Nicanor Pérez Meyer ]
+  * Check the existance of /etc/xdg/QtProject before trying to remove it
+    (Closes: #889504).
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 03 Feb 2018 21:59:36 -0300
 
 qtbase-opensource-src (5.9.2+dfsg-8) unstable; urgency=medium
diff --git a/debian/libqt5core5a.postinst b/debian/libqt5core5a.postinst
index 32d5d3a..2136c2b 100644
--- a/debian/libqt5core5a.postinst
+++ b/debian/libqt5core5a.postinst
@@ -5,5 +5,7 @@ set -e
 #DEBHELPER#
 
 if [ "$1" = configure ]; then
-    rmdir --ignore-fail-on-non-empty /etc/xdg/QtProject
+    if [ -d /etc/xdg/QtProject ]; then
+        rmdir --ignore-fail-on-non-empty /etc/xdg/QtProject
+    fi
 fi

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list