[SCM] KTorrent Debian packaging. branch, master, updated. master/3.2.3.1+dfsg.1-1-3-g2dedb0a

[Modestas Vainius]

The following commit has been merged in the master branch:
commit ac9cca2816914adf655214540ab1d230b2bd6004
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Thu Aug 27 19:44:05 2009 +0300

    Switch debian/rules to use kde dh addons. Update build dependencies accordingly.
---
 debian/changelog |    2 ++
 debian/control   |    2 +-
 debian/rules     |    6 ++----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f5f2e39..26e9351 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,7 @@
 ktorrent (3.2.3.1+dfsg.1-2) UNRELEASED; urgency=low
 
+  * Switch debian/rules to use kde dh addons. Update build dependencies
+    accordingly.
 
  -- Modestas Vainius <modestas at vainius.eu>  Thu, 27 Aug 2009 19:42:14 +0300
 
diff --git a/debian/control b/debian/control
index 5659255..09ffd7f 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Modestas Vainius <modestas at vainius.eu>
 DM-Upload-Allowed: yes
-Build-Depends: cmake (>= 2.6.2), debhelper (>= 7.3), quilt (>= 0.4.6-7~), pkg-kde-tools (>= 0.4.11),
+Build-Depends: cmake (>= 2.6.2), debhelper (>= 7.3.16), quilt (>= 0.4.6-7~), 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,
diff --git a/debian/rules b/debian/rules
index 34de03b..3c90562 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,17 +3,15 @@
 DEB_CMAKE_CUSTOM_FLAGS += -DCMAKE_USE_RELATIVE_PATHS=ON \
                           -DWITH_SYSTEM_GEOIP:BOOL=ON \
                           -DWITH_BUILTIN_COUNTRY_FLAGS:BOOL=OFF
-DEB_KDE_LINK_WITH_AS_NEEDED := yes
+#DEB_KDE_LINK_WITH_AS_NEEDED := yes
 
 ifneq (,$(shell which tg))
 QUILT_PATCH_DIR := debian/patches
 include /usr/share/topgit/tg2quilt.mk
 endif
 
-include /usr/share/pkg-kde-tools/makefiles/1/debhelper/kde.mk
-
 %:
-	dh --dbg-package=ktorrent-dbg --with quilt $@
+	dh --dbg-package=ktorrent-dbg --with kde,quilt $@
 
 prune-tarball:
 	# Remove non-free components: flags and geoip stuff

-- 
KTorrent Debian packaging.