Changeset 3a8b850

Timestamp:

2014-10-05T21:24:36Z (10 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

c180110

Parents:

778ea8a

Message:

Merging two other Debian fixes in preparation for a 3.2.2-1 upload.

Files:

• Makefile (modified) (1 diff)
• debian/changelog (modified) (3 diffs)
• debian/control (modified) (1 diff)

Makefile

@@ -147 +147 @@
 endif
 
-install-systemd:
+install-systemd: systemd
 ifdef SYSTEMDSYSTEMUNITDIR
 ifeq ($(shell id -u),0)

debian/changelog

@@ -1 @@
-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.
@@ -7 +8 @@
   * Don't ignore failure of invoke-rc.d; fixes lintian warning.
   * Use my Debian e-mail address in Uploaders.
-
- -- Jelmer Vernooij <jelmer@debian.org>  Sun, 20 Jul 2014 01:19:30 +0200
+  * 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!
+
+ -- Wilmer van der Gaast <wilmer@gaast.net>  Sun, 05 Oct 2014 22:11:12 +0100
 
 bitlbee (3.2.1+otr4-1) unstable; urgency=low
@@ -643 +649 @@
  -- Wilmer van der Gaast <lintux@debian.org>  Wed, 10 Jul 2002 11:02:28 +0200
 
-Local variables:
-mode: debian-changelog
-End:

debian/control

@@ -5 +5 @@
 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/