[SCM] Konversation packaging for Debian branch, kubuntu_unstable, updated. debian/1.5-2-6-g377c5bc

[Harald Sitter]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/konversation.git;a=commitdiff;h=377c5bc

The following commit has been merged in the kubuntu_unstable branch:
commit 377c5bc190c0c266655dce94b51a0b604ceda264
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Dec 1 13:01:27 2014 +0100

    change channel patch
    
    there is no gain to be had from patching the name or host to
    ubuntu irc, so use freenode and simply change the default channel
    to #kubuntu
---
 debian/patches/kubuntu_default-channels.diff | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/debian/patches/kubuntu_default-channels.diff b/debian/patches/kubuntu_default-channels.diff
index da01d13..8f05aeb 100644
--- a/debian/patches/kubuntu_default-channels.diff
+++ b/debian/patches/kubuntu_default-channels.diff
@@ -2,16 +2,7 @@ Index: konversation/src/config/preferences.cpp
 ===================================================================
 --- konversation.orig/src/config/preferences.cpp
 +++ konversation/src/config/preferences.cpp
-@@ -62,14 +62,14 @@ Preferences::Preferences()
-     mIdentity->setNicknameList(nickList);
- 
-     Konversation::ServerGroupSettingsPtr serverGroup(new Konversation::ServerGroupSettings);
--    serverGroup->setName(QStringLiteral("freenode"));
-+    serverGroup->setName(QStringLiteral("Ubuntu IRC"));
-     Konversation::ServerSettings server;
--    server.setHost(QStringLiteral("chat.freenode.net"));
-+    server.setHost(QStringLiteral("irc.ubuntu.com"));
-     server.setPort(8001);
+@@ -69,7 +69,7 @@ Preferences::Preferences()
      serverGroup->addServer(server);
      serverGroup->setIdentityId(mIdentity->id());
      Konversation::ChannelSettings channel;

-- 
Konversation packaging for Debian