[SCM] sddm packaging branch, master, updated. f46a1792f4ab243b1655bedb5cba60e3891e513b

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit f46a1792f4ab243b1655bedb5cba60e3891e513b
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Oct 17 16:38:43 2014 +0200

    Do not force sddm on upgrade
---
 debian/sddm.config | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/debian/sddm.config b/debian/sddm.config
index ed8b8c5..62b9d69 100644
--- a/debian/sddm.config
+++ b/debian/sddm.config
@@ -44,15 +44,8 @@ else
   fi
 fi
 
-# when installing from scratch as part of a release upgrade, default to
-# sddm, otherwise ask
-if [ -z "$2" -a -n "$RELEASE_UPGRADE_IN_PROGRESS" ]; then
-    db_set shared/default-x-display-manager sddm
-    db_fset shared/default-x-display-manager seen true
-else
-    db_input high shared/default-x-display-manager || :
-    db_go || :
-fi
+db_input high shared/default-x-display-manager || :
+db_go || :
 
 # using this display manager?
 NEW_DEFAULT=

-- 
sddm packaging