[debian-edu-commits] debian-edu/ 01/01: Make softwaves the default theme upon upgrades.

[Wolfgang Schweer]

This is an automated email from the git hooks/post-receive script.

schweer-guest pushed a commit to branch master
in repository debian-edu-artwork.

commit fb552be0b8d74084ab65d16a737c32dfe743a97d
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Mon Nov 14 20:17:11 2016 +0100

    Make softwaves the default theme upon upgrades.
    
    - Add lines and spacefun dir to debian-edu-artwork-softwaves.triggers.
    - Adjust debian-edu-artwork-softwaves.postinst to trigger configuration
      just in case d-e-a-(lines|spacefun) are installed after softwaves.
    
    (These changes should ensure a determined state after upgrades.)
---
 debian/changelog                             | 10 ++++++++++
 debian/debian-edu-artwork-softwaves.postinst |  7 ++++---
 debian/debian-edu-artwork-softwaves.triggers |  2 ++
 3 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a4831a7..2f7e57d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+debian-edu-artwork (0.901-2) UNRELEASED; urgency=medium
+
+  * Make softwaves the default theme upon upgrades.
+    - Add lines and spacefun dir to debian-edu-artwork-softwaves.triggers.
+    - Adjust debian-edu-artwork-softwaves.postinst to trigger configuration
+      just in case d-e-a-(lines|spacefun) are installed after softwaves.
+    (These changes should ensure a determined state after upgrades.)
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Mon, 14 Nov 2016 17:22:14 +0100
+
 debian-edu-artwork (0.901-1) unstable; urgency=medium
 
   [ Wolfgang Schweer ]
diff --git a/debian/debian-edu-artwork-softwaves.postinst b/debian/debian-edu-artwork-softwaves.postinst
index b8b50fa..2fee89d 100755
--- a/debian/debian-edu-artwork-softwaves.postinst
+++ b/debian/debian-edu-artwork-softwaves.postinst
@@ -6,13 +6,14 @@ set -e
 
 EDUTHEME="softwaves"
 
+# Make softwaves the default for stretch via triggers;
+# see debian-edu-artwork-softwaves.triggers
+
 case "$1" in
 	configure)
 		update-debian-edu-artwork-$EDUTHEME configure
 	;;
 	triggered)
-                if readlink /usr/share/plasma/shells/org.kde.plasma.desktop/contents/updates/20-desktop-base-edu.js | grep $EDUTHEME ; then
-		    update-debian-edu-artwork-$EDUTHEME configure
-		fi
+		update-debian-edu-artwork-$EDUTHEME configure
 	;;
 esac
diff --git a/debian/debian-edu-artwork-softwaves.triggers b/debian/debian-edu-artwork-softwaves.triggers
index 6973167..266cdc8 100644
--- a/debian/debian-edu-artwork-softwaves.triggers
+++ b/debian/debian-edu-artwork-softwaves.triggers
@@ -1 +1,3 @@
 interest /usr/share/plasma/desktoptheme
+interest /usr/share/doc/debian-edu-artwork-lines
+interest /usr/share/doc/debian-edu-artwork-spacefun

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-edu/debian-edu-artwork.git