libtransport.git Changeset - c8a48fa5e79c

Changeset - c8a48fa5e79c

Parent rev.

Child rev.

[Not reviewed]

Merge 2.0.0

0 6 0

Jan Kaluza - 10 years ago 2015-12-29 09:32:13
jkaluza@redhat.com

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

4 files changed with 3 insertions and 21 deletions:

packaging/debian/build_spectrum2.sh

packaging/debian/debian/control

packaging/debian/debian/rules

tests/slack_jabber/bad_password.py

0 comments (0 inline, 0 general)

packaging/debian/build_spectrum2.sh

➞

Show inline comments

@@ @@ -13,17 +13,17 @@ version=$vercount-$gitrev @@
 sed -i "1s/\((.*)\)/(1:$version-1)/" debian/changelog
 rm -rf spectrum2_*
 git clone ../../.git spectrum2-$version
 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 ..
 rm -rf spectrum2-$version

packaging/debian/debian/control

➞

Show inline comments

 Source: spectrum2
 Section: net
 Priority: optional
 Maintainer: Mathias Ertl <apt-repository@fsinf.at>
 Build-Depends: debhelper (>= 7.0.50~), libpurple-dev, libswiften-dev,
  libprotobuf-dev, libmysqlclient-dev, liblog4cxx10-dev, protobuf-compiler,
  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
 Package: libtransport2.0
 Architecture: any
 Section: net
 Priority: optional
 Depends: libswiften2, ${shlibs:Depends}, ${misc:Depends}
 Replaces: libtransport2.0-git
 Description: XMPP transport
  Spectrum 2 XMPP transport - development snapshots
@@ @@ -174,40 +174,24 @@ Replaces: spectrum2-backend-smstools3-git @@
 Description: Spectrum2 backend for sending SMS
  Spectrum2 backend using smstools3
 Package: spectrum2-backend-smstools3-dbg
 Architecture: any
 Section: debug
 Priority: extra
 Depends: spectrum2-backend-frotz (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 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
 Priority: optional
 Depends: libtransport2.0 (= ${binary:Version}), libtransport-plugin2.0 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends}
 Description: Spectrum2 backend to connect IRC using libcommuni
  Spectrum2 backend using libcommuni
 Package: spectrum2-backend-libcommuni-dbg
 Architecture: any
 Section: debug
 Priority: extra

packaging/debian/debian/rules

➞

Show inline comments

@@ @@ -13,20 +13,19 @@ build: @@
 	VERBOSE=1 make VERBOSE=1
 #override_dh_auto_configure:
 override_dh_strip:
 	dh_strip -pspectrum2 --dbg-package=spectrum2-dbg
 	dh_strip -pspectrum2-backend-libpurple --dbg-package=spectrum2-backend-libpurple-dbg
 	dh_strip -pspectrum2-backend-skype --dbg-package=spectrum2-backend-skype-dbg
 	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
 	dh_strip -plibtransport-plugin2.0 --dbg-package=libtransport-plugin-dbg
 %:
 	dh $@

tests/slack_jabber/bad_password.py

➞

Show inline comments

@@ @@ -15,26 +15,25 @@ class Responder(sleekxmpp.ClientXMPP): @@
 		self.nick = nick
 		self.finished = False
 		self.add_event_handler("session_start", self.start)
 		self.add_event_handler("message", self.message)
 		self.tests = {}
 		self.tests["not_authorized"] = ["'Not Authorized' received", False]
 		self.tests["help_received"] = ["Help received", False]
 		self.tests["register_received"] = ["Password changed", False]
 		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")
 			self.tests["help_received"][1] = True
 		elif msg['body'] == "You have successfully registered 3rd-party account. Spectrum 2 is now connecting to the 3rd-party network.":
 			self.tests["register_received"][1] = True
 		elif msg['body'] == "abc":
 			self.tests["abc_received"][1] = True
 			self.finished = True
 	def start(self, event):
 		self.plugin['xep_0045'].joinMUC(self.room, self.nick, password=self.room_password, wait=False)

0 comments (0 inline, 0 general)