[SCM] knights packaging branch, master, updated. debian/2.5.0-1-5-g3962d32

[Pino Toscano]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/knights.git;a=commitdiff;h=adfa7eb

The following commit has been merged in the master branch:
commit adfa7eb1c0d17e50b529d5b08818eb79ab805457
Author: Pino Toscano <pino at debian.org>
Date:   Sun Nov 29 12:34:48 2015 +0100

    migrate to the dh sequencer
    
    - use the dh sequencer in rules, using the kde addon, with parallel
      build, and in as-needed mode
    - drop the cdbs build dependency
---
 debian/changelog |  4 ++++
 debian/control   |  2 +-
 debian/rules     | 14 +++++++++-----
 3 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d1dd3d4..099354e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,10 @@ knights (2.5.0-2) UNRELEASED; urgency=medium
   * Fix typo in the description of knights-dbg. (Closes: #724819)
   * Remove menu file and its pixmap, as knights already provides a desktop
     file.
+  * Migrate to the dh sequencer:
+    - use the dh sequencer in rules, using the kde addon, with parallel build,
+      and in as-needed mode
+    - drop the cdbs build dependency
 
  -- Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>  Sun, 29 Nov 2015 12:11:57 +0100
 
diff --git a/debian/control b/debian/control
index 3270e4f..e60ba46 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: games
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: José Manuel Santamaría Lema <panfaust at gmail.com>
-Build-Depends: debhelper (>= 9.0.0~), cdbs, pkg-kde-tools, cmake,
+Build-Depends: debhelper (>= 9.0.0~), pkg-kde-tools, cmake,
  kdelibs5-dev (>> 4:4.9),
  libkdegames-dev (>> 4:4.9)
 Standards-Version: 3.9.4
diff --git a/debian/rules b/debian/rules
index bb26957..18fb88c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,12 @@
 #!/usr/bin/make -f
 
-DEB_KDE_LINK_WITH_AS_NEEDED := yes
-DEB_CMAKE_EXTRA_FLAGS += -DBIN_INSTALL_DIR=/usr/games
-DEB_DH_STRIP_ARGS = --dbg-package=knights-dbg
+export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 
-include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
+%:
+	dh $@ --parallel --with kde
+
+override_dh_auto_configure:
+	dh_auto_configure -- -DBIN_INSTALL_DIR=/usr/games
+
+override_dh_strip:
+	dh_strip --dbg-package=knights-dbg

-- 
knights packaging