aboutsummaryrefslogtreecommitdiffstats
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog13
-rw-r--r--debian/control2
2 files changed, 9 insertions, 6 deletions
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 <jelmer@debian.org> 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 <wilmer@gaast.net> 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 <lintux@debian.org> 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 <wilmer@gaast.net>
Uploaders: Jelmer Vernooij <jelmer@debian.org>
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/