[Pkg-cli-apps-commits] [smuxi] 01/01: Merge branch 'master' into quantal-backports
Mirco Bauer
meebey at moszumanska.debian.org
Tue Dec 17 22:55:33 UTC 2013
This is an automated email from the git hooks/post-receive script.
meebey pushed a commit to branch quantal-backports
in repository smuxi.
commit 2e013f5d264a8d73f319e9f578887047c35e149e
Merge: 17d5a94 51ce6db
Author: Mirco Bauer <meebey at meebey.net>
Date: Tue Dec 17 23:52:25 2013 +0100
Merge branch 'master' into quantal-backports
Conflicts:
debian/changelog
BUGS | 13 +-
HACKING | 98 ++
Makefile.am | 26 +-
Makefile.in | 33 +-
README => README.md | 39 +-
TODO | 8 +-
aclocal.m4 | 105 +-
compile | 347 +++++
configure | 423 +++++-
configure.ac | 38 +-
debian/changelog | 15 +-
debian/control | 4 +-
debian/docs | 3 +-
.../build_Twitterizer2_with_default_compiler.patch | 6 +-
debian/patches/debian_default_settings.patch | 4 +-
debian/smuxi-engine.manpages | 1 +
debian/smuxi-frontend-gnome.manpages | 1 +
debian/smuxi-frontend-stfl.manpages | 1 +
glade/smuxi-frontend-gnome.glade | 5 +-
lib/JabbR/JabbR.Client/JabbRClient.cs | 6 -
lib/Makefile.in | 3 +-
.../Http/DefaultHttpClient.cs | 33 +-
.../Http/IHttpClient.cs | 6 +-
.../Http/IHttpClientExtensions.cs | 4 +-
.../Transports/HttpBasedTransport.cs | 18 +-
.../LongPolling/PollingRequestHandler.cs | 7 +-
.../Transports/ServerSentEventsTransport.cs | 3 +-
.../Transports/TransportHelper.cs | 2 +-
lib/SmartIrc4net/SmartIrc4net.csproj | 1 +
lib/SmartIrc4net/src/AssemblyInfo.cs | 4 +-
lib/SmartIrc4net/src/IrcClient/IrcClient.cs | 12 +-
.../src/IrcConnection/IrcConnection.cs | 37 +-
lib/SmartIrc4net/src/Logger.cs | 195 +--
lib/Twitterizer/CommonAssemblyInfo.cs | 6 +-
.../Methods/List/DestroyListSubscriber.cs | 7 +-
.../Methods/List/ListMembershipsCommand.cs | 10 +-
.../Twitterizer2/Methods/List/TwitterList.cs | 10 +-
.../Twitterizer2/Methods/Search/SearchCommand.cs | 25 +-
.../Twitterizer2/Methods/Search/SearchOptions.cs | 30 +-
.../Twitterizer2/Methods/Search/TwitterSearch.cs | 2 -
.../Methods/Search/TwitterSearchResult.cs | 174 ---
.../Search/TwitterSearchResultCollection.cs | 81 +-
.../Methods/Timeline/TwitterTimeline.cs | 1 -
.../Methods/User/LookupUsersOptions.cs | 1 -
.../Twitterizer2/OAuth/WebRequestBuilder.cs | 4 +-
.../Twitterizer2/Properties/AssemblyInfo.cs | 3 -
lib/Twitterizer/Twitterizer2/Twitterizer2.csproj | 1 -
.../Handler.cs => Exceptions/StartTlsException.cs} | 18 +-
lib/agsxmpp/agsxmpp/IqGrabber.cs | 79 +-
lib/agsxmpp/agsxmpp/Net/BaseSocket.cs | 2 +
lib/agsxmpp/agsxmpp/Net/ClientSocket.cs | 2 +
lib/agsxmpp/agsxmpp/Sasl/SaslHandler.cs | 23 +-
lib/agsxmpp/agsxmpp/Xml/Dom/DomLoader.cs | 2 +-
lib/agsxmpp/agsxmpp/Xml/StreamParser.cs | 46 +-
lib/agsxmpp/agsxmpp/XmppClientConnection.cs | 185 ++-
lib/agsxmpp/agsxmpp/XmppComponentConnection.cs | 26 +-
lib/agsxmpp/agsxmpp/XmppConnection.cs | 11 +-
lib/agsxmpp/agsxmpp/agsxmpp.csproj | 2 +
lib/agsxmpp/agsxmpp/protocol/Base/Stanza.cs | 20 -
.../agsxmpp/protocol/Base/StanzaWithError.cs | 48 +-
lib/agsxmpp/agsxmpp/protocol/client/Error.cs | 98 --
lib/agsxmpp/agsxmpp/protocol/client/Handler.cs | 16 +-
lib/agsxmpp/agsxmpp/protocol/client/IQ.cs | 25 +-
lib/agsxmpp/agsxmpp/protocol/client/Message.cs | 25 +-
lib/agsxmpp/agsxmpp/protocol/client/Presence.cs | 25 +-
lib/agsxmpp/agsxmpp/protocol/component/Error.cs | 12 -
lib/agsxmpp/agsxmpp/protocol/component/Handler.cs | 2 +-
.../extensions/bookmarks/BookmarkManager.cs | 64 +-
.../protocol/extensions/pubsub/PubSubManager.cs | 436 ++----
.../agsxmpp/protocol/iq/disco/DiscoManager.cs | 93 +-
.../agsxmpp/protocol/iq/privacy/PrivacyManager.cs | 58 +-
lib/agsxmpp/agsxmpp/protocol/sasl/Failure.cs | 4 +
.../agsxmpp/protocol/sasl/FailureCondition.cs | 5 +
lib/agsxmpp/agsxmpp/protocol/x/muc/MucManager.cs | 460 ++-----
mono.m4 | 14 +
po-Engine-Campfire/LINGUAS | 4 +
po-Engine-Campfire/POTFILES.skip | 3 +-
po-Engine-Campfire/cs.po | 38 +-
po-Engine-Campfire/da.po | 38 +-
po-Engine-Campfire/de.po | 38 +-
po-Engine-Campfire/{sv.po => es.po} | 68 +-
po-Engine-Campfire/{zh_CN.po => fa.po} | 69 +-
po-Engine-Campfire/fi.po | 40 +-
po-Engine-Campfire/fr.po | 49 +-
po-Engine-Campfire/pt_BR.po | 40 +-
po-Engine-Campfire/sv.po | 45 +-
po-Engine-Campfire/{sv.po => te.po} | 69 +-
po-Engine-Campfire/{pt_BR.po => tr.po} | 69 +-
po-Engine-Campfire/zh_CN.po | 38 +-
po-Engine-IRC/LINGUAS | 2 +
po-Engine-IRC/POTFILES.skip | 3 +-
po-Engine-IRC/cs.po | 148 +-
po-Engine-IRC/da.po | 148 +-
po-Engine-IRC/de.po | 148 +-
po-Engine-IRC/es.po | 293 ++--
po-Engine-IRC/fa.po | 368 +++++
po-Engine-IRC/fi.po | 148 +-
po-Engine-IRC/fr.po | 148 +-
po-Engine-IRC/pt_BR.po | 213 +--
po-Engine-IRC/sv.po | 183 +--
po-Engine-IRC/te.po | 368 +++++
po-Engine-IRC/tr.po | 272 ++--
po-Engine-IRC/zh_CN.po | 150 +--
{po-Engine-Campfire => po-Engine-JabbR}/LINGUAS | 4 +
po-Engine-JabbR/Makefile.in.in | 218 +++
po-Engine-JabbR/POTFILES.in | 1 +
{po-Server => po-Engine-JabbR}/POTFILES.skip | 9 +-
po-Engine-JabbR/cs.po | 58 +
po-Engine-JabbR/da.po | 58 +
po-Engine-JabbR/de.po | 58 +
po-Engine-JabbR/es.po | 58 +
po-Engine-JabbR/fa.po | 56 +
po-Engine-JabbR/fi.po | 56 +
po-Engine-JabbR/fr.po | 57 +
po-Engine-JabbR/pt_BR.po | 56 +
po-Engine-JabbR/sv.po | 58 +
po-Engine-JabbR/te.po | 56 +
po-Engine-JabbR/tr.po | 56 +
po-Engine-JabbR/zh_CN.po | 57 +
po-Engine-Twitter/LINGUAS | 2 +
po-Engine-Twitter/POTFILES.skip | 3 +-
po-Engine-Twitter/cs.po | 106 +-
po-Engine-Twitter/da.po | 108 +-
po-Engine-Twitter/de.po | 107 +-
po-Engine-Twitter/es.po | 191 +--
po-Engine-Twitter/{tr.po => fa.po} | 111 +-
po-Engine-Twitter/fi.po | 108 +-
po-Engine-Twitter/fr.po | 155 ++-
po-Engine-Twitter/pt_BR.po | 108 +-
po-Engine-Twitter/sv.po | 121 +-
po-Engine-Twitter/{tr.po => te.po} | 111 +-
po-Engine-Twitter/tr.po | 109 +-
po-Engine-Twitter/zh_CN.po | 110 +-
{po-Engine-Campfire => po-Engine-XMPP}/LINGUAS | 4 +
po-Engine-XMPP/Makefile.in.in | 218 +++
po-Engine-XMPP/POTFILES.in | 1 +
{po-Server => po-Engine-XMPP}/POTFILES.skip | 7 +-
po-Engine-XMPP/cs.po | 293 ++++
po-Engine-XMPP/da.po | 293 ++++
po-Engine-XMPP/de.po | 294 ++++
po-Engine-XMPP/es.po | 293 ++++
po-Engine-XMPP/fa.po | 292 ++++
po-Engine-XMPP/fi.po | 292 ++++
po-Engine-XMPP/fr.po | 293 ++++
po-Engine-XMPP/pt_BR.po | 292 ++++
po-Engine-XMPP/sv.po | 293 ++++
po-Engine-XMPP/te.po | 292 ++++
po-Engine-XMPP/tr.po | 292 ++++
po-Engine-XMPP/zh_CN.po | 293 ++++
po-Engine/LINGUAS | 2 +
po-Engine/POTFILES.in | 1 +
po-Engine/POTFILES.skip | 3 +-
po-Engine/cs.po | 108 +-
po-Engine/da.po | 108 +-
po-Engine/de.po | 109 +-
po-Engine/es.po | 255 +++-
po-Engine/{zh_CN.po => fa.po} | 207 +--
po-Engine/fi.po | 110 +-
po-Engine/fr.po | 108 +-
po-Engine/pt_BR.po | 122 +-
po-Engine/sv.po | 118 +-
po-Engine/{zh_CN.po => te.po} | 209 +--
po-Engine/tr.po | 204 ++-
po-Engine/zh_CN.po | 108 +-
po-Frontend-GNOME-IRC/LINGUAS | 4 +
po-Frontend-GNOME-IRC/POTFILES.skip | 3 +-
po-Frontend-GNOME-IRC/cs.po | 6 +-
po-Frontend-GNOME-IRC/da.po | 6 +-
po-Frontend-GNOME-IRC/de.po | 6 +-
po-Frontend-GNOME-IRC/es.po | 79 +-
po-Frontend-GNOME-IRC/{de.po => fa.po} | 46 +-
po-Frontend-GNOME-IRC/{de.po => fi.po} | 37 +-
po-Frontend-GNOME-IRC/fr.po | 14 +-
po-Frontend-GNOME-IRC/pt_BR.po | 46 +-
po-Frontend-GNOME-IRC/sv.po | 13 +-
po-Frontend-GNOME-IRC/{de.po => te.po} | 44 +-
po-Frontend-GNOME-IRC/{fr.po => tr.po} | 49 +-
po-Frontend-GNOME-IRC/zh_CN.po | 8 +-
.../LINGUAS | 4 +
po-Frontend-GNOME-Twitter/Makefile.in.in | 218 +++
po-Frontend-GNOME-Twitter/POTFILES.in | 1 +
.../POTFILES.skip | 4 +-
po-Frontend-GNOME-Twitter/cs.po | 35 +
po-Frontend-GNOME-Twitter/da.po | 35 +
po-Frontend-GNOME-Twitter/de.po | 36 +
po-Frontend-GNOME-Twitter/es.po | 35 +
po-Frontend-GNOME-Twitter/fa.po | 34 +
po-Frontend-GNOME-Twitter/fi.po | 34 +
po-Frontend-GNOME-Twitter/fr.po | 35 +
po-Frontend-GNOME-Twitter/pt_BR.po | 34 +
po-Frontend-GNOME-Twitter/sv.po | 35 +
po-Frontend-GNOME-Twitter/te.po | 34 +
po-Frontend-GNOME-Twitter/tr.po | 34 +
po-Frontend-GNOME-Twitter/zh_CN.po | 35 +
po-Frontend-GNOME-XMPP/LINGUAS | 5 +
po-Frontend-GNOME-XMPP/POTFILES.skip | 3 +-
po-Frontend-GNOME-XMPP/cs.po | 92 +-
po-Frontend-GNOME-XMPP/da.po | 81 +-
po-Frontend-GNOME-XMPP/de.po | 82 +-
po-Frontend-GNOME-XMPP/es.po | 91 +-
po-Frontend-GNOME-XMPP/fa.po | 41 +
po-Frontend-GNOME-XMPP/fi.po | 41 +
po-Frontend-GNOME-XMPP/fr.po | 81 +-
po-Frontend-GNOME-XMPP/pt_BR.po | 41 +
po-Frontend-GNOME-XMPP/sv.po | 85 +-
po-Frontend-GNOME-XMPP/te.po | 41 +
po-Frontend-GNOME-XMPP/tr.po | 41 +
po-Frontend-GNOME-XMPP/zh_CN.po | 81 +-
po-Frontend-GNOME/LINGUAS | 3 +
po-Frontend-GNOME/POTFILES.skip | 3 +-
po-Frontend-GNOME/cs.po | 61 +-
po-Frontend-GNOME/da.po | 61 +-
po-Frontend-GNOME/de.po | 63 +-
po-Frontend-GNOME/es.po | 1410 +++++++++++---------
po-Frontend-GNOME/{zh_CN.po => fa.po} | 575 ++++----
po-Frontend-GNOME/fi.po | 63 +-
po-Frontend-GNOME/fr.po | 61 +-
po-Frontend-GNOME/pt_BR.po | 269 ++--
po-Frontend-GNOME/sv.po | 92 +-
po-Frontend-GNOME/{zh_CN.po => te.po} | 577 ++++----
po-Frontend-GNOME/{zh_CN.po => tr.po} | 574 ++++----
po-Frontend-GNOME/zh_CN.po | 61 +-
po-Frontend/LINGUAS | 4 +
po-Frontend/POTFILES.skip | 3 +-
po-Frontend/cs.po | 18 +-
po-Frontend/da.po | 18 +-
po-Frontend/de.po | 18 +-
po-Frontend/es.po | 119 +-
po-Frontend/{zh_CN.po => fa.po} | 58 +-
po-Frontend/{da.po => fi.po} | 58 +-
po-Frontend/fr.po | 79 +-
po-Frontend/pt_BR.po | 18 +-
po-Frontend/sv.po | 22 +-
po-Frontend/{zh_CN.po => te.po} | 57 +-
po-Frontend/{zh_CN.po => tr.po} | 55 +-
po-Frontend/zh_CN.po | 22 +-
po-Server/LINGUAS | 4 +
po-Server/POTFILES.skip | 3 +-
po-Server/cs.po | 4 +-
po-Server/da.po | 4 +-
po-Server/de.po | 4 +-
po-Server/es.po | 122 +-
po-Server/{zh_CN.po => fa.po} | 61 +-
po-Server/{sv.po => fi.po} | 64 +-
po-Server/fr.po | 42 +-
po-Server/pt_BR.po | 4 +-
po-Server/sv.po | 17 +-
po-Server/{zh_CN.po => te.po} | 66 +-
po-Server/{zh_CN.po => tr.po} | 66 +-
po-Server/zh_CN.po | 8 +-
src/AssemblyVersion.cs | 2 +-
src/Common/Defines.cs | 4 +-
src/Common/Makefile.in | 3 +-
src/Common/Platform.cs | 33 +-
src/Engine-Campfire/Makefile.in | 3 +-
.../Protocols/Campfire/CampfireEventStream.cs | 28 +-
.../Protocols/Campfire/CampfireProtocolManager.cs | 37 +-
src/Engine-IRC/Makefile.in | 3 +-
src/Engine-IRC/Protocols/Irc/IrcMessageBuilder.cs | 2 +-
src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs | 206 +--
src/Engine-JabbR/JabbrProtocolManager.cs | 153 ++-
src/Engine-JabbR/Makefile.in | 3 +-
src/Engine-Twitter/Makefile.am | 3 +-
src/Engine-Twitter/Makefile.in | 6 +-
.../Protocols/Twitter/TwitterMessageBuilder.cs | 73 +-
.../Protocols/Twitter/TwitterProtocolManager.cs | 603 +++++++--
src/Engine-XMPP/Config/XmppPersonModel.cs | 16 +-
src/Engine-XMPP/Config/XmppServerModel.cs | 1 -
src/Engine-XMPP/Makefile.in | 3 +-
.../Protocols/Xmpp/XmppGroupChatModel.cs | 1 +
.../Protocols/Xmpp/XmppProtocolManager.cs | 800 ++++++++---
src/Engine/Chats/ChatModel.cs | 7 +-
src/Engine/Chats/PersonChatModel.cs | 3 +
src/Engine/CommandModel.cs | 69 +-
src/Engine/Engine.cs | 6 +
src/Engine/FrontendManager.cs | 21 +-
.../Hooks/Commands/HookCommand.cs} | 25 +-
.../Hooks/Commands/ProtocolManagerHookCommand.cs | 50 +
.../Hooks/Commands/SessionHookCommand.cs} | 41 +-
.../Hooks/Environments/ChatHookEnvironment.cs} | 31 +-
.../Hooks/Environments/CommandHookEnvironment.cs} | 29 +-
.../Hooks/Environments/HookEnvironment.cs} | 24 +-
.../Hooks/Environments/MessageHookEnvironment.cs | 58 +
.../ProtocolManagerHookEnvironment.cs} | 35 +-
src/Engine/Hooks/HookRunner.cs | 180 +++
src/Engine/Makefile.am | 13 +-
src/Engine/Makefile.in | 16 +-
src/Engine/Messages/FeedMessageBuilder.cs | 16 +-
src/Engine/Messages/MessageBuilder.cs | 99 +-
src/Engine/Messages/MessageType.cs | 10 +-
src/Engine/Protocols/IProtocolManager.cs | 14 +-
src/Engine/Protocols/ProtocolManagerBase.cs | 109 +-
src/Engine/Protocols/ProtocolManagerFactory.cs | 8 +-
src/Engine/Session.cs | 180 ++-
src/Engine/SessionManager.cs | 9 +
src/Engine/UICommandContainer.cs | 56 -
src/Frontend-Curses/Makefile.in | 3 +-
src/Frontend-GNOME-IRC/Makefile.in | 3 +-
.../AssemblyInfo.cs} | 35 +-
src/Frontend-GNOME-Twitter/Makefile.am | 38 +
.../Makefile.in | 27 +-
src/Frontend-GNOME-Twitter/TwitterGroupChatView.cs | 201 +++
src/Frontend-GNOME-XMPP/Makefile.in | 3 +-
src/Frontend-GNOME-XMPP/XmppGroupChatView.cs | 14 +
src/Frontend-GNOME-XMPP/XmppPersonChatView.cs | 165 +++
src/Frontend-GNOME/ChatViewManager.cs | 47 +-
src/Frontend-GNOME/EngineManagerDialog.cs | 30 +-
src/Frontend-GNOME/Entry.cs | 6 +
src/Frontend-GNOME/Frontend.cs | 11 +-
src/Frontend-GNOME/IndicateManager.cs | 8 +-
src/Frontend-GNOME/MainWindow.cs | 65 +-
src/Frontend-GNOME/Makefile.am | 4 +-
src/Frontend-GNOME/Makefile.in | 105 +-
src/Frontend-GNOME/Notebook.cs | 5 +-
src/Frontend-GNOME/NotifyManager.cs | 12 +-
.../Preferences/PreferencesDialog.cs | 10 +-
.../Views/Assistants/Engine/EngineAssistant.cs | 10 +-
src/Frontend-GNOME/Views/ChatTreeView.cs | 454 +++++++
src/Frontend-GNOME/Views/Chats/ChatView.cs | 68 +-
src/Frontend-GNOME/Views/Chats/GroupChatView.cs | 18 +-
src/Frontend-GNOME/Views/Chats/PersonChatView.cs | 23 +
src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs | 5 +
src/Frontend-GNOME/Views/Chats/SessionChatView.cs | 4 +
src/Frontend-GNOME/Views/MenuWidget.cs | 19 +-
src/Frontend-GNOME/Views/MessageTextView.cs | 23 +-
src/Frontend-GNOME/Views/ServerWidget.cs | 11 +-
src/Frontend-GNOME/smuxi-frontend-gnome.1 | 42 +
src/Frontend-GNOME/smuxi-frontend-gnome.desktop | 6 +-
src/Frontend-STFL/Makefile.am | 3 +-
src/Frontend-STFL/Makefile.in | 90 +-
src/Frontend-STFL/STFL/Form.cs | 5 +
src/Frontend-STFL/STFL/Makefile.in | 3 +-
src/Frontend-STFL/STFL/TextView.cs | 20 +-
src/Frontend-STFL/STFL/Widget.cs | 28 +-
src/Frontend-STFL/smuxi-frontend-stfl.1 | 89 ++
src/Frontend-STFL/smuxi-frontend-stfl.in | 2 +-
src/Frontend-SWF/Frontend.cs | 6 -
src/Frontend-SWF/Makefile.am | 2 -
src/Frontend-SWF/Makefile.in | 5 +-
src/Frontend-SWF/SplashScreenWindow.cs | 46 -
src/Frontend-SWF/SplashScreenWindow.designer.cs | 22 -
src/Frontend-Test/Makefile.in | 3 +-
src/Frontend/ChatViewInfoAttribute.cs | 3 +-
src/Frontend/ChatViewManagerBase.cs | 23 +-
src/Frontend/CommandManager.cs | 44 +-
src/Frontend/EntryController.cs | 1 -
src/Frontend/EntryHistoryModel.cs | 1 -
src/Frontend/Makefile.am | 2 -
src/Frontend/Makefile.in | 5 +-
src/Frontend/SshTunnelManager.cs | 3 +
src/Makefile.am | 5 +
src/Makefile.in | 9 +-
src/Server/Makefile.am | 6 +-
src/Server/Makefile.in | 91 +-
src/Server/Server.cs | 23 +-
src/Server/smuxi-server.1 | 58 +
src/smuxi-win32.nsis.in | 6 +-
357 files changed, 18431 insertions(+), 8178 deletions(-)
diff --cc debian/changelog
index b3ed325,cf3adc9..46e9475
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,15 +1,22 @@@
- smuxi (0.9-1~quantal+1) quantal; urgency=low
++smuxi (0.10-1~quantal+1) quantal; urgency=low
+
++ * Rebuild for quantal-ppa.
+ * [fff2ee7] Updated gbp's upstream branch
+
- -- Mirco Bauer <meebey at debian.org> Sun, 08 Sep 2013 17:03:27 +0200
++ -- Mirco Bauer <meebey at debian.org> Tue, 17 Dec 2013 23:50:53 +0100
++
+ smuxi (0.10-1) unstable; urgency=medium
+
+ * [76c7e84] Imported Upstream version 0.10
+ * [1bd2abd] README was renamed to README.md
+ * [0714a4b] Install HACKING file to docs
+ * [3014f6a] Refreshed quilt patches
+ * [fcd2185] Build against dbus-sharp(-glib)-2.0
+
+ -- Mirco Bauer <meebey at debian.org> Mon, 16 Dec 2013 09:35:58 +0100
smuxi (0.9-1) unstable; urgency=low
-
+
* [9467778] Let the configure script decide to use indicate-sharp,
messagingmenu-sharp or none
* [3040a00] Added optional MessagingMenu build-deps
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-cli-apps/packages/smuxi.git
More information about the Pkg-cli-apps-commits
mailing list