[SCM] Konversation packaging for Debian branch, master, updated. master/1.2-alpha6-1-2-gaa6f4f5

[Modestas Vainius]

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

    Use kde addon in debian/rules. Adjust build dependencies accordingly.
---
 debian/changelog |    1 +
 debian/control   |    2 +-
 debian/rules     |    6 ++----
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a8656c8..6389e89 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 konversation (1.2~alpha6-2) UNRELEASED; urgency=low
 
+  * Use kde addon in debian/rules. Adjust build dependencies accordingly.
 
  -- Modestas Vainius <modestas at vainius.eu>  Thu, 27 Aug 2009 19:17:12 +0300
 
diff --git a/debian/control b/debian/control
index 261a0a3..8c72e52 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: net
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Modestas Vainius <modestas at vainius.eu>
-Build-Depends: debhelper (>= 7.3), cmake (>= 2.6.2), pkg-kde-tools (>= 0.4.10), quilt (>= 0.46-7~),
+Build-Depends: debhelper (>= 7.3.16), cmake (>= 2.6.2), pkg-kde-tools (>= 0.5), quilt (>= 0.46-7~),
  libqt4-dev (>= 4.4.3), kdelibs5-dev (>= 4:4.2.0), kdepimlibs5-dev (>= 4:4.2.0),
  libx11-dev, x11proto-core-dev, libxss-dev, libqca2-dev
 Standards-Version: 3.8.2
diff --git a/debian/rules b/debian/rules
index 1f69130..9c38d52 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,6 @@
 #!/usr/bin/make -f
 
-DEB_KDE_LINK_WITH_AS_NEEDED := yes
-
-include /usr/share/pkg-kde-tools/makefiles/1/debhelper/kde.mk
+#DEB_KDE_LINK_WITH_AS_NEEDED := yes
 
 ifneq (,$(shell which tg))
 QUILT_PATCH_DIR := debian/patches
@@ -18,4 +16,4 @@ override_dh_install:
 	fi
 
 %:
-	dh --with quilt --dbg-package=konversation-dbg $@
+	dh --with kde,quilt --dbg-package=konversation-dbg $@

-- 
Konversation packaging for Debian