[SCM] Konversation packaging for Debian branch, master, updated. debian/1.3-beta1-1

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 54b64b1a379ce5369aed5585eb5417635ec6bd62
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat May 22 23:23:20 2010 +0300

    Rename patches.
    
    - debian/dbug_autoreplace.diff -> debian_dbug_autoreplace.diff;
    - debian/debian_channel.diff -> debian_channel.diff.
---
 debian/changelog                                   |    3 +++
 debian/patches/{debian => }/debian_channel.diff    |    4 ----
 ...toreplace.diff => debian_dbug_autoreplace.diff} |    6 +-----
 debian/patches/series                              |    4 ++--
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3ddccc0..80d1750 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 konversation (1.3~beta1-1) UNRELEASED; urgency=low
 
   * New upstream development release.
+  * Rename patches:
+    - debian/dbug_autoreplace.diff -> debian_dbug_autoreplace.diff;
+    - debian/debian_channel.diff -> debian_channel.diff.
 
  -- Modestas Vainius <modax at debian.org>  Sat, 22 May 2010 22:45:28 +0300
 
diff --git a/debian/patches/debian/debian_channel.diff b/debian/patches/debian_channel.diff
similarity index 88%
rename from debian/patches/debian/debian_channel.diff
rename to debian/patches/debian_channel.diff
index 27b9378..8c49bf3 100644
--- a/debian/patches/debian/debian_channel.diff
+++ b/debian/patches/debian_channel.diff
@@ -10,8 +10,6 @@ Signed-off-by: Modestas Vainius <modestas at vainius.eu>
  src/config/preferences.cpp |   10 ++++++----
  1 files changed, 6 insertions(+), 4 deletions(-)
 
-diff --git a/src/config/preferences.cpp b/src/config/preferences.cpp
-index 0371bc2..84353c2 100644
 --- a/src/config/preferences.cpp
 +++ b/src/config/preferences.cpp
 @@ -61,14 +61,16 @@ Preferences::Preferences()
@@ -35,5 +33,3 @@ index 0371bc2..84353c2 100644
      serverGroup->addChannel(channel);
      serverGroup->setExpanded(false);
      mServerGroupHash.insert(0, serverGroup);
--- 
-tg: (89e9aaf..) debian/debian_channel (depends on: upstream)
diff --git a/debian/patches/debian/dbug_autoreplace.diff b/debian/patches/debian_dbug_autoreplace.diff
similarity index 77%
rename from debian/patches/debian/dbug_autoreplace.diff
rename to debian/patches/debian_dbug_autoreplace.diff
index 335b063..520c541 100644
--- a/debian/patches/debian/dbug_autoreplace.diff
+++ b/debian/patches/debian_dbug_autoreplace.diff
@@ -10,11 +10,9 @@ Signed-off-by: Modestas Vainius <modestas at vainius.eu>
  src/config/preferences.cpp |    1 +
  1 files changed, 1 insertions(+), 0 deletions(-)
 
-diff --git a/src/config/preferences.cpp b/src/config/preferences.cpp
-index 0371bc2..27bdacd 100644
 --- a/src/config/preferences.cpp
 +++ b/src/config/preferences.cpp
-@@ -121,6 +121,7 @@ const QList<QStringList> Preferences::defaultAutoreplaceList()
+@@ -121,6 +121,7 @@ const QList<QStringList> Preferences::de
      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");
@@ -22,5 +20,3 @@ index 0371bc2..27bdacd 100644
      return defaultList;
  }
  
--- 
-tg: (89e9aaf..) debian/dbug_autoreplace (depends on: upstream)
diff --git a/debian/patches/series b/debian/patches/series
index 1ad5bb7..67ce773 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,2 @@
-debian/dbug_autoreplace.diff -p1
-debian/debian_channel.diff -p1
+debian_dbug_autoreplace.diff
+debian_channel.diff

-- 
Konversation packaging for Debian