[SCM] krecipes packaging branch, master, updated. upstream/2.0_beta2-16-gee929a3

[Pino Toscano]

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

The following commit has been merged in the master branch:
commit 586d937d6de46790f3e1f98c3d6ff42a3ecd5b4f
Author: Pino Toscano <pino at debian.org>
Date:   Thu Sep 11 11:17:44 2014 +0200

    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     | 12 +++++-------
 3 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2e03f02..a496ebe 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,10 @@ krecipes (2.0~beta2-4) UNRELEASED; urgency=medium
     - bump compat to 9
   * Sort the .install files, and strip the debian/tmp prefix.
   * Install krecipes.xpm via .install file, instead of copying it in rules.
+  * 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>  Thu, 11 Sep 2014 10:28:36 +0200
 
diff --git a/debian/control b/debian/control
index e67849e..7a5fc7b 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: Matthias Julius <mdeb at julius-net.net>,
  José Manuel Santamaría Lema <panfaust at gmail.com>
-Build-Depends: cdbs, debhelper (>= 9), cmake, pkg-kde-tools,
+Build-Depends: debhelper (>= 9), cmake, pkg-kde-tools,
  kdelibs5-dev, libsqlite3-dev, libqimageblitz-dev, libxml2-dev, libxslt1-dev,
  libqtwebkit-dev, shared-desktop-ontologies, shared-mime-info
 Standards-Version: 3.9.1
diff --git a/debian/rules b/debian/rules
index 7c90f65..7a55b72 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,12 @@
 #!/usr/bin/make -f
   
-# Add here any variable or target overrides you need
+export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 
-DEB_INSTALL_DOCS_krecipes = KRAZY cmake/COPYING-CMAKE-SCRIPTS
-DEB_DH_STRIP_ARGS = --dbg-package=krecipes-dbg
+%:
+	dh $@ --parallel --with kde
 
-DEB_KDE_LINK_WITH_AS_NEEDED := yes
-
-include /usr/share/pkg-kde-tools/makefiles/1/cdbs/kde.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
+override_dh_strip:
+	dh_strip --dbg-package=krecipes-dbg
 
 get-orig-source:
 	@@dh_testdir

-- 
krecipes packaging