4 files changed, 19 insertions, 12 deletions

diff --git a/debian/changelog b/debian/changelog
index 8e423588..e40fefdc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,17 @@
-bitlbee (3.4.2-1) UNRELEASED; urgency=medium
+bitlbee (3.4.2-1) unstable; urgency=medium
 
+  [ Jelmer Vernooij ]
   * Make the build reproducible by not encoding ARCH / CPU defines in
     the binary.
   * Fix Vcs-* control headers after migration to Git.
+  * Don't start synopsis with an article.
+  * Bump standards version to 3.9.8 (no changes).
+  * Use dh_prep rather than deprecated 'dh_clean -k'.
 
- -- Jelmer Vernooij <jelmer@debian.org>  Sun, 15 May 2016 17:15:13 +0000
+  [ Wilmer van der Gaast ]
+  * New upstream release.
+
+ -- Wilmer van der Gaast <wilmer@gaast.net>  Sun, 12 Jun 2016 22:31:18 +0100
 
 bitlbee (3.4.1-1) unstable; urgency=medium
 
diff --git a/debian/control b/debian/control
index d5283d6e..9da8ce9d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: bitlbee
 Section: net
 Priority: optional
 Maintainer: Wilmer van der Gaast <wilmer@gaast.net>
-Uploaders: Jelmer Vernooij <jelmer@debian.org>
-Standards-Version: 3.9.5
+Uploaders: Jelmer Vernooij <jelmer@debian.org>
+Standards-Version: 3.9.8
 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~)
 Homepage: http://www.bitlbee.org/
 Vcs-Git: https://github.com/bitlbee/bitlbee
@@ -14,7 +14,7 @@ Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${source:Version})
 Conflicts: bitlbee-libpurple
 Replaces: bitlbee-libpurple
-Description: An IRC to other chat networks gateway (default version)
+Description: IRC to other chat networks gateway (default version)
  This program can be used as an IRC server which forwards everything you
  say to people on other chat networks: Jabber (which includes Google Talk
  and Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
@@ -24,7 +24,7 @@ Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, debianutils (>= 1.16), bitlbee-common (= ${source:Version})
 Conflicts: bitlbee
 Replaces: bitlbee
-Description: An IRC to other chat networks gateway (using libpurple)
+Description: IRC to other chat networks gateway (using libpurple)
  This program can be used as an IRC server which forwards everything you
  say to people on other chat networks: Jabber (which includes Google Talk
  and Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
@@ -40,7 +40,7 @@ Package: bitlbee-common
 Architecture: all
 Depends: ${misc:Depends}, net-tools, adduser
 Replaces: bitlbee
-Description: An IRC to other chat networks gateway (common files/docs)
+Description: IRC to other chat networks gateway (common files/docs)
  This program can be used as an IRC server which forwards everything you
  say to people on other chat networks: Jabber (which includes Google Talk
  and Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
@@ -51,7 +51,7 @@ Description: An IRC to other chat networks gateway (common files/docs)
 Package: bitlbee-dev
 Architecture: all
 Depends: ${misc:Depends}, bitlbee (>= ${source:Version}) | bitlbee-libpurple (>= ${source:Version}), bitlbee (<< ${source:Version}.1~) | bitlbee-libpurple (<< ${source:Version}.1~), bitlbee-common (= ${source:Version})
-Description: An IRC to other chat networks gateway (dev files)
+Description: IRC to other chat networks gateway (dev files)
  This program can be used as an IRC server which forwards everything you
  say to people on other chat networks: Jabber (which includes Google Talk
  and Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
@@ -61,7 +61,7 @@ Description: An IRC to other chat networks gateway (dev files)
 Package: bitlbee-plugin-otr
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${binary:Version}) | bitlbee-libpurple (= ${binary:Version}), bitlbee-common (= ${source:Version})
-Description: An IRC to other chat networks gateway (OTR plugin)
+Description: IRC to other chat networks gateway (OTR plugin)
  This program can be used as an IRC server which forwards everything you
  say to people on other chat networks: Jabber (which includes Google Talk
  and Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
@@ -73,7 +73,7 @@ Package: bitlbee-plugin-skype
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, bitlbee (= ${binary:Version}) | bitlbee-libpurple (= ${binary:Version}), bitlbee-common (= ${source:Version})
 Recommends: skyped
-Description: An IRC to other chat networks gateway (Skype plugin)
+Description: IRC to other chat networks gateway (Skype plugin)
  This program can be used as an IRC server which forwards everything you
  say to people on other chat networks: Jabber (which includes Google Talk
  and Facebook Chat), ICQ, AIM, MSN, Yahoo! and Twitter/Identica/Status.net.
diff --git a/debian/rules b/debian/rules
index e0ffb898..febb1922 100755
--- a/debian/rules
+++ b/debian/rules
@@ -71,7 +71,7 @@ clean:
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k
+	dh_prep
 	dh_installdirs
 
 	$(MAKE) -C debian/build-native install-bin DESTDIR=`pwd`/debian/bitlbee
diff --git a/protocols/jabber/sasl.c b/protocols/jabber/sasl.c
index aa43def0..7778af1f 100644
--- a/protocols/jabber/sasl.c
+++ b/protocols/jabber/sasl.c
@@ -89,7 +89,7 @@ xt_status sasl_pkt_mechanisms(struct xt_node *node, gpointer data)
 	}
 
 	if (!want_oauth && !sup_plain && !sup_digest) {
-		if (!sup_gtalk) {
+		if (sup_gtalk) {
 			imcb_error(ic, "This server requires OAuth "
 			           "(supported schemes:%s)", mechs->str);
 		} else {