[debian-edu-commits] debian-edu/ 01/01: Avoid conflict in case d-e-a-softwaves is configured before plymouth.

[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 98693616db07280afb75263d7c36a2b66e4aeaa2
Author: Wolfgang Schweer <wschweer at arcor.de>
Date:   Wed Nov 23 14:40:03 2016 +0100

    Avoid conflict in case d-e-a-softwaves is configured before plymouth.
    
    - Check plymouth status in debian-edu-artwork-softwaves.postinst and
      add /etc/plymouth to debian-edu-artwork-softwaves.triggers.
    - Configure d-e-a-(lines|softwaves|spacefun) only if
      /etc/plymouth/plymouthd.conf exists.
---
 debian/changelog                             | 10 ++++++++++
 debian/debian-edu-artwork-softwaves.postinst |  3 +++
 debian/debian-edu-artwork-softwaves.triggers |  1 +
 debian/update-debian-edu-artwork-lines       |  4 ++--
 debian/update-debian-edu-artwork-softwaves   |  4 ++--
 debian/update-debian-edu-artwork-spacefun    |  4 ++--
 6 files changed, 20 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 70a4bb7..4ce3175 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+debian-edu-artwork (0.901-3) UNRELEASED; urgency=medium
+
+  * Avoid conflict in case d-e-a-softwaves is configured before plymouth.
+    - Check plymouth status in debian-edu-artwork-softwaves.postinst and
+      add /etc/plymouth to debian-edu-artwork-softwaves.triggers.
+    - Configure d-e-a-(lines|softwaves|spacefun) only if
+      /etc/plymouth/plymouthd.conf exists.
+
+ -- Wolfgang Schweer <wschweer at arcor.de>  Wed, 23 Nov 2016 13:52:47 +0100
+
 debian-edu-artwork (0.901-2) unstable; urgency=medium
 
   [ Wolfgang Schweer ]
diff --git a/debian/debian-edu-artwork-softwaves.postinst b/debian/debian-edu-artwork-softwaves.postinst
index 2fee89d..74e3e16 100755
--- a/debian/debian-edu-artwork-softwaves.postinst
+++ b/debian/debian-edu-artwork-softwaves.postinst
@@ -15,5 +15,8 @@ case "$1" in
 	;;
 	triggered)
 		update-debian-edu-artwork-$EDUTHEME configure
+		if [ -f /etc/plymouth/plymouthd.conf ] && which plymouth-set-default-theme > /dev/null ; then
+			plymouth-set-default-theme -R debian-edu-${EDUTHEME}
+		fi
 	;;
 esac
diff --git a/debian/debian-edu-artwork-softwaves.triggers b/debian/debian-edu-artwork-softwaves.triggers
index 266cdc8..6a33aed 100644
--- a/debian/debian-edu-artwork-softwaves.triggers
+++ b/debian/debian-edu-artwork-softwaves.triggers
@@ -1,3 +1,4 @@
 interest /usr/share/plasma/desktoptheme
+interest /etc/plymouth
 interest /usr/share/doc/debian-edu-artwork-lines
 interest /usr/share/doc/debian-edu-artwork-spacefun
diff --git a/debian/update-debian-edu-artwork-lines b/debian/update-debian-edu-artwork-lines
index 70a30f3..3162f87 100755
--- a/debian/update-debian-edu-artwork-lines
+++ b/debian/update-debian-edu-artwork-lines
@@ -130,8 +130,8 @@ unlink_kde_base_edu_js() {
 
 ## Plymouth
 set_plymouth_theme() {
-	if which plymouth-set-default-theme > /dev/null ; then
-	    plymouth-set-default-theme -R debian-edu-${EDUTHEME} || true
+	if [ -f /etc/plymouth/plymouthd.conf ] && which plymouth-set-default-theme > /dev/null ; then
+		plymouth-set-default-theme -R debian-edu-${EDUTHEME} || true
 	fi
 }
 
diff --git a/debian/update-debian-edu-artwork-softwaves b/debian/update-debian-edu-artwork-softwaves
index d405d5c..0d1d628 100755
--- a/debian/update-debian-edu-artwork-softwaves
+++ b/debian/update-debian-edu-artwork-softwaves
@@ -130,8 +130,8 @@ unlink_kde_base_edu_js() {
 
 ## Plymouth
 set_plymouth_theme() {
-	if which plymouth-set-default-theme > /dev/null ; then
-	    plymouth-set-default-theme -R debian-edu-${EDUTHEME} || true
+	if [ -f /etc/plymouth/plymouthd.conf ] && which plymouth-set-default-theme > /dev/null ; then
+		plymouth-set-default-theme -R debian-edu-${EDUTHEME} || true
 	fi
 }
 
diff --git a/debian/update-debian-edu-artwork-spacefun b/debian/update-debian-edu-artwork-spacefun
index f2cf63d..be0b0cb 100755
--- a/debian/update-debian-edu-artwork-spacefun
+++ b/debian/update-debian-edu-artwork-spacefun
@@ -121,8 +121,8 @@ unlink_kde_base_edu_js() {
 
 ## Plymouth
 set_plymouth_theme() {
-	if which plymouth-set-default-theme > /dev/null ; then
-	    plymouth-set-default-theme -R debian-edu-${EDUTHEME} || true
+	if [ -f /etc/plymouth/plymouthd.conf ] && which plymouth-set-default-theme > /dev/null ; then
+		plymouth-set-default-theme -R debian-edu-${EDUTHEME} || true
 	fi
 }
 

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