Commit 383139c3 authored by Jonathan Carter's avatar Jonathan Carter

Fix diverts

parent 5ec79c03
calamares-settings-debian (10.0.10-2) unstable; urgency=medium
* Fix diverts (Closes: #909492)
-- Jonathan Carter <jcc@debian.org> Tue, 25 Sep 2018 14:32:01 +0200
calamares-settings-debian (10.0.10-1) unstable; urgency=medium
* New upstream release
......
......@@ -3,3 +3,6 @@ calamares-settings-debian: binary-without-manpage
# sudo is from another package but validly so
calamares-settings-debian: desktop-command-not-in-package
# We don't provide this file on purpose
calamares-settings-debian: diversion-for-unknown-file
......@@ -5,7 +5,7 @@ case "$1" in
remove)
# Restore original Calamares icon
dpkg-divert --quiet --rename --package calamares-settings-debian \
--remove /usr/share/applications/calamares.desktop
--remove /usr/share/applications/calamares.desktop
;;
esac
......
......@@ -3,17 +3,10 @@ set -e
case "$1" in
install|upgrade)
cleanup_and_divert() {
# Play it safe because diverts can go wrong
if [ -f $1.orig ]; then
mv $1.orig $1
fi
dpkg-divert --quiet --package calamares-settings-debian \
--divert $1.orig --rename $1
}
# Calamares .desktop file
cleanup_and_divert /usr/share/applications/calamares.desktop
# Hide upstream calamares icon when this package is installed
dpkg-divert --quiet --package calamares-settings-debian \
--divert /usr/share/applications/calamares.desktop.orig \
--rename /usr/share/applications/calamares.desktop
;;
esac
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment