[SCM] KDevelop Platform packaging branch, master, updated. debian/1.5.2-1-6-g0a924ae

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/kdevplatform.git;a=commitdiff;h=0a924ae

The following commit has been merged in the master branch:
commit 0a924aec644801c3816ab484040aaf1cc92c3baa
Author: Pino Toscano <pino at debian.org>
Date:   Sat Jan 18 19:58:06 2014 +0100

    convert rules to dh
---
 debian/changelog |  2 ++
 debian/control   |  3 +--
 debian/rules     | 19 +++++++++++++++----
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 59fe027..eabb91e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -10,6 +10,8 @@ kdevplatform (1.6.0-0r1) UNRELEASED; urgency=medium
   * Bump the debhelper compatibility to 9:
     - bump compact to 9
     - bump the debhelper build dependency to 9
+  * Convert rules to the dh sequencer with kde addon.
+  * Remove unused cdbs build dependency.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 18 Jan 2014 13:56:19 +0100
 
diff --git a/debian/control b/debian/control
index 2c424f2..38bd3be 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,7 @@ Uploaders: Fathi Boudra <fabo at debian.org>,
            Jeremy Lainé <jeremy.laine at m4x.org>,
            George Kiagiadakis <kiagiadakis.george at gmail.com>,
            Andreas Cord-Landwehr <cola at uni-paderborn.de>
-Build-Depends: cdbs (>= 0.4.51),
-               cmake (>= 2.8.0),
+Build-Depends: cmake (>= 2.8.0),
                debhelper (>= 9),
                kdelibs5-dev (>= 4:4.7.0),
                libboost-serialization-dev,
diff --git a/debian/rules b/debian/rules
index 61a7fd0..05be55d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,18 @@
 #!/usr/bin/make -f
 
-include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
+export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 
-DEB_DBG_PACKAGE_kdevplatform7-libs := kdevplatform-dbg
-DEB_DBG_PACKAGE_libsublime7 := kdevplatform-dbg
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V
+%:
+	dh $@ --parallel --with kde
+
+override_dh_strip:
+	dh_strip --dbg-package=kdevplatform-dbg
+
+override_dh_makeshlibs:
+	dh_makeshlibs -V -Xusr/lib/kde4/
+
+override_dh_shlibdeps:
+	dh_shlibdeps
+	dh_sameversiondep
+
+.PHONY: override_dh_auto_test

-- 
KDevelop Platform packaging