[SCM] sddm packaging branch, kubuntu_xenial_archive, updated. ubuntu/0.13.0-1ubuntu1-1-ga55fb5c

[Philip Muškovac]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/sddm.git;a=commitdiff;h=a55fb5c

The following commit has been merged in the kubuntu_xenial_archive branch:
commit a55fb5cfeb57adb5c43a460d9e343c02cd4578e8
Author: Philip Muškovac <yofel at gmx.net>
Date:   Fri Jan 8 10:47:57 2016 +0100

    Mark sddm X scripts as conffiles
---
 debian/changelog | 7 +++++++
 debian/conffiles | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 57345e2..4496f2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+sddm (0.13.0-1ubuntu2) xenial; urgency=medium
+
+  * Mark Xstart, Xsession and Xstop as conffiles as they are supposed to be
+    editable by users (LP: #1531465)
+
+ -- Philip Muškovac <yofel at kubuntu.org>  Fri, 08 Jan 2016 10:44:21 +0100
+
 sddm (0.13.0-1ubuntu1) xenial; urgency=medium
 
   * Merge with debian unstable (LP: #1519564, #1516837, #1511286)
diff --git a/debian/conffiles b/debian/conffiles
new file mode 100644
index 0000000..eae718e
--- /dev/null
+++ b/debian/conffiles
@@ -0,0 +1,3 @@
+usr/share/sddm/scripts/Xsetup
+usr/share/sddm/scripts/Xsession
+usr/share/sddm/scripts/Xstop

-- 
sddm packaging