[SCM] Debian Qt/KDE packaging tools branch, master, updated. experimental/0.4.6-5-g10a42f2

[Modestas Vainius]

The following commit has been merged in the master branch:
commit a192ee883f925d5258c0015ccb0461cda6862b96
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Thu May 21 09:03:03 2009 +0300

    Change Conflicts to Breaks.
    
    Signed-off-by: Modestas Vainius <modestas at vainius.eu>

diff --git a/debian/changelog b/debian/changelog
index 446c98a..dded4cb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,10 @@
-pkg-kde-tools (0.4.6.1) unstable; urgency=low
+pkg-kde-tools (0.4.7) unstable; urgency=low
 
-  * dpkg 1.15.1 entered unstable, pkg-kde-tools 0.4.6 follows.
+  * dpkg 1.15.1 entered unstable, so pkg-kde-tools 0.4.7 follows.
+  * Change Conflicts to Breaks on dpkg-dev/kdelibs5 (more apppropriate in
+    this case).
 
- -- Modestas Vainius <modestas at vainius.eu>  Thu, 21 May 2009 08:52:45 +0300
+ -- Modestas Vainius <modestas at vainius.eu>  Thu, 21 May 2009 09:02:09 +0300
 
 pkg-kde-tools (0.4.6) experimental; urgency=low
 
diff --git a/debian/control b/debian/control
index ef91897..bbaedcf 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,7 @@ Package: pkg-kde-tools
 Architecture: all
 Depends: ${perl:Depends}
 Suggests: debhelper (>= 7), cdbs, dpkg-dev (>= 1.15.0)
-Conflicts: dpkg-dev (<< 1.15.0), kdelibs5-dev (<< 4:4.2.2)
+Breaks: dpkg-dev (<< 1.15), kdelibs5-dev (<< 4:4.2.2)
 Description: common makesnippets and build scripts for KDE4 related packages
  This package contains makefiles setting the default build arguments for KDE4
  packages.

-- 
Debian Qt/KDE packaging tools