[debian-edu-commits] [Git][debian-edu/debian-edu-artwork][master] debian/update-debian-edu-artwork-*: Properly remove the other unwanted edu themes on configure.

[Mike Gabriel]

Mike Gabriel pushed to branch master at Debian Edu / debian-edu-artwork


Commits:
c57df388 by Mike Gabriel at 2018-12-04T14:51:28Z
debian/update-debian-edu-artwork-*: Properly remove the other unwanted edu themes on configure.

- - - - -


4 changed files:

- debian/changelog
- debian/update-debian-edu-artwork-buster
- debian/update-debian-edu-artwork-lines
- debian/update-debian-edu-artwork-softwaves


Changes:

=====================================
debian/changelog
=====================================
@@ -3,6 +3,8 @@ debian-edu-artwork (2.10.1.0.3-2) UNRELEASED; urgency=medium
   * debian/*.triggers:
     + Add changes on the spacefun theme package as interest-noawait triggers.
       Also fix incomplete triggers of previous artwork themes.
+  * debian/update-debian-edu-artwork-*:
+    + Properly remove the other unwanted edu themes on configure.
 
  -- Mike Gabriel <sunweaver at debian.org>  Tue, 04 Dec 2018 15:42:06 +0100
 


=====================================
debian/update-debian-edu-artwork-buster
=====================================
@@ -145,6 +145,10 @@ case "$1" in
 		if [ -x /usr/sbin/update-debian-edu-artwork-softwaves ]; then
 			update-debian-edu-artwork-softwaves remove
 		fi
+		# honour themes shipped in src:pkg debian-edu-artwork-legacy
+		if [ -x /usr/sbin/update-debian-edu-artwork-spacefun ]; then
+			update-debian-edu-artwork-spacefun remove
+		fi
 		set_active_theme
 		change_ldm_background
 		change_grub_background


=====================================
debian/update-debian-edu-artwork-lines
=====================================
@@ -133,9 +133,13 @@ restore_lockscreen() {
 
 case "$1" in
 	configure)
+		if [ -x /usr/sbin/update-debian-edu-artwork-buster ]; then
+			update-debian-edu-artwork-buster remove
+		fi
 		if [ -x /usr/sbin/update-debian-edu-artwork-softwaves ]; then
 			update-debian-edu-artwork-softwaves remove
 		fi
+		# honour themes shipped in src:pkg debian-edu-artwork-legacy
 		if [ -x /usr/sbin/update-debian-edu-artwork-spacefun ]; then
 			update-debian-edu-artwork-spacefun remove
 		fi


=====================================
debian/update-debian-edu-artwork-softwaves
=====================================
@@ -141,9 +141,13 @@ restore_lockscreen() {
 
 case "$1" in
 	configure)
+		if [ -x /usr/sbin/update-debian-edu-artwork-buster ]; then
+			update-debian-edu-artwork-buster remove
+		fi
 		if [ -x /usr/sbin/update-debian-edu-artwork-lines ]; then
 			update-debian-edu-artwork-lines remove
 		fi
+		# honour themes shipped in src:pkg debian-edu-artwork-legacy
 		if [ -x /usr/sbin/update-debian-edu-artwork-spacefun ]; then
 			update-debian-edu-artwork-spacefun remove
 		fi



View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-artwork/commit/c57df3883bc25ac61c88bfbc8833c1adbadea054

-- 
View it on GitLab: https://salsa.debian.org/debian-edu/debian-edu-artwork/commit/c57df3883bc25ac61c88bfbc8833c1adbadea054
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-edu-commits/attachments/20181204/5fc751a6/attachment-0001.html>