Changeset 5cb21d1


Ignore:
Timestamp:
2014-10-05T22:04:38Z (10 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
4f7255d
Parents:
168d3bb (diff), c180110 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge changes from 3.2.2-1 Debian upload.

Location:
debian
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • debian/bitlbee-common.postinst

    r168d3bb r5cb21d1  
    6666fi
    6767
    68 # The official way to check if we're upgrading is to check if $2 is
    69 # non-empty. However, previous versions of BitlBee didn't have a
    70 # bitlbee-common package so in that case the var will also be empty.
    71 # Instead, check if the port is in use (if netstat is available). This
    72 # works since the debconf code will pick a free port on new installs.
    73 if [ "$BITLBEE_UPGRADE_DONT_RESTART" != "1" ]; then
    74         unset IS_UPGRADE
    75         if which netstat > /dev/null 2> /dev/null; then
    76                 netstat -an | grep -q :$PORT\\b.*LISTEN && IS_UPGRADE=1
    77         else
    78                 [ -n "$2" ] && IS_UPGRADE=1
    79         fi
    80         if [ -n "$IS_UPGRADE" ]; then
    81                 invoke-rc.d bitlbee restart
    82         fi
     68if [ "$BITLBEE_UPGRADE_DONT_RESTART" != "1" -a  -n "$2" ]; then
     69        invoke-rc.d bitlbee restart
    8370fi
    8471

  • debian/changelog

    r168d3bb r5cb21d1  
    1 bitlbee (3.2.1+otr4-2) UNRELEASED; urgency=medium
    2 
     1bitlbee (3.2.2-1) unstable; urgency=medium
     2
     3  [ Jelmer Vernooij ]
    34  * Bump standards version to 3.9.5 (no changes).
    45  * Remove obsolete DM-Upload-Allowed header.
    … …  
    910  * Support building against libgnutls28-dev. Closes: #753020
    1011
    11  -- Jelmer Vernooij <jelmer@debian.org>  Sun, 20 Jul 2014 01:19:30 +0200
     12  [ Wilmer van der Gaast ]
     13  * Merged 3.2.2 with a few later Debian-specific fixes for a belated
     14    3.2.2-1 upload. Apologies for the delay!
     15  * Removed stale workaround on upgrades from bitlbee <3.0 (with no
     16    bitlbee-common package).
     17
     18 -- Wilmer van der Gaast <wilmer@gaast.net>  Sun, 05 Oct 2014 22:11:12 +0100
    1219
    1320bitlbee (3.2.1+otr4-1) unstable; urgency=low
Note: See TracChangeset for help on using the changeset viewer.