diff -pruN 0.19.0-2/debian/changelog 0.19.0-2ubuntu1/debian/changelog
--- 0.19.0-2/debian/changelog	2020-11-09 19:38:45.000000000 +0000
+++ 0.19.0-2ubuntu1/debian/changelog	2020-11-15 11:53:51.000000000 +0000
@@ -1,3 +1,17 @@
+sddm (0.19.0-2ubuntu1) hirsute; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - Add kubuntu_nvidia-prime.diff to make sure NVIDIA Prime works.
+    - Keep the default-display-manager file logic in sddm.postinst.
+    - Update Vcs-* to point to Launchpad instead of Salsa.
+    - Add debian/conffiles.
+    - Make sure sddm.service starts at the correct time.
+    - Start on tty1 by default.
+    - Instead of hardcoding the Breeze theme in, allow ubuntu-theme to be
+      used in the same fashion Debian's is.
+
+ -- Rik Mills <rikmills@kde.org>  Sun, 15 Nov 2020 11:53:51 +0000
+
 sddm (0.19.0-2) unstable; urgency=medium
 
   [ Norbert Preining ]
@@ -38,6 +52,36 @@ sddm (0.19.0-1) unstable; urgency=medium
 
  -- Norbert Preining <norbert@preining.info>  Sat, 07 Nov 2020 09:28:39 +0900
 
+sddm (0.18.1-1ubuntu3) groovy; urgency=medium
+
+  * debian/conffiles: Switch to using absolute paths, which are now
+    being enforced by the latest dpkg. (LP: #1891068)
+
+ -- Rik Mills <rikmills@kde.org>  Thu, 13 Aug 2020 07:43:10 +0100
+
+sddm (0.18.1-1ubuntu2) focal; urgency=medium
+
+  * Revert upstream_set-re-use-session-option-by-default.diff
+
+ -- Rik Mills <rikmills@kde.org>  Tue, 25 Feb 2020 15:44:32 +0000
+
+sddm (0.18.1-1ubuntu1) focal; urgency=medium
+
+  * Merge from Debian unstable. Remaining changes:
+    - Recommend the Breeze SDDM theme instead of the Maui one.
+    - Add kubuntu_nvidia-prime.diff to make sure NVIDIA Prime works.
+    - Keep the default-display-manager file logic in sddm.postinst.
+    - Update Vcs-* to point to Launchpad instead of Salsa.
+    - Add debian/conffiles.
+    - Make sure sddm.service starts at the correct time.
+    - Start on tty1 by default.
+    - Bump Standards-version to 4.1.5, no changes needed.
+    - Instead of hardcoding the Breeze theme in, allow ubuntu-theme to be
+      used in the same fashion Debian's is.
+  * Add upstream_set-re-use-session-option-by-default.diff
+
+ -- Rik Mills <rikmills@kde.org>  Mon, 24 Feb 2020 08:17:37 +0000
+
 sddm (0.18.1-1) unstable; urgency=medium
 
   * Team upload.
@@ -74,6 +118,28 @@ sddm (0.18.1-1) unstable; urgency=medium
 
  -- Pino Toscano <pino@debian.org>  Sun, 23 Feb 2020 13:34:38 +0100
 
+sddm (0.18.0-1ubuntu2) cosmic; urgency=medium
+
+  * sddm-ubuntu-theme, not sddm-debian-theme.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 27 Jul 2018 08:15:15 -0500
+
+sddm (0.18.0-1ubuntu1) cosmic; urgency=medium
+
+  * Merge from Debian Sid. Remaining changes:
+    - Recommend the Breeze SDDM theme instead of the Maui one.
+    - Add kubuntu_nvidia-prime.diff to make sure NVIDIA Prime works.
+    - Keep the default-display-manager file logic in sddm.postinst.
+    - Update Vcs-* to point to Launchpad instead of Salsa.
+    - Add debian/conffiles.
+    - Make sure sddm.service starts at the correct time.
+    - Start on tty1 by default.
+  * Bump Standards-version to 4.1.5, no changes needed.
+  * Instead of hardcoding the Breeze theme in, allow ubuntu-theme to be used
+    in the same fashion Debian's is.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Fri, 27 Jul 2018 07:51:00 -0500
+
 sddm (0.18.0-1) unstable; urgency=medium
 
   [ Simon Quigley ]
@@ -103,6 +169,66 @@ sddm (0.17.0-2) experimental; urgency=me
 
  -- Maximiliano Curia <maxy@debian.org>  Thu, 21 Jun 2018 13:08:36 +0200
 
+sddm (0.17.0-1ubuntu7) bionic; urgency=medium
+
+  * debian/sddm.service: Always wait for plymouth quit to run before
+    trying to start.
+
+ -- Rik Mills <rikmills@kubuntu.org>  Fri, 20 Apr 2018 14:12:06 +0100
+
+sddm (0.17.0-1ubuntu6) bionic; urgency=medium
+
+  * debian/sddm.service Apply the fix for the race between sddm and
+    logind to our service template as this is what we install.
+  * debian/patches: Drop previous fix-logind-race.patch
+
+ -- Rik Mills <rikmills@kubuntu.org>  Tue, 17 Apr 2018 22:21:36 +0100
+
+sddm (0.17.0-1ubuntu5) bionic; urgency=medium
+
+  * debian/sddm.service: Now we start on VT1 we need to avoid collision
+    with plymouth. So take the startup ordering recommended in the
+    sddm.service comments, and currently in use by KDE Neon.
+
+ -- Rik Mills <rikmills@kubuntu.org>  Tue, 17 Apr 2018 13:39:09 +0100
+
+sddm (0.17.0-1ubuntu4) bionic; urgency=high
+
+  * Fix race between sddm and logind (LP: #1763977).
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sun, 15 Apr 2018 14:36:43 -0500
+
+sddm (0.17.0-1ubuntu3) bionic; urgency=medium
+
+  * Use VT1 by default now ubuntu has switched to this. Remaining on VT7
+    has already caused one issue with ubiquity-dm where it expects the
+    dm to conflict getty@getty1.service, but we do not. While this may
+    be fixed in ubiquity itself, sddm no longer has any reason in ubuntu
+    to force minumim VT7.
+    - debian/patches: drop 03_vt7-minimum-vt.diff
+    - debian/sddm.service: conflict getty@tty1.service rather than tty7
+
+ -- Rik Mills <rikmills@kubuntu.org>  Wed, 11 Apr 2018 07:50:07 +0100
+
+sddm (0.17.0-1ubuntu2) bionic; urgency=high
+
+  * Merge back in contents of 0.14.0-4ubuntu2 which were dropped during the
+    last Debian merge.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 31 Mar 2018 17:56:57 -0500
+
+sddm (0.17.0-1ubuntu1) bionic; urgency=medium
+
+  * Merge from Debian Sid. Remaining changes:
+    - Use the Breeze SDDM theme instead of the Maui one.
+    - Add kubuntu_nvidia-prime.diff to make sure NVIDIA Prime works.
+    - Keep the default-display-manager file logic in sddm.postinst.
+    - Add pam_kwallet.so to debian/sddm.pam.
+    - Update Vcs-* to point to Launchpad instead of Salsa.
+    - Add debian/conffiles.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sun, 25 Feb 2018 22:16:55 -0600
+
 sddm (0.17.0-1) unstable; urgency=medium
 
   [ Clive Johnston ]
@@ -138,6 +264,32 @@ sddm (0.15.0-1) unstable; urgency=medium
 
  -- Maximiliano Curia <maxy@debian.org>  Sat, 02 Sep 2017 23:57:41 +0200
 
+sddm (0.14.0-4ubuntu2) bionic; urgency=high
+
+  * Don't use an absolute path when setting $DESKTOP_SESSION (LP: #1668722).
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Sat, 10 Feb 2018 18:25:09 -0600
+
+sddm (0.14.0-4ubuntu1) artful; urgency=medium
+
+  [ Simon Quigley ]
+  * New upstream release (LP: #1627340).
+  * Merge from Debian. Remaining changes:
+    - Keep the default-display-manager file logic in sddm.postinst.
+    - Keep kubuntu-specific patches:
+      + kubuntu_nvidia-prime.diff
+      + kubuntu_minimum_vt.diff instead of 03_vt7-minimum-vt.diff
+  * Dropped changes:
+    - Remove debian/patches/upstream_autologin_fallback.diff as it's
+      reverse-applicable.
+  * Refresh patches.
+
+  [ Clive Johnston ]
+  * Re-apply 02_kubuntu_use_breeze.diff
+  * Update VCS to LP and replace maui theme for breeze in recommends.
+
+ -- Simon Quigley <tsimonq2@ubuntu.com>  Tue, 02 May 2017 18:55:40 +0100
+
 sddm (0.14.0-4) unstable; urgency=medium
 
   * Update documentation, add information about HiDPI
@@ -190,6 +342,46 @@ sddm (0.14.0-1) experimental; urgency=me
 
  -- Maximiliano Curia <maxy@debian.org>  Fri, 30 Dec 2016 20:41:13 +0100
 
+sddm (0.13.0-1ubuntu5) xenial; urgency=medium
+
+  * Cherry-pick cb768895c8e0d21c689d63f69d7ac668fe4e8fa6 so there is a working
+    way to login if autologin fails on an invalid session config
+
+ -- Philip Muškovac <yofel@kubuntu.org>  Fri, 15 Jan 2016 01:25:13 +0100
+
+sddm (0.13.0-1ubuntu4) xenial; urgency=medium
+
+  * Switch the watch file back to gz as xz lookup on GitHub isn't really
+    possible
+  * Restore kwallet4 auto-start that was dropped in the debian merge
+
+ -- Philip Muškovac <yofel@kubuntu.org>  Sun, 10 Jan 2016 15:40:55 +0100
+
+sddm (0.13.0-1ubuntu3) xenial; urgency=medium
+
+  * Mark wayland-session as a conffile as well
+  * Switch the watch file from gz to xz
+
+ -- Philip Muškovac <yofel@kubuntu.org>  Fri, 08 Jan 2016 11:15:01 +0100
+
+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@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)
+    remaining changes:
+    - keep the default-display-manager file logic in sddm.postinst
+    - keep kubuntu specific patches:
+      + kubuntu_nvidia-prime.diff
+      + kubuntu_minimum_vt.diff instead of 03_vt7-minimum-vt.diff
+
+ -- Philip Muškovac <yofel@kubuntu.org>  Tue, 05 Jan 2016 16:15:05 +0100
+
 sddm (0.13.0-1) unstable; urgency=medium
 
   * Team Upload
@@ -318,6 +510,56 @@ sddm (0.11.0-1) experimental; urgency=me
 
  -- Maximiliano Curia <maxy@debian.org>  Fri, 27 Mar 2015 21:27:38 +0100
 
+sddm (0.11.0-0ubuntu12) xenial; urgency=high
+
+  * Replace libsystemd-login-dev with libsystemd-dev.
+
+ -- Dimitri John Ledkov <xnox@ubuntu.com>  Mon, 04 Jan 2016 14:25:10 +0000
+
+sddm (0.11.0-0ubuntu11) wily; urgency=medium
+
+  * Fix postrm to remove what was if'd for as to avoid failure.
+  * Add pam_kwallet5 to the pam profile rules. It is the same version as
+    pam_kwallet but for kwallet5 (kwallet4 and kwallet5 are distinct entities
+    requiring separate unlocking)
+
+ -- Harald Sitter <sitter@kde.org>  Mon, 24 Aug 2015 12:40:32 +0200
+
+sddm (0.11.0-0ubuntu10) vivid; urgency=medium
+
+  * Add kubuntu_nvidia-prime-logout.diff from Alberto to run a script on
+    logout
+  * In kubuntu_nvidia-prime.diff run nvidia-switch on logout
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Fri, 10 Apr 2015 21:31:06 +0200
+
+sddm (0.11.0-0ubuntu9) vivid; urgency=medium
+
+  * Update sddm.postinst to create /etc/X11/default-display-manager
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 08 Apr 2015 21:48:55 +0200
+
+sddm (0.11.0-0ubuntu8) vivid; urgency=medium
+
+  * Add upstream_fix-zsh-Xsession.patch: fix Xsession with zsh from
+    upstream. LP: #1439826
+
+ -- Dan McGregor <dan.mcgregor@usask.ca>  Thu, 02 Apr 2015 11:26:39 -0600
+
+sddm (0.11.0-0ubuntu7) vivid; urgency=medium
+
+  * Add kubuntu_nvidia-prime.diff to run nvidia-prime setup script at
+    login
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Thu, 02 Apr 2015 16:07:55 +0200
+
+sddm (0.11.0-0ubuntu6) vivid; urgency=medium
+
+  * In kubuntu_minimum_vt.diff remove conflicts on tty1 in systemd
+    sddm.service
+
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Tue, 31 Mar 2015 16:37:15 +0200
+
 sddm (0.11.0-0ubuntu5) vivid; urgency=medium
 
   * Add upstream_add-graphical.target.diff from upstream
diff -pruN 0.19.0-2/debian/conffiles 0.19.0-2ubuntu1/debian/conffiles
--- 0.19.0-2/debian/conffiles	1970-01-01 00:00:00.000000000 +0000
+++ 0.19.0-2ubuntu1/debian/conffiles	2020-11-15 11:53:51.000000000 +0000
@@ -0,0 +1,3 @@
+/usr/share/sddm/scripts/Xsetup
+/usr/share/sddm/scripts/Xsession
+/usr/share/sddm/scripts/Xstop
diff -pruN 0.19.0-2/debian/control 0.19.0-2ubuntu1/debian/control
--- 0.19.0-2/debian/control	2020-11-09 19:38:45.000000000 +0000
+++ 0.19.0-2ubuntu1/debian/control	2020-11-15 11:53:51.000000000 +0000
@@ -24,8 +24,8 @@ Build-Depends: cmake (>= 2.8.8),
                systemd [linux-any],
 Standards-Version: 4.5.0
 Homepage: https://github.com/sddm/sddm
-Vcs-Browser: https://salsa.debian.org/qt-kde-team/3rdparty/sddm
-Vcs-Git: https://salsa.debian.org/qt-kde-team/3rdparty/sddm.git
+Vcs-Browser: https://git.launchpad.net/~ubuntu-qt-code/+git/sddm
+Vcs-Git: https://git.launchpad.net/~ubuntu-qt-code/+git/sddm
 Rules-Requires-Root: no
 
 Package: sddm
diff -pruN 0.19.0-2/debian/patches/02_use_debian_theme.diff 0.19.0-2ubuntu1/debian/patches/02_use_debian_theme.diff
--- 0.19.0-2/debian/patches/02_use_debian_theme.diff	2020-11-09 19:38:45.000000000 +0000
+++ 0.19.0-2ubuntu1/debian/patches/02_use_debian_theme.diff	2020-11-15 11:53:51.000000000 +0000
@@ -14,7 +14,7 @@ Forwarded: not-needed
          Section(Theme,
              Entry(ThemeDir,            QString,     _S(DATA_INSTALL_DIR "/themes"),             _S("Theme directory path"));
 -            Entry(Current,             QString,     _S(""),                                     _S("Current theme name"));
-+            Entry(Current,             QString,     _S("debian-theme"),                         _S("Current theme name"));
++            Entry(Current,             QString,     _S("ubuntu-theme"),                         _S("Current theme name"));
              Entry(FacesDir,            QString,     _S(DATA_INSTALL_DIR "/faces"),              _S("Global directory for user avatars\n"
                                                                                                     "The files should be named <username>.face.icon"));
              Entry(CursorTheme,         QString,     QString(),                                  _S("Cursor theme used in the greeter"));
diff -pruN 0.19.0-2/debian/patches/03_vt7-minimum-vt.diff 0.19.0-2ubuntu1/debian/patches/03_vt7-minimum-vt.diff
--- 0.19.0-2/debian/patches/03_vt7-minimum-vt.diff	2020-11-09 19:38:45.000000000 +0000
+++ 0.19.0-2ubuntu1/debian/patches/03_vt7-minimum-vt.diff	1970-01-01 00:00:00.000000000 +0000
@@ -1,21 +0,0 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde@lists.debian.org>
-Date: Fri, 11 Nov 2016 09:45:34 +0100
-Subject: Always minimum vt to 7
-
-maybe this will fix switching vt when installing packages and integration with ubiquity-dm?
-Last-Update: 2015-03-11
----
- CMakeLists.txt | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -141,7 +141,7 @@ if(SYSTEMD_FOUND)
-         string(REGEX REPLACE "[ \t\n]+" "" SYSTEMD_SYSTEM_UNIT_DIR ${SYSTEMD_SYSTEM_UNIT_DIR})
-     endif()
- 
--    set(MINIMUM_VT 1)
-+    set(MINIMUM_VT 7)
-     set(HALT_COMMAND "/bin/systemctl poweroff")
-     set(REBOOT_COMMAND "/bin/systemctl reboot")
- else()
diff -pruN 0.19.0-2/debian/patches/kubuntu_nvidia-prime.diff 0.19.0-2ubuntu1/debian/patches/kubuntu_nvidia-prime.diff
--- 0.19.0-2/debian/patches/kubuntu_nvidia-prime.diff	1970-01-01 00:00:00.000000000 +0000
+++ 0.19.0-2ubuntu1/debian/patches/kubuntu_nvidia-prime.diff	2020-11-15 11:53:51.000000000 +0000
@@ -0,0 +1,29 @@
+Description: run nvidia-prime setup on login
+Author: Jonathan Riddell <jriddell@ubuntu.com>
+Origin: me
+Bug: https://bugs.launchpad.net/ubuntu/+source/nvidia-prime/+bug/1428328
+Bug-SDDM: https://github.com/sddm/sddm/issues/393
+Forwarded: yes, although it's not very elegant so may not be accepted
+Last-Update: 2015-04-02
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/data/scripts/Xsetup
++++ b/data/scripts/Xsetup
+@@ -1,3 +1,7 @@
+ #!/bin/sh
+ # Xsetup - run as root before the login dialog appears
+ 
++if [ -e /sbin/prime-offload ]; then
++    echo running NVIDIA Prime setup /sbin/prime-offload
++    /sbin/prime-offload
++fi
+--- a/data/scripts/Xstop
++++ b/data/scripts/Xstop
+@@ -1,2 +1,7 @@
+ #!/bin/sh
+ # Xstop - run as root after stopping X
++
++if [ -e /sbin/prime-switch ]; then
++    echo running NVIDIA Prime switch /sbin/prime-switch
++    /sbin/prime-switch
++fi
diff -pruN 0.19.0-2/debian/patches/series 0.19.0-2ubuntu1/debian/patches/series
--- 0.19.0-2/debian/patches/series	2020-11-09 19:38:45.000000000 +0000
+++ 0.19.0-2ubuntu1/debian/patches/series	2020-11-15 11:53:51.000000000 +0000
@@ -1,7 +1,6 @@
 01_sddm_systemctl.diff
 02_use_debian_theme.diff
-03_vt7-minimum-vt.diff
 04_set_default_path.diff
 05_add_debian_themes.diff
-06_nvidia_prime_setup.diff
+kubuntu_nvidia-prime.diff
 upstream-2f034906d-use-only-basename-of-session.patch
diff -pruN 0.19.0-2/debian/sddm.postinst 0.19.0-2ubuntu1/debian/sddm.postinst
--- 0.19.0-2/debian/sddm.postinst	2020-11-09 19:38:45.000000000 +0000
+++ 0.19.0-2ubuntu1/debian/sddm.postinst	2020-11-15 11:53:51.000000000 +0000
@@ -37,17 +37,25 @@ fi
 # debconf is not a registry, so we only fiddle with the default file if it
 # does not exist
 if ! [ -e "$DEFAULT_DISPLAY_MANAGER_FILE" ]; then
-    if db_get shared/default-x-display-manager; then
-        if [ -z "$RET" ]; then
-            RET="$THIS_PACKAGE"
-        fi
-        if [ "$THIS_PACKAGE" != "$RET" ]; then
-            echo "Please be sure to run \"dpkg --configure $RET\"."
-        fi
-        if db_get "$RET"/daemon_name; then
-            echo "$RET" > "$DEFAULT_DISPLAY_MANAGER_FILE"
-        fi
+  DEFAULT_DISPLAY_MANAGER=
+  if db_get shared/default-x-display-manager; then
+    DEFAULT_DISPLAY_MANAGER="$RET"
+  fi
+  if [ -n "$DEFAULT_DISPLAY_MANAGER" ]; then
+    DAEMON_NAME=
+    if db_get "$DEFAULT_DISPLAY_MANAGER"/daemon_name; then
+      DAEMON_NAME="$RET"
     fi
+    if [ -z "$DAEMON_NAME" ]; then
+      # if we were unable to determine the name of the selected daemon (for
+      # instance, if the selected default display manager doesn't provide a
+      # daemon_name question), guess
+      DAEMON_NAME=$(which "$DEFAULT_DISPLAY_MANAGER" 2>/dev/null)
+    fi
+    if [ -n "$DAEMON_NAME" ]; then
+      echo "$DAEMON_NAME" > "$DEFAULT_DISPLAY_MANAGER_FILE"
+    fi
+  fi
 fi
 
 # remove the displaced old default display manager file if it exists
diff -pruN 0.19.0-2/debian/sddm.postrm 0.19.0-2ubuntu1/debian/sddm.postrm
--- 0.19.0-2/debian/sddm.postrm	2020-11-09 19:38:45.000000000 +0000
+++ 0.19.0-2ubuntu1/debian/sddm.postrm	2020-11-15 11:53:51.000000000 +0000
@@ -16,13 +16,13 @@ case "$1" in
         if [ -f /var/log/sddm.log ]; then rm /var/log/sddm.log; fi
 
         if getent passwd sddm >/dev/null; then
-            if which deluser > /dev/null; then
+            if [ -x /usr/sbin/deluser ]; then
                 deluser --system sddm >&2 ||
                     echo "Could not remove sddm user." >&2
             fi
         fi
         if getent group sddm >/dev/null; then
-            if which delgroup > /dev/null; then
+            if [ -x /usr/sbin/delgroup ]; then
                 delgroup --system sddm >&2 ||
                     echo "Could not remove sddm group." >&2
             fi
diff -pruN 0.19.0-2/debian/sddm.service 0.19.0-2ubuntu1/debian/sddm.service
--- 0.19.0-2/debian/sddm.service	2020-11-09 19:38:45.000000000 +0000
+++ 0.19.0-2ubuntu1/debian/sddm.service	2020-11-15 11:53:51.000000000 +0000
@@ -2,12 +2,8 @@
 Description=Simple Desktop Display Manager
 Documentation=man:sddm(1) man:sddm.conf(5)
 # Change this if you want to start sddm in a different tty
-Conflicts=getty@tty1.service getty@tty7.service
-After=getty@tty1.service getty@tty7.service
-
-After=systemd-user-sessions.service systemd-logind.service
-# Workaround entropy starvation
-After=haveged.service
+Conflicts=getty@tty1.service
+After=getty@tty1.service
 
 # If using tty1 and plymouth, sddm will fail till plymouth stops
 # consider using:
@@ -17,9 +13,15 @@ After=haveged.service
 ## After=plymouth-start.service plymouth-quit-wait.service
 ## OnFailure=plymouth-quit.service
 
+# Ordering
+Conflicts=plymouth-quit-wait.service
+After=systemd-user-sessions.service plymouth-start.service plymouth-quit-wait.service plymouth-quit.service systemd-logind.service
+OnFailure=plymouth-quit.service
+
 [Service]
 # temporary safety check until all DMs are converted to correct
 # display-manager.service symlink handling
+ExecStartPre=/bin/sh -c '[ "$(cat /etc/X11/default-display-manager 2>/dev/null)" = "/usr/bin/sddm" ]'
 ExecStart=/usr/bin/sddm
 Restart=always
 RestartSec=1s
diff -pruN 0.19.0-2/debian/sddm-theme-debian-elarun.postinst 0.19.0-2ubuntu1/debian/sddm-theme-debian-elarun.postinst
--- 0.19.0-2/debian/sddm-theme-debian-elarun.postinst	2020-11-09 19:38:45.000000000 +0000
+++ 0.19.0-2ubuntu1/debian/sddm-theme-debian-elarun.postinst	2020-11-15 11:53:51.000000000 +0000
@@ -3,8 +3,8 @@ set -e
 
 if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-remove" ]; then
     update-alternatives --install \
-        /usr/share/sddm/themes/debian-theme \
-        sddm-debian-theme \
+        /usr/share/sddm/themes/ubuntu-theme \
+        sddm-ubuntu-theme \
         /usr/share/sddm/themes/debian-elarun 50
 fi
 
diff -pruN 0.19.0-2/debian/sddm-theme-debian-elarun.prerm 0.19.0-2ubuntu1/debian/sddm-theme-debian-elarun.prerm
--- 0.19.0-2/debian/sddm-theme-debian-elarun.prerm	2020-11-09 19:38:45.000000000 +0000
+++ 0.19.0-2ubuntu1/debian/sddm-theme-debian-elarun.prerm	2020-11-15 11:53:51.000000000 +0000
@@ -3,7 +3,7 @@ set -e
 
 if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
     update-alternatives --remove \
-        sddm-debian-theme \
+        sddm-ubuntu-theme \
         /usr/share/sddm/themes/debian-elarun
 fi
 
diff -pruN 0.19.0-2/debian/sddm-theme-debian-maui.postinst 0.19.0-2ubuntu1/debian/sddm-theme-debian-maui.postinst
--- 0.19.0-2/debian/sddm-theme-debian-maui.postinst	2020-11-09 19:38:45.000000000 +0000
+++ 0.19.0-2ubuntu1/debian/sddm-theme-debian-maui.postinst	2020-11-15 11:53:51.000000000 +0000
@@ -3,8 +3,8 @@ set -e
 
 if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-remove" ]; then
     update-alternatives --install \
-        /usr/share/sddm/themes/debian-theme \
-        sddm-debian-theme \
+        /usr/share/sddm/themes/ubuntu-theme \
+        sddm-ubuntu-theme \
         /usr/share/sddm/themes/debian-maui 40
 fi
 
diff -pruN 0.19.0-2/debian/sddm-theme-debian-maui.prerm 0.19.0-2ubuntu1/debian/sddm-theme-debian-maui.prerm
--- 0.19.0-2/debian/sddm-theme-debian-maui.prerm	2020-11-09 19:38:45.000000000 +0000
+++ 0.19.0-2ubuntu1/debian/sddm-theme-debian-maui.prerm	2020-11-15 11:53:51.000000000 +0000
@@ -3,7 +3,7 @@ set -e
 
 if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
     update-alternatives --remove \
-        sddm-debian-theme \
+        sddm-ubuntu-theme \
         /usr/share/sddm/themes/debian-maui
 fi
 
diff -pruN 0.19.0-2/debian/sddm-theme-elarun.postinst 0.19.0-2ubuntu1/debian/sddm-theme-elarun.postinst
--- 0.19.0-2/debian/sddm-theme-elarun.postinst	2020-11-09 19:38:45.000000000 +0000
+++ 0.19.0-2ubuntu1/debian/sddm-theme-elarun.postinst	2020-11-15 11:53:51.000000000 +0000
@@ -3,8 +3,8 @@ set -e
 
 if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-remove" ]; then
     update-alternatives --install \
-        /usr/share/sddm/themes/debian-theme \
-        sddm-debian-theme \
+        /usr/share/sddm/themes/ubuntu-theme \
+        sddm-ubuntu-theme \
         /usr/share/sddm/themes/elarun 20
 fi
 
diff -pruN 0.19.0-2/debian/sddm-theme-elarun.prerm 0.19.0-2ubuntu1/debian/sddm-theme-elarun.prerm
--- 0.19.0-2/debian/sddm-theme-elarun.prerm	2020-11-09 19:38:45.000000000 +0000
+++ 0.19.0-2ubuntu1/debian/sddm-theme-elarun.prerm	2020-11-15 11:53:51.000000000 +0000
@@ -3,7 +3,7 @@ set -e
 
 if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
     update-alternatives --remove \
-        sddm-debian-theme \
+        sddm-ubuntu-theme \
         /usr/share/sddm/themes/elarun
 fi
 
diff -pruN 0.19.0-2/debian/sddm-theme-maldives.postinst 0.19.0-2ubuntu1/debian/sddm-theme-maldives.postinst
--- 0.19.0-2/debian/sddm-theme-maldives.postinst	2020-11-09 19:38:45.000000000 +0000
+++ 0.19.0-2ubuntu1/debian/sddm-theme-maldives.postinst	2020-11-15 11:53:51.000000000 +0000
@@ -3,8 +3,8 @@ set -e
 
 if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-remove" ]; then
     update-alternatives --install \
-        /usr/share/sddm/themes/debian-theme \
-        sddm-debian-theme \
+        /usr/share/sddm/themes/ubuntu-theme \
+        sddm-ubuntu-theme \
         /usr/share/sddm/themes/maldives 20
 fi
 
diff -pruN 0.19.0-2/debian/sddm-theme-maldives.prerm 0.19.0-2ubuntu1/debian/sddm-theme-maldives.prerm
--- 0.19.0-2/debian/sddm-theme-maldives.prerm	2020-11-09 19:38:45.000000000 +0000
+++ 0.19.0-2ubuntu1/debian/sddm-theme-maldives.prerm	2020-11-15 11:53:51.000000000 +0000
@@ -3,7 +3,7 @@ set -e
 
 if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
     update-alternatives --remove \
-        sddm-debian-theme \
+        sddm-ubuntu-theme \
         /usr/share/sddm/themes/maldives
 fi
 
diff -pruN 0.19.0-2/debian/sddm-theme-maui.postinst 0.19.0-2ubuntu1/debian/sddm-theme-maui.postinst
--- 0.19.0-2/debian/sddm-theme-maui.postinst	2020-11-09 19:38:45.000000000 +0000
+++ 0.19.0-2ubuntu1/debian/sddm-theme-maui.postinst	2020-11-15 11:53:51.000000000 +0000
@@ -3,8 +3,8 @@ set -e
 
 if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-remove" ]; then
     update-alternatives --install \
-        /usr/share/sddm/themes/debian-theme \
-        sddm-debian-theme \
+        /usr/share/sddm/themes/ubuntu-theme \
+        sddm-ubuntu-theme \
         /usr/share/sddm/themes/maui 20
 fi
 
diff -pruN 0.19.0-2/debian/sddm-theme-maui.prerm 0.19.0-2ubuntu1/debian/sddm-theme-maui.prerm
--- 0.19.0-2/debian/sddm-theme-maui.prerm	2020-11-09 19:38:45.000000000 +0000
+++ 0.19.0-2ubuntu1/debian/sddm-theme-maui.prerm	2020-11-15 11:53:51.000000000 +0000
@@ -3,7 +3,7 @@ set -e
 
 if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
     update-alternatives --remove \
-        sddm-debian-theme \
+        sddm-ubuntu-theme \
         /usr/share/sddm/themes/maui
 fi
 
diff -pruN 0.19.0-2/debian/sddm-theme-maya.postinst 0.19.0-2ubuntu1/debian/sddm-theme-maya.postinst
--- 0.19.0-2/debian/sddm-theme-maya.postinst	2020-11-09 19:38:45.000000000 +0000
+++ 0.19.0-2ubuntu1/debian/sddm-theme-maya.postinst	2020-11-15 11:53:51.000000000 +0000
@@ -3,8 +3,8 @@ set -e
 
 if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-remove" ]; then
     update-alternatives --install \
-        /usr/share/sddm/themes/debian-theme \
-        sddm-debian-theme \
+        /usr/share/sddm/themes/ubuntu-theme \
+        sddm-ubuntu-theme \
         /usr/share/sddm/themes/maya 20
 fi
 
diff -pruN 0.19.0-2/debian/sddm-theme-maya.prerm 0.19.0-2ubuntu1/debian/sddm-theme-maya.prerm
--- 0.19.0-2/debian/sddm-theme-maya.prerm	2020-11-09 19:38:45.000000000 +0000
+++ 0.19.0-2ubuntu1/debian/sddm-theme-maya.prerm	2020-11-15 11:53:51.000000000 +0000
@@ -3,7 +3,7 @@ set -e
 
 if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then
     update-alternatives --remove \
-        sddm-debian-theme \
+        sddm-ubuntu-theme \
         /usr/share/sddm/themes/maya
 fi
 
