Changes in / [5cb21d1:168d3bb]

Location:

debian

Files:

• bitlbee-common.postinst (modified) (1 diff)
• changelog (modified) (2 diffs)

debian/bitlbee-common.postinst

@@ -66 +66 @@
 fi
 
-if [ "$BITLBEE_UPGRADE_DONT_RESTART" != "1" -a  -n "$2" ]; then
-        invoke-rc.d bitlbee restart
+# 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
 fi
 

debian/changelog

@@ -1 @@
-bitlbee (3.2.2-1) unstable; urgency=medium
-
-  [ Jelmer Vernooij ]
+bitlbee (3.2.1+otr4-2) UNRELEASED; urgency=medium
+
   * Bump standards version to 3.9.5 (no changes).
   * Remove obsolete DM-Upload-Allowed header.
@@ -10 +9 @@
   * Support building against libgnutls28-dev. Closes: #753020
 
-  [ 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
+ -- Jelmer Vernooij <jelmer@debian.org>  Sun, 20 Jul 2014 01:19:30 +0200
 
 bitlbee (3.2.1+otr4-1) unstable; urgency=low