[SCM] KTorrent Debian packaging. branch, master, updated. debian/4.1.1-1-3-g514bd31

[Modestas Vainius]

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

    Add kdebase-workspace-dev (<< 4:4.6) to Build-Conflicts temporary.
    
    Needed for KDE SC 4.6 transition.
---
 debian/changelog |    2 ++
 debian/control   |    1 +
 2 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index e31f4e3..22ba40c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 ktorrent (4.1.1-2) UNRELEASED; urgency=low
 
+  * Add kdebase-workspace-dev (<< 4:4.6) to Build-Conflicts temporary. Needed
+    for KDE SC 4.6 transition.
 
  -- Modestas Vainius <modax at debian.org>  Sat, 28 May 2011 01:46:10 +0300
 
diff --git a/debian/control b/debian/control
index 7bc1575..962caaf 100644
--- a/debian/control
+++ b/debian/control
@@ -8,6 +8,7 @@ Build-Depends: cmake (>= 2.6.2), debhelper (>= 7.3.16), pkg-kde-tools (>= 0.5),
  kdepimlibs5-dev (>= 4:4.4), libboost-dev, libqtwebkit-dev | libqt4-dev (<< 4:4.7.0),
  kdebase-workspace-dev (>= 4:4.4), libktorrent-dev (>= 1.1.1),
  libtag1-dev, libgeoip-dev, libx11-dev
+Build-Conflicts: kdebase-workspace-dev (<< 4:4.6)
 Standards-Version: 3.9.2
 Homepage: http://ktorrent.org/
 Vcs-Git: git://git.debian.org/pkg-kde/kde-extras/ktorrent.git

-- 
KTorrent Debian packaging.