From 3a8b8501028b7910ac1d2cfef76f2c72d81dc6e1 Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Sun, 5 Oct 2014 22:24:36 +0100 Subject: Merging two other Debian fixes in preparation for a 3.2.2-1 upload. --- Makefile | 2 +- debian/changelog | 13 ++++++++----- debian/control | 2 +- 3 files changed, 10 insertions(+), 7 deletions(-) diff --git a/Makefile b/Makefile index 96c5a4c2..12015b11 100644 --- a/Makefile +++ b/Makefile @@ -146,7 +146,7 @@ ifdef SYSTEMDSYSTEMUNITDIR sed 's|@sbindir@|$(SBINDIR)|' $(_SRCDIR_)init/bitlbee@.service.in > init/bitlbee@.service endif -install-systemd: +install-systemd: systemd ifdef SYSTEMDSYSTEMUNITDIR ifeq ($(shell id -u),0) mkdir -p $(DESTDIR)$(SYSTEMDSYSTEMUNITDIR) diff --git a/debian/changelog b/debian/changelog index 9d4dfd6d..b0a0e12c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,19 @@ -bitlbee (3.2.1+otr4-2) UNRELEASED; urgency=medium +bitlbee (3.2.2-1) unstable; urgency=medium + [ Jelmer Vernooij ] * Bump standards version to 3.9.5 (no changes). * Remove obsolete DM-Upload-Allowed header. * Build with dpkg-flags, for hardening. * Force re-building of user guide on Debian. * Don't ignore failure of invoke-rc.d; fixes lintian warning. * Use my Debian e-mail address in Uploaders. + * Support building against libgnutls28-dev. Closes: #753020 - -- Jelmer Vernooij Sun, 20 Jul 2014 01:19:30 +0200 + [ 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! + + -- Wilmer van der Gaast Sun, 05 Oct 2014 22:11:12 +0100 bitlbee (3.2.1+otr4-1) unstable; urgency=low @@ -642,6 +648,3 @@ bitlbee (0.6-1) unstable; urgency=low -- Wilmer van der Gaast Wed, 10 Jul 2002 11:02:28 +0200 -Local variables: -mode: debian-changelog -End: diff --git a/debian/control b/debian/control index 63952dc5..b9c430f5 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: optional Maintainer: Wilmer van der Gaast Uploaders: Jelmer Vernooij Standards-Version: 3.9.5 -Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls-dev | gnutls-dev, po-debconf, libpurple-dev, libotr5-dev, debhelper (>= 6.0.7~), asciidoc +Build-Depends: libglib2.0-dev (>= 2.4), libevent-dev, libgnutls28-dev | libgnutls-dev | gnutls-dev, po-debconf, libpurple-dev, libotr5-dev, debhelper (>= 6.0.7~), asciidoc Homepage: http://www.bitlbee.org/ Vcs-Bzr: http://code.bitlbee.org/bitlbee/ -- cgit v1.2.3 From c180110d9108f7d16aeac58aafea5114074ba39b Mon Sep 17 00:00:00 2001 From: Wilmer van der Gaast Date: Sun, 5 Oct 2014 23:02:56 +0100 Subject: 3.2.2-1. Minor change, removed very old compatibility kludge. --- debian/bitlbee-common.postinst | 17 ++--------------- 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 Sun, 05 Oct 2014 22:11:12 +0100 -- cgit v1.2.3