[SCM] "Network Management" Plasma widget Debian packaging branch, master, updated. debian/0.1-svn1029786-1

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 5002e1a0a821e0af8f75b82896a5241d48be1e3d
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Thu Oct 1 16:47:39 2009 +0300

    Use debhelper kde addon, bump build dependencies accordingly.
---
 debian/changelog |    1 +
 debian/control   |    2 +-
 debian/rules     |   12 +++++-------
 3 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index c5a4aa0..7ef440b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ plasma-widget-networkmanagement (0.1~svn1029786-0r1) UNRELEASED; urgency=low
     - Last Changed Author: wstephens
     - Last Changed Rev: 1029786
     - Last Changed Date: 2009-09-30 21:29:12 +0300
+  * Use debhelper kde addon, bump build dependencies accordingly.
 
  -- Modestas Vainius <modestas at vainius.eu>  Thu, 01 Oct 2009 16:35:39 +0300
 
diff --git a/debian/control b/debian/control
index 262e8fc..c06b577 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: debhelper (>= 7.3), cmake (>= 2.6.2), pkg-kde-tools (>= 0.4.10),
+Build-Depends: debhelper (>= 7.3.16), cmake (>= 2.6.2), pkg-kde-tools (>= 0.5),
  libqt4-dev (>= 4.4.0), kdelibs5-dev (>= 4:4.3.0), kdebase-workspace-dev (>= 4:4.3.0), libknotificationitem-1-dev,
  network-manager-dev (>= 0.7.0), libnm-util-dev (>= 0.7.0)
 Standards-Version: 3.8.3
diff --git a/debian/rules b/debian/rules
index cc644d7..727b1df 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,20 +1,18 @@
 #!/usr/bin/make -f
 
-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
-
-DEB_CMAKE_CUSTOM_FLAGS += -DCMAKE_USE_RELATIVE_PATHS=ON \
-                          -DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d
-
 DEB_BINARY_VERSION := $(shell dpkg-parsechangelog | grep '^Version: ' | sed 's/^Version: //')
 DEB_KNETWORKMANAGER_VERSION := $(shell echo '$(DEB_BINARY_VERSION)' | sed 's/^[[:digit:].]\+/1:0.8/')
 
+override_dh_auto_configure:
+	dh_auto_configure -Skde -- -DCMAKE_USE_RELATIVE_PATHS=ON -DDBUS_SYSTEM_POLICY_DIR=/etc/dbus-1/system.d
+
 override_dh_bugfiles:
 	dh_bugfiles -A
 
@@ -27,6 +25,6 @@ override_dh_gencontrol:
 	dh_gencontrol --remaining-packages
 
 %:
-	dh --dbg-package=plasma-widget-networkmanagement-dbg $@
+	dh --with kde --dbg-package=plasma-widget-networkmanagement-dbg $@
 
 .PHONY: override_dh_auto_test

-- 
"Network Management" Plasma widget Debian packaging