Merge branch 'master' of github.com:hanzz/libtransport

packaging/debian/build_spectrum2.sh

@@ -22,7 +22,7 @@ tar -czf spectrum2_$version.orig.tar.gz spectrum2-$version
 cp -r debian spectrum2-$version/debian
 
 cd spectrum2-$version
-debuild -i -us -uc
+DEB_BUILD_OPTIONS=nocheck debuild -i -us -uc
 
 cd ..
 

packaging/debian/debian/control

@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 7.0.50~), libpurple-dev, libswiften-dev,
  libpopt-dev, libdbus-glib-1-dev, libpqxx3-dev, cmake, libevent-dev, libboost-all-dev,
  libqt4-dev, libidn11-dev, libxml2-dev, libavahi-client-dev, libavahi-common-dev,
  libcurl4-openssl-dev, libcommuni-dev, libsqlite3-dev
-Standards-Version: 3.9.2
+Standards-Version: 3.9.6
 VCS-Browser: http://git.fsinf.at/apt/spectrum2
 VCS-Git: https://git.fsinf.at/apt/spectrum2.git
 Homepage: http://www.spectrum.im
@@ -183,22 +183,6 @@ Replaces: spectrum2-backend-smstools3-git-dbg
 Description: Spectrum2 backend for sending SMS - debugging symbols
  Debugging symbols for the Spectrum2 backend for sending SMS
 
-Package: spectrum2-backend-libyahoo2
-Architecture: any
-Section: net
-Priority: optional
-Depends: libtransport2.0 (= ${binary:Version}), libtransport-plugin2.0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Spectrum2 backend to connect Yahoo using libyahoo
- Spectrum2 backend using libyahoo
-
-Package: spectrum2-backend-libyahoo2-dbg
-Architecture: any
-Section: debug
-Priority: extra
-Depends: spectrum2-backend-libyahoo2 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
-Description: Spectrum2 backend to connect Yahoo using libyahoo - debugging symbols
- Debugging symbols for the Spectrum2 backend to connect Yahoo
-
 Package: spectrum2-backend-libcommuni
 Architecture: any
 Section: net

packaging/debian/debian/rules

@@ -22,7 +22,6 @@ override_dh_strip:
 	dh_strip -pspectrum2-backend-frotz --dbg-package=spectrum2-backend-frotz-dbg
 	dh_strip -pspectrum2-backend-swiften --dbg-package=spectrum2-backend-swiften-dbg
 	dh_strip -pspectrum2-backend-twitter --dbg-package=spectrum2-backend-twitter-dbg
-	dh_strip -pspectrum2-backend-libyahoo2 --dbg-package=spectrum2-backend-libyahoo2-dbg
 	dh_strip -pspectrum2-backend-libcommuni --dbg-package=spectrum2-backend-libcommuni-dbg
 	dh_strip -pspectrum2-backend-smstools3 --dbg-package=spectrum2-backend-smstools3-dbg
 	dh_strip -plibtransport2.0 --dbg-package=libtransport-dbg

tests/slack_jabber/bad_password.py

@@ -24,8 +24,7 @@ class Responder(sleekxmpp.ClientXMPP):
 		self.tests["abc_received"] = ["Test message received", False]
 
 	def message(self, msg):
-		if msg['body'] == "Not Authorized" or msg['body'] == "Server may require plaintext authentication over an unencrypted stream"
-		:
+		if msg['body'] == "Not Authorized" or msg['body'] == "Server may require plaintext authentication over an unencrypted stream":
 			self.tests["not_authorized"][1] = True
 		elif msg['body'].find("try using") != -1:
 			self.send_message(mto="spectrum2@spectrum2tests.xmpp.slack.com", mbody=".spectrum2 register client@localhost password #spectrum2_contactlist")