From 23a3984dd985a08f71b8e80452ff5ee6b3cfed98 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Ruiz=20de=20Alegr=C3=ADa?= Date: Wed, 27 Jan 2021 10:42:15 +0100 Subject: [PATCH] Fix dpkg-divert, remove old configuration file Trolltech.conf --- debian/kali-themes.postinst | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/debian/kali-themes.postinst b/debian/kali-themes.postinst index 53530c96..08a06a60 100644 --- a/debian/kali-themes.postinst +++ b/debian/kali-themes.postinst @@ -49,6 +49,13 @@ install_config_file() { fi } +remove_config_file() { + rm -f $1 + dpkg-divert --rename --package kali-themes \ + --divert "$1.original" \ + --remove "$1" +} + if [ "$1" = "configure" ]; then if [ -z "$2" ]; then # Initial install @@ -69,7 +76,7 @@ if [ "$1" = "configure" ]; then if dpkg --compare-versions "$2" lt "2020.4.3"; then install_config_file /etc/xdg/qt5ct/qt5ct.conf force fi - if dpkg --compare-versions "$2" lt "2021.0.1"; then + if dpkg --compare-versions "$2" lt "2021.1.0"; then install_config_file /etc/xdg/kdeglobals force install_config_file /etc/xdg/qterminal.org/qterminal.ini force install_config_file /etc/xdg/xfce4/helpers.rc force @@ -78,6 +85,9 @@ if [ "$1" = "configure" ]; then install_config_file /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml force install_config_file /etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml force fi + if dpkg --compare-versions "$2" lt "2021.1.1"; then + remove_config_file /etc/xdg/Trolltech.conf + fi # Install remaining new files install_all fi