[SCM] breeze-plymouth packaging branch, master, updated. 2fffd50e73cbcac4ff423023f930fdd0a6238781

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 6f88a5255466f994de7a7b9eb070082f587ba578
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Tue Mar 14 09:18:12 2017 +0100

    Drop alternatives (plymouth-set-default-theme deletes the alternative anyway)
    
    Closes: 852110
---
 debian/plymouth-theme-breeze.postinst | 44 +++++------------------------------
 debian/plymouth-theme-breeze.prerm    | 32 +++++--------------------
 2 files changed, 12 insertions(+), 64 deletions(-)

diff --git a/debian/plymouth-theme-breeze.postinst b/debian/plymouth-theme-breeze.postinst
index 68c90aa..cf300f2 100644
--- a/debian/plymouth-theme-breeze.postinst
+++ b/debian/plymouth-theme-breeze.postinst
@@ -2,46 +2,14 @@
 
 #DEBHELPER#
 
-error()
-{
-    RET=$?
-    MSG=$1
-    echo "E: $MSG";
-    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
-        fi
-
-        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 ${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"
-        fi
-
-        if [ -e /boot/grub/grub.cfg ] && which update-grub2 >/dev/null 2>&1; then
-            update-grub2 || error "Failed to update-grub2"
-        fi
+        # Old theme location
+        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
+        # Remove old alternative (use plymouth-set-default-theme)
+        update-alternatives --remove default.plymouth /usr/share/plymouth/themes/breeze/breeze.plymouth || true
+        update-alternatives --remove text.plymouth /lib/plymouth/themes/breeze-text/breeze-text.plymouth || true
         ;;
 
     abort-upgrade|abort-deconfigure|abort-remove)
diff --git a/debian/plymouth-theme-breeze.prerm b/debian/plymouth-theme-breeze.prerm
index ddc2a73..c162078 100644
--- a/debian/plymouth-theme-breeze.prerm
+++ b/debian/plymouth-theme-breeze.prerm
@@ -2,34 +2,14 @@
 
 #DEBHELPER#
 
-error()
-{
-    RET=$?
-    MSG=$1
-    echo "E: $MSG";
-    exit $RET
-}
-
 case "$1" in
     remove)
-        update-alternatives --remove \
-	   default.plymouth /lib/plymouth/themes/breeze/breeze.plymouth ||
-           update-alternatives --remove \
-           default.plymouth /usr/share/plymouth/themes/breeze/breeze.plymouth ||
-           error "Failed to update-alternatives"
-        update-alternatives --remove \
-	   text.plymouth /lib/plymouth/themes/breeze-text/breeze-text.plymouth ||
-           update-alternatives --remove \
-           text.plymouth /usr/share/plymouth/themes/breeze-text/breeze-text.plymouth ||
-           error "Failed to update-alternatives text.plymouth"
-
-        if which update-initramfs >/dev/null 2>&1; then
-            update-initramfs -u || error "Failed to update-initramfs"
-        fi
-
-        if [ -e /boot/grub/grub.cfg ] && which update-grub2 >/dev/null 2>&1; then
-            update-grub2 || error "Failed to update-grub2"
-        fi
+        # Old theme location
+        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
+        # Remove old alternative (plymouth-set-default-theme)
+        update-alternatives --remove default.plymouth /usr/share/plymouth/themes/breeze/breeze.plymouth || true
+        update-alternatives --remove text.plymouth /lib/plymouth/themes/breeze-text/breeze-text.plymouth || true
         ;;
 
     purge)

-- 
breeze-plymouth packaging