Cleanup diverts for plasma on Debian and Ubuntu

This resolves Bug 2055
pull/3/head
Slávek Banko 11 years ago
parent c7bb5f0b91
commit 71bb0a3c7a

@ -2,26 +2,30 @@
package_name=ksmserver-trinity package_name=ksmserver-trinity
divert_remove()
{
divert=`dpkg-divert --listpackage "$1"`
if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
if [ -e "$1" ]; then
rm "$1"
fi
dpkg-divert --remove --local --rename "$1"
fi
if [ -n "$divert" ] && [ "$divert" = "$package_name" ]; then
if [ -e "$1" ]; then
rm "$1"
fi
dpkg-divert --remove --package $package_name --rename "$1"
fi
}
case "$1" in case "$1" in
upgrade) upgrade)
# Remove old-style Plasma diversions # Remove old-style Plasma diversions
divert=`dpkg-divert --listpackage "/usr/bin/plasma"` divert_remove /usr/bin/plasma
if [ -n "$divert" ]; then divert_remove /usr/bin/plasma-desktop
if [ "$divert" = "LOCAL" ]; then
dpkg-divert --local --rename --remove /usr/bin/plasma
else
dpkg-divert --package $package_name --rename --remove /usr/bin/plasma
fi
fi
divert=`dpkg-divert --listpackage "/usr/bin/plasma-desktop"`
if [ -n "$divert" ]; then
if [ "$divert" = "LOCAL" ]; then
dpkg-divert --local --rename --remove /usr/bin/plasma-desktop
else
dpkg-divert --package $package_name --rename --remove /usr/bin/plasma-desktop
fi
fi
mkdir -p /usr/share/autostart mkdir -p /usr/share/autostart
;; ;;

@ -2,26 +2,30 @@
package_name=ksmserver-trinity package_name=ksmserver-trinity
divert_remove()
{
divert=`dpkg-divert --listpackage "$1"`
if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
if [ -e "$1" ]; then
rm "$1"
fi
dpkg-divert --remove --local --rename "$1"
fi
if [ -n "$divert" ] && [ "$divert" = "$package_name" ]; then
if [ -e "$1" ]; then
rm "$1"
fi
dpkg-divert --remove --package $package_name --rename "$1"
fi
}
case "$1" in case "$1" in
upgrade) upgrade)
# Remove old-style Plasma diversions # Remove old-style Plasma diversions
divert=`dpkg-divert --listpackage "/usr/bin/plasma"` divert_remove /usr/bin/plasma
if [ -n "$divert" ]; then divert_remove /usr/bin/plasma-desktop
if [ "$divert" = "LOCAL" ]; then
dpkg-divert --local --rename --remove /usr/bin/plasma
else
dpkg-divert --package $package_name --rename --remove /usr/bin/plasma
fi
fi
divert=`dpkg-divert --listpackage "/usr/bin/plasma-desktop"`
if [ -n "$divert" ]; then
if [ "$divert" = "LOCAL" ]; then
dpkg-divert --local --rename --remove /usr/bin/plasma-desktop
else
dpkg-divert --package $package_name --rename --remove /usr/bin/plasma-desktop
fi
fi
mkdir -p /usr/share/autostart mkdir -p /usr/share/autostart
;; ;;

@ -2,26 +2,30 @@
package_name=ksmserver-trinity package_name=ksmserver-trinity
divert_remove()
{
divert=`dpkg-divert --listpackage "$1"`
if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then
if [ -e "$1" ]; then
rm "$1"
fi
dpkg-divert --remove --local --rename "$1"
fi
if [ -n "$divert" ] && [ "$divert" = "$package_name" ]; then
if [ -e "$1" ]; then
rm "$1"
fi
dpkg-divert --remove --package $package_name --rename "$1"
fi
}
case "$1" in case "$1" in
upgrade) upgrade)
# Remove old-style Plasma diversions # Remove old-style Plasma diversions
divert=`dpkg-divert --listpackage "/usr/bin/plasma"` divert_remove /usr/bin/plasma
if [ -n "$divert" ]; then divert_remove /usr/bin/plasma-desktop
if [ "$divert" = "LOCAL" ]; then
dpkg-divert --local --rename --remove /usr/bin/plasma
else
dpkg-divert --package $package_name --rename --remove /usr/bin/plasma
fi
fi
divert=`dpkg-divert --listpackage "/usr/bin/plasma-desktop"`
if [ -n "$divert" ]; then
if [ "$divert" = "LOCAL" ]; then
dpkg-divert --local --rename --remove /usr/bin/plasma-desktop
else
dpkg-divert --package $package_name --rename --remove /usr/bin/plasma-desktop
fi
fi
mkdir -p /usr/share/autostart mkdir -p /usr/share/autostart
;; ;;

Loading…
Cancel
Save