[SCM] sddm packaging branch, master, updated. 5c262f3593b42fd80391c658ece17b4ed0b8d5ca

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 97074c99e60934397aa7cd69116e7b31bb85ffcc
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Mar 27 14:52:46 2015 +0100

    And after syncing it lets make sure that it works
---
 debian/sddm.config   | 11 ++---------
 debian/sddm.postinst | 10 +++++-----
 debian/sddm.prerm    |  7 +++----
 3 files changed, 10 insertions(+), 18 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=
diff --git a/debian/sddm.postinst b/debian/sddm.postinst
index c8eded6..26511d5 100644
--- a/debian/sddm.postinst
+++ b/debian/sddm.postinst
@@ -36,7 +36,7 @@ if ! [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
         if [ "$THIS_PACKAGE" != "$RET" ]; then
             echo "Please be sure to run \"dpkg --configure $RET\"."
         fi
-        if db_get "$DEFAULT_DISPLAY_MANAGER"/daemon_name; then
+        if db_get "$RET"/daemon_name; then
             echo "$RET" > "$DEFAULT_DISPLAY_MANAGER_FILE"
         fi
     fi
@@ -50,6 +50,10 @@ fi
 # debconf hangs if sddm gets started below without this
 db_stop || true
 
+if [ "$1" = "configure" ]; then
+    invoke-rc.d dbus reload || true
+fi
+
 DEFAULT_SERVICE=/etc/systemd/system/display-manager.service
 # set default-display-manager systemd service link according to our config
 if [ "$1" = configure ] && [ -d /etc/systemd/system/ ]; then
@@ -73,10 +77,6 @@ if [ -x /etc/init.d/sddm ]; then
     update-rc.d sddm defaults $S $K >/dev/null 2>&1
 fi
 
-if [ "$1" = "configure" ]; then
-    invoke-rc.d dbus reload || true
-fi
-
 touch /var/log/sddm.log
 chown sddm:sddm /var/log/sddm.log
 
diff --git a/debian/sddm.prerm b/debian/sddm.prerm
index 5b42509..b922a63 100644
--- a/debian/sddm.prerm
+++ b/debian/sddm.prerm
@@ -25,10 +25,9 @@ if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
       # are we removing the currently selected display manager?
       if [ "$THIS_PACKAGE" = "$RET" ]; then
         if [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
-	  if db_get "$RET"/daemon_name; then
-	    if [ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" = "$RET" ]; then
-	      rm "$DEFAULT_DISPLAY_MANAGER_FILE"
-	    fi
+	  db_get "$RET"/daemon_name
+	  if [ "$(cat $DEFAULT_DISPLAY_MANAGER_FILE)" = "$RET" ]; then
+	    rm "$DEFAULT_DISPLAY_MANAGER_FILE"
 	  fi
         fi
         # ask the user to choose a new default

-- 
sddm packaging