[SCM] Konversation packaging for Debian branch, master, updated. debian/1.4-1-9-g8644614

[Diane Trout]

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

The following commit has been merged in the master branch:
commit 8e01085924d3d89a157fb9d7e22b2d06ad8c4261
Author: Diane Trout <diane at ghic.org>
Date:   Sat Feb 22 10:25:35 2014 -0800

    Refresh debian_channel.diff
---
 debian/changelog                   | 1 +
 debian/patches/debian_channel.diff | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0e73882..fa6c238 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ konversation (1.5-1) UNRELEASED; urgency=medium
   * New upstream release
   * Make watch file robust to different compression extensions
   * Add myself to Uploaders
+  * Refresh debian_channel.diff
 
  -- Diane Trout <diane at ghic.org>  Thu, 20 Feb 2014 15:23:24 -0800
 
diff --git a/debian/patches/debian_channel.diff b/debian/patches/debian_channel.diff
index 8c49bf3..166e015 100644
--- a/debian/patches/debian_channel.diff
+++ b/debian/patches/debian_channel.diff
@@ -12,11 +12,11 @@ Signed-off-by: Modestas Vainius <modestas at vainius.eu>
 
 --- a/src/config/preferences.cpp
 +++ b/src/config/preferences.cpp
-@@ -61,14 +61,16 @@ Preferences::Preferences()
+@@ -61,14 +61,16 @@
      mIdentity->setNicknameList(nickList);
  
      Konversation::ServerGroupSettingsPtr serverGroup(new Konversation::ServerGroupSettings);
--    serverGroup->setName("Freenode");
+-    serverGroup->setName("freenode");
 +    serverGroup->setName("Debian IRC");
      Konversation::ServerSettings server;
 -    server.setHost("chat.freenode.net");

-- 
Konversation packaging for Debian