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

[Harald Sitter]

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

The following commit has been merged in the kubuntu_unstable branch:
commit 0ee618e73c9dc48fd4c84b6559e56cfef5448548
Author: Harald Sitter <sitter at kde.org>
Date:   Mon Dec 1 13:00:39 2014 +0100

    update patch
---
 debian/patches/kubuntu_default-channels.diff | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/patches/kubuntu_default-channels.diff b/debian/patches/kubuntu_default-channels.diff
index 3755bc3..da01d13 100644
--- a/debian/patches/kubuntu_default-channels.diff
+++ b/debian/patches/kubuntu_default-channels.diff
@@ -2,21 +2,21 @@ Index: konversation/src/config/preferences.cpp
 ===================================================================
 --- konversation.orig/src/config/preferences.cpp
 +++ konversation/src/config/preferences.cpp
-@@ -63,14 +63,14 @@ Preferences::Preferences()
+@@ -62,14 +62,14 @@ Preferences::Preferences()
      mIdentity->setNicknameList(nickList);
  
      Konversation::ServerGroupSettingsPtr serverGroup(new Konversation::ServerGroupSettings);
--    serverGroup->setName("freenode");
-+    serverGroup->setName("Ubuntu IRC");
+-    serverGroup->setName(QStringLiteral("freenode"));
++    serverGroup->setName(QStringLiteral("Ubuntu IRC"));
      Konversation::ServerSettings server;
--    server.setHost("chat.freenode.net");
-+    server.setHost("irc.ubuntu.com");
+-    server.setHost(QStringLiteral("chat.freenode.net"));
++    server.setHost(QStringLiteral("irc.ubuntu.com"));
      server.setPort(8001);
      serverGroup->addServer(server);
      serverGroup->setIdentityId(mIdentity->id());
      Konversation::ChannelSettings channel;
--    channel.setName("#konversation");
-+    channel.setName("#kubuntu");
+-    channel.setName(QStringLiteral("#konversation"));
++    channel.setName(QStringLiteral("#kubuntu"));
      serverGroup->addChannel(channel);
      serverGroup->setExpanded(false);
      mServerGroupHash.insert(0, serverGroup);

-- 
Konversation packaging for Debian