[SCM] marble packaging branch, master, updated. debian/4%17.08.3-2-5-g931fbc9

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/marble.git;a=commitdiff;h=40a239d

The following commit has been merged in the master branch:
commit 40a239d841b3ae76a89d0e680c7675a23c4e70b8
Author: Pino Toscano <pino at debian.org>
Date:   Tue Jan 2 18:26:27 2018 +0100

    handle /etc/xdg/marble.knsrc as marble-data conffile (#885067)
---
 debian/changelog               | 3 +++
 debian/marble-data.maintscript | 1 +
 2 files changed, 4 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 26b5fdc..229c86b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,8 @@
 marble (4:17.08.3-3) UNRELEASED; urgency=medium
 
+  [ Pino Toscano ]
+  * Unregister /etc/xdg/marble.knsrc as marble-data conffile (it is a conffile
+    of marble now). (Closes: #885067)
 
  -- Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 02 Jan 2018 18:12:11 +0100
 
diff --git a/debian/marble-data.maintscript b/debian/marble-data.maintscript
new file mode 100644
index 0000000..9ccc37e
--- /dev/null
+++ b/debian/marble-data.maintscript
@@ -0,0 +1 @@
+rm_conffile /etc/xdg/marble.knsrc 4:17.08.3-3~

-- 
marble packaging