[SCM] Konversation packaging for Debian branch, master, updated. master/1.2-alpha3-1-8-g4d544b3

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 4d544b3b2c84f6b46581b2f72d65d86175156d19
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat Jul 4 10:20:21 2009 +0300

    Update debian/patches.
    
    Signed-off-by: Modestas Vainius <modestas at vainius.eu>
---
 debian/changelog                            |    4 +++-
 debian/patches/debian/dbug_autoreplace.diff |    8 ++++----
 debian/patches/debian/debian_channel.diff   |    8 ++++----
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e0e7e71..6ebc0da 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ konversation (1.2~alpha4-1) unstable; urgency=low
   * Bump Standards-Version to 3.8.2: no changes needed.
   * Build-Depend on libqca2-dev.
   * Update debian/copyright, drop debian/copyright.* files.
+  * Update debian/patches:
+    - debian/dbug_autoreplace - adapt to upstream changes.
 
- -- Modestas Vainius <modestas at vainius.eu>  Sat, 04 Jul 2009 10:06:53 +0300
+ -- Modestas Vainius <modestas at vainius.eu>  Sat, 04 Jul 2009 10:19:45 +0300
 
 konversation (1.2~alpha3-1) unstable; urgency=low
 
diff --git a/debian/patches/debian/dbug_autoreplace.diff b/debian/patches/debian/dbug_autoreplace.diff
index 836fc8e..8b6cce2 100644
--- a/debian/patches/debian/dbug_autoreplace.diff
+++ b/debian/patches/debian/dbug_autoreplace.diff
@@ -11,16 +11,16 @@ 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 fe4a4a2..4bd833d 100644
+index f809202..07de2d2 100644
 --- a/src/config/preferences.cpp
 +++ b/src/config/preferences.cpp
-@@ -129,6 +129,7 @@ const QList<QStringList> Preferences::defaultAutoreplaceList()
+@@ -122,6 +122,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]+)" << "http://bugs.kde.org/show_bug.cgi?id=%2");
+     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");
      return defaultList;
  }
  
 -- 
-tg: (27343f7..) debian/dbug_autoreplace (depends on: upstream)
+tg: (cc79915..) debian/dbug_autoreplace (depends on: upstream)
diff --git a/debian/patches/debian/debian_channel.diff b/debian/patches/debian/debian_channel.diff
index a778ba2..8149bfa 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 fe4a4a2..cd71ee1 100644
+index f809202..dda420d 100644
 --- a/src/config/preferences.cpp
 +++ b/src/config/preferences.cpp
-@@ -69,14 +69,16 @@ Preferences::Preferences()
+@@ -62,14 +62,16 @@ Preferences::Preferences()
      mIdentity->setNicknameList(nickList);
  
      Konversation::ServerGroupSettingsPtr serverGroup(new Konversation::ServerGroupSettings);
@@ -34,6 +34,6 @@ index fe4a4a2..cd71ee1 100644
 +    channel.setName("#debian-kde");
      serverGroup->addChannel(channel);
      serverGroup->setExpanded(false);
-     mServerGroupList.append(serverGroup);
+     mServerGroupHash.insert(0, serverGroup);
 -- 
-tg: (27343f7..) debian/debian_channel (depends on: upstream)
+tg: (cc79915..) debian/debian_channel (depends on: upstream)

-- 
Konversation packaging for Debian