diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2013-02-15 16:59:06 +0100 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2013-02-15 16:59:06 +0100 |
| commit | 683152f3b286a04a76f31ee1eed839bbdb2ab307 (patch) | |
| tree | fc382ee1f535909a1892d0e07ebeb957fa68c49f /ubuntu/maverick/tdeadmin | |
| parent | cbfc487458706037e61278c9b5263685619d47f0 (diff) | |
| download | tde-packaging-683152f3b286a04a76f31ee1eed839bbdb2ab307.tar.gz tde-packaging-683152f3b286a04a76f31ee1eed839bbdb2ab307.zip | |
Fix handling of diverts on Debian and Ubuntu
Diffstat (limited to 'ubuntu/maverick/tdeadmin')
| -rw-r--r-- | ubuntu/maverick/tdeadmin/debian/knetworkconf-trinity.postinst | 27 |
1 files changed, 20 insertions, 7 deletions
diff --git a/ubuntu/maverick/tdeadmin/debian/knetworkconf-trinity.postinst b/ubuntu/maverick/tdeadmin/debian/knetworkconf-trinity.postinst index bcb12994d..94012bd76 100644 --- a/ubuntu/maverick/tdeadmin/debian/knetworkconf-trinity.postinst +++ b/ubuntu/maverick/tdeadmin/debian/knetworkconf-trinity.postinst @@ -1,15 +1,28 @@ #! /bin/sh -e +package_name=knetworkconf-trinity + +divert_remove() + { + divert=`dpkg-divert --listpackage "$1"` + if [ -n "$divert" ] && [ "$divert" = "LOCAL" ]; then + dpkg-divert --remove --local --rename "$1" + fi + if [ -n "$divert" ] && [ "$divert" = "$package_name" ]; then + dpkg-divert --remove --package $package_name --rename "$1" + fi + } + case "$1" in configure) - dpkg-divert --remove /usr/share/icons/hicolor/16x16/apps/knetworkconf.png - dpkg-divert --remove /usr/share/icons/hicolor/22x22/apps/knetworkconf.png - dpkg-divert --remove /usr/share/icons/hicolor/32x32/apps/knetworkconf.png - dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png - dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_disconnected_lan.png - dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png - dpkg-divert --remove /usr/share/icons/hicolor/22x22/actions/network_traffic_wlan.png + divert_remove /usr/share/icons/hicolor/16x16/apps/knetworkconf.png + divert_remove /usr/share/icons/hicolor/22x22/apps/knetworkconf.png + divert_remove /usr/share/icons/hicolor/32x32/apps/knetworkconf.png + divert_remove /usr/share/icons/hicolor/22x22/actions/network_connected_lan_knc.png + divert_remove /usr/share/icons/hicolor/22x22/actions/network_disconnected_lan.png + divert_remove /usr/share/icons/hicolor/22x22/actions/network_disconnected_wlan.png + divert_remove /usr/share/icons/hicolor/22x22/actions/network_traffic_wlan.png ;; abort-upgrade) |