diff options
| -rw-r--r-- | debian/bitlbee-common.postinst | 17 | ||||
| -rw-r--r-- | debian/changelog | 2 |
2 files changed, 4 insertions, 15 deletions
diff --git a/debian/bitlbee-common.postinst b/debian/bitlbee-common.postinst index 3225a02a..4587ce7a 100644 --- a/debian/bitlbee-common.postinst +++ b/debian/bitlbee-common.postinst @@ -65,21 +65,8 @@ if [ -e /usr/share/bitlbee/help.upgrading ]; then fi fi -# The official way to check if we're upgrading is to check if $2 is -# non-empty. However, previous versions of BitlBee didn't have a -# bitlbee-common package so in that case the var will also be empty. -# Instead, check if the port is in use (if netstat is available). This -# works since the debconf code will pick a free port on new installs. -if [ "$BITLBEE_UPGRADE_DONT_RESTART" != "1" ]; then - unset IS_UPGRADE - if which netstat > /dev/null 2> /dev/null; then - netstat -an | grep -q :$PORT\\b.*LISTEN && IS_UPGRADE=1 - else - [ -n "$2" ] && IS_UPGRADE=1 - fi - if [ -n "$IS_UPGRADE" ]; then - invoke-rc.d bitlbee restart - fi +if [ "$BITLBEE_UPGRADE_DONT_RESTART" != "1" -a -n "$2" ]; then + invoke-rc.d bitlbee restart fi ## If we're upgrading, we'll probably skip this next part diff --git a/debian/changelog b/debian/changelog index b0a0e12c..8189bf21 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,8 @@ bitlbee (3.2.2-1) unstable; urgency=medium [ Wilmer van der Gaast ] * Merged 3.2.2 with a few later Debian-specific fixes for a belated 3.2.2-1 upload. Apologies for the delay! + * Removed stale workaround on upgrades from bitlbee <3.0 (with no + bitlbee-common package). -- Wilmer van der Gaast <wilmer@gaast.net> Sun, 05 Oct 2014 22:11:12 +0100 |