[SCM] KTorrent Debian packaging. branch, experimental, updated. debian/4.0-beta2-1

[Modestas Vainius]

The following commit has been merged in the experimental branch:
commit c60e10d86cf2464a311eb8db80e71427408a5146
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Mon Apr 5 16:36:07 2010 +0300

    Bump libqt4-dev build dependency to 4:4.6.
    
    Needed by plasmoid. As a result, drop Build-Conflicts with libqt4-dev 4:4.5.2.
---
 debian/changelog |    2 ++
 debian/control   |    2 +-
 2 files changed, 3 insertions(+), 1 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a28c54c..e6e8654 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ ktorrent (4.0~beta2-0r1) UNRELEASED; urgency=low
   * Merge changes from debian 3.3.{3,4} packages.
   * Drop hunk 1 from the general/fix_target_link_libraries.diff patch - merged
     upstream.
+  * Bump libqt4-dev build dependency to 4:4.6 - needed by plasmoid. As a
+    result, drop Build-Conflicts with libqt4-dev 4:4.5.2.
 
  -- Modestas Vainius <modax at debian.org>  Mon, 28 Dec 2009 15:00:04 +0200
 
diff --git a/debian/control b/debian/control
index 1a7035f..068dbe9 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Build-Depends: cmake (>= 2.6.2), debhelper (>= 7.3.16), pkg-kde-tools (>= 0.5),
  kdelibs5-dev (>= 4:4.2.0), libphonon-dev (>= 4:4.3.0), kdepimlibs5-dev (>= 4:4.2.0),
  kdebase-workspace-dev (>= 4:4.2.0), libtag1-dev,
  pkg-config, libgeoip-dev, libgmp3-dev, libqca2-dev, libx11-dev, libboost-serialization-dev,
-Build-Conflicts: libqt4-dev (= 4:4.5.2-1), libqt4-dev (= 4:4.5.2-2)
+ libqt4-dev (>= 4:4.6)
 Standards-Version: 3.8.3
 Homepage: http://ktorrent.org/
 Vcs-Git: git://git.debian.org/pkg-kde/kde-extras/ktorrent.git

-- 
KTorrent Debian packaging.