[SCM] KDE Education module packaging branch, master, updated. debian/4.4.5-2-42-g196ba81

Modestas Vainius modax at alioth.debian.org
Tue Mar 29 21:36:57 UTC 2011


The following commit has been merged in the master branch:
commit 0b48d788aeddb9493c2f17eb6716d20f8a490e98
Author: Modestas Vainius <modax at debian.org>
Date:   Tue Mar 29 21:29:54 2011 +0300

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

diff --git a/debian/changelog b/debian/changelog
index 924542e..2b8558f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -31,6 +31,9 @@ kdeedu (4:4.6.1-0r1) UNRELEASED; urgency=low
   * cantor: mention cantor-backend-octave in the description, and suggest it
   * Add DEP-3 header to patch 03_fix_kalgebramobile_ftbfs.diff.
 
+  [ Modestas Vainius ]
+  * Switch debian/rules engine to dhmk based qt-kde-team/2/*.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 02 Sep 2010 21:17:18 +0300
 
 kdeedu (4:4.4.5-2) unstable; urgency=low
diff --git a/debian/control b/debian/control
index b9190e4..5d1684a 100644
--- a/debian/control
+++ b/debian/control
@@ -7,7 +7,7 @@ Uploaders: Daniel Schepler <schepler at debian.org>, Sune Vuorela <sune at debian.org>
  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.9),
+ cmake, debhelper (>= 7.2.7~), pkg-kde-tools (>= 0.11),
  dpkg-dev (>= 1.15.5), kdelibs5-dev (>= 4:4.6), libphonon-dev (>= 4:4.3.0),
  libboost-python-dev, libcfitsio3-dev (>= 3.040),
  libglu1-mesa-dev, libgs-dev, libnova-dev, libqt4-opengl-dev,
diff --git a/debian/rules b/debian/rules
index c63205e..3f1a524 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,23 @@
 #!/usr/bin/make -f
 
-include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
-
-DEB_DH_INSTALL_ARGS += -Xusr/share/kde4/apps/marble/data/LICENSE.txt
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V -u-c0
-DEB_DH_SHLIBDEPS_ARGS_libmarble4 := -- -xkdebase-runtime
-DEB_DH_SHLIBDEPS_ARGS_libkiten4 := -- -xkdebase-runtime
-DEB_DH_SHLIBDEPS_ARGS_libkdeedu4 := -- -xkdebase-runtime
-DEB_CMAKE_CUSTOM_FLAGS += -DWITH_DESIGNER_PLUGIN=ON
-
-# Generate strict shlibs
-DEB_STRICT_LOCAL_SHLIBS_PACKAGES = $(DEB_LIBRARY_PACKAGES)
-include /usr/share/pkg-kde-tools/qt-kde-team/1/library-packages.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
+include /usr/share/pkg-kde-tools/qt-kde-team/2/library-packages.mk
+
+override_dh_auto_configure:
+	$(overriden_command) -- -DWITH_DESIGNER_PLUGIN=ON
+
+.PHONY: override_dh_auto_test
+
+override_dh_install:
+	$(overriden_command) -Xusr/share/kde4/apps/marble/data/LICENSE.txt
+
+override_dh_makeshlibs:
+	$(overriden_command) -V -- -c0
+
+override_dh_shlibdeps:
+	$(overriden_command) $(patsubst %,-p%,$(filter lib%,$(shell dh_listpackages))) -- -xkdebase-runtime
+	$(overriden_command) --remaining-packages
+
+override_dh_strip:
+	$(overriden_command) --dbg-package=kdeedu-dbg

-- 
KDE Education module packaging



More information about the pkg-kde-commits mailing list