[SCM] Konversation packaging for Debian branch, master, updated. master/1.2-alpha6-1-9-g697fd2e

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 253cb2382aad3f008bbc517db1d580382cf602ae
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Mon Sep 21 17:59:43 2009 +0300

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

diff --git a/debian/changelog b/debian/changelog
index aefac94..e76c985 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ konversation (1.2~beta1-0r1) UNRELEASED; urgency=low
   * New upstream development release.
   * Use kde addon in debian/rules. Adjust build dependencies accordingly.
   * Bump Standards-Version to 3.8.3, no changes needed.
+  * Refresh patches.
 
  -- Modestas Vainius <modestas at vainius.eu>  Mon, 21 Sep 2009 17:37:28 +0300
 
diff --git a/debian/patches/debian/dbug_autoreplace.diff b/debian/patches/debian/dbug_autoreplace.diff
index 2579501..bef6ca3 100644
--- a/debian/patches/debian/dbug_autoreplace.diff
+++ b/debian/patches/debian/dbug_autoreplace.diff
@@ -11,10 +11,10 @@ Signed-off-by: Modestas Vainius <modestas at vainius.eu>
  1 files changed, 1 insertions(+), 0 deletions(-)
 
 diff --git a/src/config/preferences.cpp b/src/config/preferences.cpp
-index f809202..07de2d2 100644
+index 46b4964..a854786 100644
 --- a/src/config/preferences.cpp
 +++ b/src/config/preferences.cpp
-@@ -122,6 +122,7 @@ const QList<QStringList> Preferences::defaultAutoreplaceList()
+@@ -119,6 +119,7 @@ const QList<QStringList> Preferences::defaultAutoreplaceList()
      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");
@@ -23,4 +23,4 @@ index f809202..07de2d2 100644
  }
  
 -- 
-tg: (3787b1d..) debian/dbug_autoreplace (depends on: upstream)
+tg: (02e5a8f..) debian/dbug_autoreplace (depends on: upstream)
diff --git a/debian/patches/debian/debian_channel.diff b/debian/patches/debian/debian_channel.diff
index 68bf5c3..a6ad6be 100644
--- a/debian/patches/debian/debian_channel.diff
+++ b/debian/patches/debian/debian_channel.diff
@@ -11,10 +11,10 @@ Signed-off-by: Modestas Vainius <modestas at vainius.eu>
  1 files changed, 6 insertions(+), 4 deletions(-)
 
 diff --git a/src/config/preferences.cpp b/src/config/preferences.cpp
-index f809202..dda420d 100644
+index 46b4964..eaf07a8 100644
 --- a/src/config/preferences.cpp
 +++ b/src/config/preferences.cpp
-@@ -62,14 +62,16 @@ Preferences::Preferences()
+@@ -59,14 +59,16 @@ Preferences::Preferences()
      mIdentity->setNicknameList(nickList);
  
      Konversation::ServerGroupSettingsPtr serverGroup(new Konversation::ServerGroupSettings);
@@ -36,4 +36,4 @@ index f809202..dda420d 100644
      serverGroup->setExpanded(false);
      mServerGroupHash.insert(0, serverGroup);
 -- 
-tg: (3787b1d..) debian/debian_channel (depends on: upstream)
+tg: (02e5a8f..) debian/debian_channel (depends on: upstream)

-- 
Konversation packaging for Debian