[Pkg-cli-apps-commits] [smuxi] 01/01: Merge tag 'debian/0.11_rc5-1' into saucy-backports
Mirco Bauer
meebey at moszumanska.debian.org
Sat May 3 18:12:49 UTC 2014
This is an automated email from the git hooks/post-receive script.
meebey pushed a commit to annotated tag debian/0.11_rc5-1_saucy+1
in repository smuxi.
commit 08af2252e5dbf229b38c041c772c59d2195dd0b9
Merge: 74ef393 d606ab3
Author: Mirco Bauer <meebey at meebey.net>
Date: Mon Apr 28 20:39:32 2014 +0200
Merge tag 'debian/0.11_rc5-1' into saucy-backports
smuxi Debian release 0.11~rc5-1
Conflicts:
debian/changelog
Makefile.am | 4 +
Makefile.in | 9 +-
aclocal.m4 | 9 +-
configure | 33 +-
configure.ac | 2 +-
debian/changelog | 26 +-
debian/{changelog => changelog.orig} | 26 +
.../build_Twitterizer2_with_default_compiler.patch | 6 +-
debian/patches/debian_default_settings.patch | 6 +-
debian/patches/fix_reautogen.patch | 10 +
debian/patches/series | 1 +
debian/patches/ubuntu.series | 1 +
debian/patches/ubuntu_default_settings.patch | 6 +-
lib/Makefile.am | 2 +-
lib/Makefile.in | 4 +-
.../src/IrcConnection/IrcConnection.cs | 2 +
lib/StarkSoftProxy/HttpProxyClient.cs | 2 +-
.../Twitterizer2/Core/OptionalProperties.cs | 6 +-
.../Twitterizer2/Methods/Tweets/TwitterStatus.cs | 4 +-
lib/Twitterizer/Twitterizer2/Twitterizer2.csproj | 2 -
libtool.m4 | 12 +-
ltmain.sh | 4 +-
missing | 4 +-
po-Engine-Campfire/LINGUAS | 1 +
po-Engine-Campfire/nl.po | 89 ++
po-Engine-IRC/LINGUAS | 1 +
po-Engine-IRC/nl.po | 370 ++++++
po-Engine-JabbR/LINGUAS | 1 +
po-Engine-JabbR/nl.po | 57 +
po-Engine-Twitter/LINGUAS | 1 +
po-Engine-Twitter/nl.po | 186 +++
po-Engine-XMPP/LINGUAS | 1 +
po-Engine-XMPP/nl.po | 293 +++++
po-Engine/LINGUAS | 1 +
po-Engine/nl.po | 273 +++++
po-Frontend-GNOME-IRC/LINGUAS | 1 +
po-Frontend-GNOME-IRC/nl.po | 90 ++
po-Frontend-GNOME-Twitter/LINGUAS | 1 +
po-Frontend-GNOME-Twitter/nl.po | 35 +
po-Frontend-GNOME-XMPP/LINGUAS | 1 +
po-Frontend-GNOME-XMPP/nl.po | 42 +
po-Frontend-GNOME/LINGUAS | 1 +
po-Frontend-GNOME/nl.po | 1224 ++++++++++++++++++++
po-Frontend/LINGUAS | 1 +
po-Frontend/nl.po | 119 ++
po-Server/LINGUAS | 1 +
po-Server/nl.po | 133 +++
src/AssemblyVersion.cs | 2 +-
src/Common/Defines.cs | 6 +-
src/Common/Makefile.in | 2 +-
src/Common/NDesk.Options.cs | 2 +-
src/Engine-Campfire/Makefile.in | 2 +-
src/Engine-IRC/Makefile.in | 2 +-
src/Engine-IRC/Protocols/Irc/IrcMessageBuilder.cs | 6 +-
src/Engine-IRC/Protocols/Irc/IrcProtocolManager.cs | 39 +-
src/Engine-JabbR/JabbrProtocolManager.cs | 38 +-
src/Engine-JabbR/Makefile.in | 2 +-
src/Engine-Twitter/Makefile.in | 2 +-
.../Protocols/Twitter/TwitterProtocolManager.cs | 7 +-
src/Engine-XMPP/Config/XmppServerModel.cs | 11 -
src/Engine-XMPP/Makefile.am | 2 +-
src/Engine-XMPP/Makefile.in | 4 +-
.../Protocols/Xmpp/FacebookProtocolManager.cs} | 27 +-
src/Engine-XMPP/Protocols/Xmpp/IQ/OwnMessage.cs | 85 --
.../Protocols/Xmpp/XmppProtocolManager.cs | 110 +-
src/Engine/CommandModel.cs | 2 +-
src/Engine/Config/Config.cs | 44 +-
src/Engine/Config/MessageBuilderSettings.cs | 369 ++++++
src/Engine/Config/MessagePatternListController.cs | 160 +++
src/Engine/Config/MessagePatternModel.cs | 134 +++
src/Engine/Config/ServerModel.cs | 27 +-
.../Hooks/Environments/CommandHookEnvironment.cs | 1 +
...HookEnvironment.cs => PersonHookEnvironment.cs} | 21 +-
.../Environments/ProtocolManagerHookEnvironment.cs | 1 +
src/Engine/Hooks/HookRunner.cs | 2 +-
src/Engine/Makefile.am | 5 +-
src/Engine/Makefile.in | 7 +-
src/Engine/MessageBuffers/Db4oMessageBuffer.cs | 4 +-
src/Engine/Messages/MessageBuilder.cs | 129 ++-
src/Engine/Messages/MessageModel.cs | 3 +-
src/Engine/Messages/MessageParser.cs | 161 ---
src/Engine/Messages/UrlMessagePartModel.cs | 79 +-
src/Engine/Protocols/ProtocolManagerBase.cs | 18 +-
src/Engine/Protocols/ProtocolManagerFactory.cs | 5 +-
src/Engine/Session.cs | 294 ++++-
src/Engine/SessionManager.cs | 2 +-
src/Frontend-Curses/Makefile.in | 2 +-
src/Frontend-GNOME-IRC/IrcPersonChatView.cs | 34 +-
src/Frontend-GNOME-IRC/Makefile.am | 1 +
src/Frontend-GNOME-IRC/Makefile.in | 3 +-
src/Frontend-GNOME-Twitter/Makefile.in | 2 +-
src/Frontend-GNOME-XMPP/Makefile.in | 2 +-
src/Frontend-GNOME/AboutDialog.cs | 10 +-
src/Frontend-GNOME/ChatViewManager.cs | 6 +
src/Frontend-GNOME/Entry.cs | 1 +
src/Frontend-GNOME/Frontend.cs | 23 +-
src/Frontend-GNOME/MainWindow.cs | 12 +-
src/Frontend-GNOME/Makefile.am | 1 +
src/Frontend-GNOME/Makefile.in | 3 +-
src/Frontend-GNOME/Notebook.cs | 1 +
src/Frontend-GNOME/Views/ChatTreeView.cs | 61 +-
src/Frontend-GNOME/Views/Chats/ChatView.cs | 24 +-
src/Frontend-GNOME/Views/Chats/GroupChatView.cs | 2 +-
src/Frontend-GNOME/Views/Chats/ProtocolChatView.cs | 14 +-
src/Frontend-GNOME/Views/MenuWidget.cs | 11 +-
src/Frontend-GNOME/Views/MessageTextView.cs | 15 +-
src/Frontend-GNOME/Views/ServerWidget.cs | 83 +-
.../gtk-gui/Smuxi.Frontend.Gnome.ServerWidget.cs | 194 ++--
src/Frontend-GNOME/gtk-gui/gui.stetic | 108 +-
src/Frontend-GNOME/smuxi-frontend-gnome.desktop | 4 +
src/Frontend-STFL/Frontend.cs | 20 +-
src/Frontend-STFL/Main.cs | 23 +
src/Frontend-STFL/Makefile.in | 2 +-
src/Frontend-STFL/STFL/Makefile.in | 2 +-
src/Frontend-STFL/smuxi-frontend-stfl.1 | 4 +-
src/Frontend-SWF/Makefile.in | 2 +-
src/Frontend-Test/Makefile.in | 2 +-
src/Frontend/CommandManager.cs | 165 ++-
src/Frontend/Makefile.in | 2 +-
src/Frontend/SshTunnelManager.cs | 7 +-
src/Makefile.in | 2 +-
src/Server/Makefile.in | 2 +-
src/Server/smuxi-server.1 | 9 +-
src/smuxi-win32.nsis.in | 4 +
124 files changed, 5048 insertions(+), 736 deletions(-)
diff --cc debian/changelog
index 2df69bc,9a7ce79..cf581fb
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,9 -1,27 +1,33 @@@
- smuxi (0.10-1~saucy+1) saucy; urgency=low
++smuxi (0.11~rc5-1~saucy+1) saucy; urgency=low
+
+ * Rebuild for saucy-ppa.
+
+ -- Mirco Bauer <meebey at debian.org> Wed, 18 Dec 2013 00:35:01 +0100
+
+ smuxi (0.11~rc5-1) unstable; urgency=medium
+
+ * [2900227] Imported Upstream version 0.11~rc5
+
+ -- Mirco Bauer <meebey at debian.org> Sun, 16 Mar 2014 17:05:21 +0100
+
+ smuxi (0.11~rc2-1) unstable; urgency=medium
+
+ * [1fb9a2c] Imported Upstream version 0.11~rc2
+ * [0d91af1] Dropped remove_wcf_references.patch, already applied upstream
+ * [97b452a] Refreshed patches
+
+ -- Mirco Bauer <meebey at debian.org> Sun, 16 Feb 2014 20:08:23 +0100
+
+ smuxi (0.10-2) unstable; urgency=medium
+
+ * [66d273c] Install manpages for smuxi-server, smuxi-frontend-gnome and
+ smuxi-frontend-stfl
+ * [51ce6db] Refreshed build_Twitterizer2_with_default_compiler.patch
+ * [28027f4] avoid unneeded WCF assembly references for ServiceStack.Common
+ * [b9d87b4] fixed re-autogen
+
+ -- Mirco Bauer <meebey at debian.org> Tue, 21 Jan 2014 05:40:14 +0100
+
smuxi (0.10-1) unstable; urgency=medium
* [76c7e84] Imported Upstream version 0.10
diff --cc debian/changelog.orig
index 2df69bc,9a7ce79..f5bdf3c
--- a/debian/changelog.orig
+++ b/debian/changelog.orig
@@@ -1,8 -1,26 +1,34 @@@
++<<<<<<< HEAD
+smuxi (0.10-1~saucy+1) saucy; urgency=low
+
+ * Rebuild for saucy-ppa.
+
+ -- Mirco Bauer <meebey at debian.org> Wed, 18 Dec 2013 00:35:01 +0100
++=======
+ smuxi (0.11~rc5-1) unstable; urgency=medium
+
+ * [2900227] Imported Upstream version 0.11~rc5
+
+ -- Mirco Bauer <meebey at debian.org> Sun, 16 Mar 2014 17:05:21 +0100
+
+ smuxi (0.11~rc2-1) unstable; urgency=medium
+
+ * [1fb9a2c] Imported Upstream version 0.11~rc2
+ * [0d91af1] Dropped remove_wcf_references.patch, already applied upstream
+ * [97b452a] Refreshed patches
+
+ -- Mirco Bauer <meebey at debian.org> Sun, 16 Feb 2014 20:08:23 +0100
+
+ smuxi (0.10-2) unstable; urgency=medium
+
+ * [66d273c] Install manpages for smuxi-server, smuxi-frontend-gnome and
+ smuxi-frontend-stfl
+ * [51ce6db] Refreshed build_Twitterizer2_with_default_compiler.patch
+ * [28027f4] avoid unneeded WCF assembly references for ServiceStack.Common
+ * [b9d87b4] fixed re-autogen
+
+ -- Mirco Bauer <meebey at debian.org> Tue, 21 Jan 2014 05:40:14 +0100
++>>>>>>> debian/0.11_rc5-1
smuxi (0.10-1) unstable; urgency=medium
--
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