[SCM] KDE Games module packaging branch, master, updated. debian/4.4.5-1-32-g4a8f100

Modestas Vainius modax at alioth.debian.org
Thu Mar 31 23:41:00 UTC 2011


The following commit has been merged in the master branch:
commit 2e4a0a0d4df346eb1a44a7e1f3302b35b83eed40
Author: Modestas Vainius <modax at debian.org>
Date:   Fri Apr 1 00:09:29 2011 +0300

    Switch debian/rules engine to dhmk based qt-kde-team/2/*.
---
 debian/changelog |    1 +
 debian/control   |    2 +-
 debian/rules     |   28 ++++++++++++++++++++++------
 3 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 00655a7..957df98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,7 @@ kdegames (4:4.6.1-0r1) UNRELEASED; urgency=low
 
   [ Modestas Vainius ]
   * Point debian/control Vcs fields to the new Git repository.
+  * Switch debian/rules engine to dhmk based qt-kde-team/2/*.
 
   [ José Manuel Santamaría Lema ]
   * Bump kde-sc-dev-latest build dependency to 4:4.6.1.
diff --git a/debian/control b/debian/control
index 418eda7..99e65fd 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Daniel Schepler <schepler at debian.org>, Sune Vuorela <sune at debian.org>, Fathi Boudra <fabo at debian.org>,
  Armin Berres <armin+debian at space-based.de>, Modestas Vainius <modax at debian.org>, George Kiagiadakis <gkiagiad at csd.uoc.gr>
 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.12),
  kdelibs5-dev (>= 4:4.6), libphonon-dev (>= 4:4.3.0), libqt4-opengl-dev,
  libglu1-mesa-dev, ggzcore-bin, libqca2-dev, zlib1g-dev, libeigen2-dev,
  shared-mime-info
diff --git a/debian/rules b/debian/rules
index 34549e2..4c57334 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,30 @@
 #!/usr/bin/make -f
- 
-include /usr/share/pkg-kde-tools/qt-kde-team/1/debian-qt-kde.mk
 
-DEB_CMAKE_EXTRA_FLAGS += -DBIN_INSTALL_DIR=/usr/games
+include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
 
-DEB_INSTALL_DOCS_ALL :=
+override_dh_auto_configure:
+	$(overridden_command) -- -DBIN_INSTALL_DIR=/usr/games
 
-DEB_INSTALL_CHANGELOGS_ALL = $(shell for f in ChangeLog CHANGELOG CHANGES; do if test -s $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; then echo $(DEB_SRCDIR)/$(cdbs_curpkg)/$$f; break; fi; done)
+.PHONY: override_dh_auto_test
 
-DEB_DH_MAKESHLIBS_ARGS_ALL := -V -u-c0
+# Install upstream changelogs for each package if they exist
+upstream_changelogs = $(strip $(wildcard */ChangeLog) $(wildcard */CHANGELOG) $(wildcard */CHANGES))
+ifneq (,$(upstream_changelogs))
+$(upstream_changelogs):
+	$(and $(filter $(firstword $(subst /, ,$@)),$(all_packages)),\
+        dh_installchangelogs $(DHMK_OPTIONS) -p$(firstword $(subst /, ,$@) $@) $@)
+.PHONY: $(upstream_changelogs)
+endif
+
+override_dh_installchangelogs: all_packages := $(shell dh_listpackages)
+override_dh_installchangelogs: $(upstream_changelogs)
+	$(overridden_command) --remaining-packages
+
+override_dh_makeshlibs:
+	$(overridden_command) -V -- -c0
+
+override_dh_strip:
+	$(overridden_command) --dbg-package=kdegames-dbg
 
 generate-icons:
 	while read src dest; do \

-- 
KDE Games module packaging



More information about the pkg-kde-commits mailing list