[SCM] Konversation packaging for Debian branch, master, updated. debian/1.5-2-10-g2efa544

[Diane Trout]

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

The following commit has been merged in the master branch:
commit 2efa544407e1c369b2e78466023c3441da768cab
Author: Diane Trout <diane at ghic.org>
Date:   Fri Aug 28 11:10:23 2015 -0700

    Refresh debian_channel.diff and debian_dbug_autoreplace.diff patches
---
 debian/changelog                            |  1 +
 debian/patches/debian_channel.diff          | 17 +++++++----------
 debian/patches/debian_dbug_autoreplace.diff |  8 ++++----
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index daf5bb9..50a2000 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ konversation (1.6-1) UNRELEASED; urgency=medium
   * Update Build-Depends to KF5 packages.
   * Update install files for new Plasma5 locations.
   * Upstream is no longer providing a TODO file, remove it from docs.
+  * Refresh debian_channel.diff and debian_dbug_autoreplace.diff patches
 
  -- Diane Trout <diane at debian.org>  Thu, 27 Aug 2015 22:17:59 -0700
 
diff --git a/debian/patches/debian_channel.diff b/debian/patches/debian_channel.diff
index 166e015..36e418f 100644
--- a/debian/patches/debian_channel.diff
+++ b/debian/patches/debian_channel.diff
@@ -12,24 +12,21 @@ Signed-off-by: Modestas Vainius <modestas at vainius.eu>
 
 --- a/src/config/preferences.cpp
 +++ b/src/config/preferences.cpp
-@@ -61,14 +61,16 @@
-     mIdentity->setNicknameList(nickList);
- 
+@@ -64,12 +64,14 @@
      Konversation::ServerGroupSettingsPtr serverGroup(new Konversation::ServerGroupSettings);
--    serverGroup->setName("freenode");
-+    serverGroup->setName("Debian IRC");
+     serverGroup->setName(QStringLiteral("freenode"));
      Konversation::ServerSettings server;
--    server.setHost("chat.freenode.net");
+-    server.setHost(QStringLiteral("chat.freenode.net"));
 -    server.setPort(8001);
-+    server.setHost("irc.debian.org");
++    server.setHost(QStringLiteral("irc.debian.org"));
 +    server.setPort(7000);
      serverGroup->addServer(server);
      serverGroup->setIdentityId(mIdentity->id());
      Konversation::ChannelSettings channel;
--    channel.setName("#konversation");
-+    channel.setName("#debian");
+-    channel.setName(QStringLiteral("#konversation"));
++    channel.setName(QStringLiteral("#debian"));
 +    serverGroup->addChannel(channel);
-+    channel.setName("#debian-kde");
++    channel.setName(QStringLiteral("#debian-kde"));
      serverGroup->addChannel(channel);
      serverGroup->setExpanded(false);
      mServerGroupHash.insert(0, serverGroup);
diff --git a/debian/patches/debian_dbug_autoreplace.diff b/debian/patches/debian_dbug_autoreplace.diff
index 520c541..410a79e 100644
--- a/debian/patches/debian_dbug_autoreplace.diff
+++ b/debian/patches/debian_dbug_autoreplace.diff
@@ -12,11 +12,11 @@ Signed-off-by: Modestas Vainius <modestas at vainius.eu>
 
 --- a/src/config/preferences.cpp
 +++ b/src/config/preferences.cpp
-@@ -121,6 +121,7 @@ const QList<QStringList> Preferences::de
+@@ -122,6 +122,7 @@
      QList<QStringList> defaultList;
-     defaultList.append(QStringList() << "1" << "o" << "\[\[([^\s]+)\]\]" << "http://en.wikipedia.org/wiki/Special:Search?go=Go&search=%1");
-     defaultList.append(QStringList() << "1" << "o" << "(BUG:|bug:)([0-9]+)" << "https://bugs.kde.org/show_bug.cgi?id=%2");
-+    defaultList.append(QStringList() << "1" << "o" << "([Dd][Bb][Uu][Gg]:)(\w+)" << "http://bugs.debian.org/%2");
+     defaultList.append(QStringList() << QStringLiteral("1") << QStringLiteral("o") << QStringLiteral("\[\[([^\s]+)\]\]") << QStringLiteral("http://en.wikipedia.org/wiki/Special:Search?go=Go&search=%1"));
+     defaultList.append(QStringList() << QStringLiteral("1") << QStringLiteral("o") << QStringLiteral("(BUG:|bug:)([0-9]+)") << QStringLiteral("https://bugs.kde.org/show_bug.cgi?id=%2"));
++    defaultList.append(QStringList() << QStringLiteral("1") << QStringLiteral("o") << QStringLiteral("([Dd][Bb][Uu][Gg]:)(\w+)") << QStringLiteral("https://bugs.debian.org/%2"));
      return defaultList;
  }
  

-- 
Konversation packaging for Debian