[SCM] breeze-plymouth packaging branch, master, updated. 582490f8caa182c3de34252c9adb27bbc36434b3

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/breeze-plymouth.git;a=commitdiff;h=95ae73a

The following commit has been merged in the master branch:
commit 95ae73aeae41502e742bb3cb28621fb8f5374ec0
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Thu Apr 7 14:29:28 2016 +0100

    allow for new plymouth theme install dir in xenial
---
 debian/plymouth-theme-breeze.postinst | 29 ++++++++++++++++++++++-------
 1 file changed, 22 insertions(+), 7 deletions(-)

diff --git a/debian/plymouth-theme-breeze.postinst b/debian/plymouth-theme-breeze.postinst
index eae2402..b9aec35 100644
--- a/debian/plymouth-theme-breeze.postinst
+++ b/debian/plymouth-theme-breeze.postinst
@@ -10,17 +10,32 @@ error()
     exit $RET
 }
 
+if [ -e /usr/share/plymouth/themes/ ]; then
+    THEMEDIR=/usr/share/plymouth/themes/
+else
+    THEMEDIR=/lib/plymouth/themes/
+fi
+
 case "$1" in
     configure)
+        if [ -e /usr/share/plymouth/themes/ ]; then
+            #plymouth themes moved here in xenial
+            THEMEDIR=/usr/share/plymouth/themes/
+            update-alternatives --remove default.plymouth /lib/plymouth/themes/breeze/breeze.plymouth || true
+            update-alternatives --remove text.plymouth /lib/plymouth/themes/breeze-text/breeze-text.plymouth || true
+        else
+            THEMEDIR=/lib/plymouth/themes/
+        fi
+
         update-alternatives \
-            --install /lib/plymouth/themes/default.plymouth default.plymouth \
-                /lib/plymouth/themes/breeze/breeze.plymouth 160 \
-            --slave /lib/plymouth/themes/default.grub default.plymouth.grub \
-                /lib/plymouth/themes/breeze/breeze.grub || error "Failed to update-alternatives"
+            --install ${THEMEDIR}default.plymouth default.plymouth \
+            ${THEMEDIR}breeze/breeze.plymouth 160 \
+            --slave ${THEMEDIR}default.grub default.plymouth.grub \
+            ${THEMEDIR}breeze/breeze.grub || error "Failed to update-alternatives"
         update-alternatives \
-            --install /lib/plymouth/themes/text.plymouth text.plymouth \
-              /lib/plymouth/themes/breeze-text/breeze-text.plymouth 160 \
-	      || error "Failed to update-alternatives text.plymouth"
+            --install ${THEMEDIR}text.plymouth text.plymouth \
+            ${THEMEDIR}breeze-text/breeze-text.plymouth 160 \
+            || error "Failed to update-alternatives text.plymouth"
 
         if which update-initramfs >/dev/null 2>&1; then
             update-initramfs -u || error "Failed to update-initramfs"

-- 
breeze-plymouth packaging