[SCM] KDevelop packaging branch, master, updated. debian/4.5.2-1-9-g6ea6f09

Pino Toscano pino at moszumanska.debian.org
Sun Jan 19 10:40:57 UTC 2014


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

The following commit has been merged in the master branch:
commit cd0bc2342cbf611b9d727954c87edb0d17d1dc41
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jan 19 11:39:29 2014 +0100

    convert rules to dh
---
 debian/changelog |  2 ++
 debian/control   |  3 +--
 debian/rules     | 30 +++++++++++++++++++++++++-----
 3 files changed, 28 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2e064bd..526caab 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -11,6 +11,8 @@ kdevelop (4:4.6.0-0r1) UNRELEASED; urgency=medium
   * Bump the debhelper compatibility to 9:
     - bump compat 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>  Sun, 19 Jan 2014 09:41:18 +0100
 
diff --git a/debian/control b/debian/control
index 20ac57d..3e69db7 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,
-               cmake,
+Build-Depends: cmake,
                debhelper (>= 9),
                kde-workspace-dev (>= 4:4.5.2),
                kdevplatform-dev (>= 1.6.0),
diff --git a/debian/rules b/debian/rules
index 09f21b6..4ce1865 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,29 @@
 #!/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
 
-# Work around a conflict with kapptemplate
-binary-install/kdevelop-data::
-	find debian/$(cdbs_curpkg) -type f -name qmake_qt4guiapp.tar.bz2 | xargs rm -f
+%:
+	dh $@ --parallel --with kde
 
-DEB_DBG_PACKAGE_kdevelop := kdevelop-dbg
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf debian/man/out
+	-rmdir debian/man
+
+override_dh_auto_build:
+	dh_auto_build --parallel
+	if ! test -d debian/man/out; then mkdir -p debian/man/out; fi
+	for f in $$(find debian/man -name '*.man'); do \
+		soelim -I debian/man $$f \
+		> debian/man/out/`basename $$f .man`.`head -n1 $$f | awk '{print $$NF}'`; \
+	done
+
+override_dh_auto_install:
+	dh_auto_install
+	# Work around a conflict with kapptemplate
+	find debian/tmp -type f -name qmake_qt4guiapp.tar.bz2 | xargs rm -fv
+
+override_dh_strip:
+	dh_strip --dbg-package=kdevelop-dbg
+
+.PHONY: override_dh_auto_test

-- 
KDevelop packaging



More information about the pkg-kde-commits mailing list