From 2326eae13b401ab38741d7333a49f1f7a94ae8b9 Mon Sep 17 00:00:00 2001 From: Simon Quigley Date: Fri, 27 Jul 2018 08:21:08 -0500 Subject: [PATCH] Use the new ubuntu-theme virtual SDDM theme, and remove the Conflicts on the Breeze theme. --- debian/changelog | 7 +++++++ debian/control | 2 +- debian/sddm-theme-lubuntu.postinst | 6 +++--- debian/sddm-theme-lubuntu.prerm | 2 +- 4 files changed, 12 insertions(+), 5 deletions(-) diff --git a/debian/changelog b/debian/changelog index b3b172e..f371f1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +lubuntu-artwork (1.6) UNRELEASED; urgency=medium + + * Use the new ubuntu-theme virtual SDDM theme, and remove the Conflicts on + the Breeze theme. + + -- Simon Quigley Fri, 27 Jul 2018 08:20:05 -0500 + lubuntu-artwork (1.5) cosmic; urgency=medium * Change the SDDM theme wallpaper to the default 18.04 one. diff --git a/debian/control b/debian/control index b059bd1..797f322 100644 --- a/debian/control +++ b/debian/control @@ -50,7 +50,7 @@ Package: sddm-theme-lubuntu Architecture: all Depends: ${misc:Depends} Recommends: sddm -Conflicts: sddm-theme-breeze, sddm-theme-lubuntu-chooser (<< 1.4) +Conflicts: sddm-theme-lubuntu-chooser (<< 1.4) Replaces: sddm-theme-lubuntu-chooser (<< 1.4) Provides: sddm-theme Description: Lubuntu theme for SDDM X11 display manager diff --git a/debian/sddm-theme-lubuntu.postinst b/debian/sddm-theme-lubuntu.postinst index d7bbd99..c674a41 100644 --- a/debian/sddm-theme-lubuntu.postinst +++ b/debian/sddm-theme-lubuntu.postinst @@ -3,9 +3,9 @@ set -e if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-remove" ]; then update-alternatives --install \ - /usr/share/sddm/themes/breeze \ - breeze \ - /usr/share/sddm/themes/lubuntu 20 + /usr/share/sddm/themes/ubuntu-theme \ + sddm-ubuntu-theme \ + /usr/share/sddm/themes/lubuntu 50 fi # Tag to allow some debhelper commands to inject relevant code diff --git a/debian/sddm-theme-lubuntu.prerm b/debian/sddm-theme-lubuntu.prerm index b740fb7..a32e2df 100644 --- a/debian/sddm-theme-lubuntu.prerm +++ b/debian/sddm-theme-lubuntu.prerm @@ -3,7 +3,7 @@ set -e if [ "$1" = "remove" ] || [ "$1" = "deconfigure" ]; then update-alternatives --remove \ - breeze \ + sddm-ubuntu-theme \ /usr/share/sddm/themes/lubuntu fi