[SCM] KDE SDK module packaging branch, master, updated. debian/4.4.5-1-38-gcca8a1d

José Manuel Santamaría Lema santa-guest at alioth.debian.org
Thu Mar 31 22:26:29 UTC 2011


The following commit has been merged in the master branch:
commit cca8a1d254e4b2243d56010ca91b8c3787925128
Author: José Manuel Santamaría Lema <panfaust at gmail.com>
Date:   Fri Apr 1 00:28:09 2011 +0200

    Switch debian/rules engine to dhmk based qt-kde-team/2/*
---
 debian/changelog |    2 ++
 debian/control   |    2 +-
 debian/rules     |    6 +++++-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 088dea3..7125051 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -40,6 +40,8 @@ kdesdk (4:4.6.1-0r0) UNRELEASED; urgency=low
     - liboktetakastengui4
   * Bump kde-sc-dev-latest build dependency to 4:4.6.1.
   * Bump pkg-kde-tools build dependency to 0.12.
+  * Switch debian/rules engine to dhmk based qt-kde-team/2/*
+    - and remove cdbs from Build-Depends.
   * Bump S-V to 3.9.1; update Replaces/Breaks/Conflicts.
   * Add myself to Uploaders.
   
diff --git a/debian/control b/debian/control
index 0746bbf..3901fd0 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Fathi Boudra <fabo at debian.org>, Sune Vuorela <sune at debian.org>, Armin
  Modestas Vainius <modax at debian.org>, George Kiagiadakis <kiagiadakis.george at gmail.com>,
  José Manuel Santamaría Lema <panfaust at gmail.com>
 Build-Depends: kde-sc-dev-latest (>= 4:4.6.1),
- cdbs (>= 0.4.51), cmake, debhelper (>= 7), pkg-kde-tools (>= 0.12),
+ cmake, debhelper (>= 7), pkg-kde-tools (>= 0.12),
  kdepimlibs5-dev (>= 4:4.6), libphonon-dev (>= 4:4.3.1),
  libsvn-dev, libstreamanalyzer-dev (>= 0.6.3), libxslt1-dev, libboost-dev,
  binutils-dev, libhunspell-dev, libltdl-dev, libx11-dev, x11proto-core-dev,
diff --git a/debian/rules b/debian/rules
index feef527..9db3570 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,4 +1,8 @@
 #!/usr/bin/make -f
 
-include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
+.PHONY: override_dh_auto_test
+
+override_dh_strip:
+	$(overriden_command) --dbg-package=kdesdk-dbg

-- 
KDE SDK module packaging



More information about the pkg-kde-commits mailing list