[SCM] KDE Base Runtime module packaging branch, master, updated. debian/4.6.3-1-2-gcfeea98

[Modestas Vainius]

The following commit has been merged in the master branch:
commit cfeea98c969fe37fb513b9bdd0a2528d606017a0
Author: Modestas Vainius <modax at debian.org>
Date:   Sat May 28 01:15:46 2011 +0300

    Fix typo in debian/control: s/COnflicts/Conflicts/.
    
    Thanks to Jonathan Thomas.
---
 debian/changelog |    2 ++
 debian/control   |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2aa5e20..d01a940 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 kdebase-runtime (4:4.6.3-2) UNRELEASED; urgency=low
 
+  * Fix typo in debian/control: s/COnflicts/Conflicts/. Thanks to Jonathan
+    Thomas.
 
  -- Modestas Vainius <modax at debian.org>  Sat, 28 May 2011 01:13:21 +0300
 
diff --git a/debian/control b/debian/control
index df68ddc..053ac47 100644
--- a/debian/control
+++ b/debian/control
@@ -106,7 +106,7 @@ Priority: extra
 Depends: ${misc:Depends}, kdebase-runtime (= ${binary:Version}), kdelibs5-dbg
 Replaces: kdelibs5-dbg (<< 4:4.5), kdebase-workspace-dbg (<< 4:4.6)
 Breaks: kdelibs5-dbg (<< 4:4.5), kdebase-workspace-dbg (<< 4:4.6)
-COnflicts: kdelibs-dbg
+Conflicts: kdelibs-dbg
 Description: debugging symbols for KDE base runtime module
  This package contains the debugging symbols associated with kdebase-runtime.
  They will automatically be used by gdb for debugging kdebase-runtime related

-- 
KDE Base Runtime module packaging