[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.11.4-22-g67e6299
Modestas Vainius
modax at alioth.debian.org
Wed Mar 30 21:52:47 UTC 2011
The following commit has been merged in the master branch:
commit c5220a3f468d5d789c6254968cbd6eb3d77f87f9
Author: Modestas Vainius <modax at debian.org>
Date: Wed Mar 30 22:06:05 2011 +0300
Rename 'overriden_command' to 'overridden_command'.
Actually, this is spelling correction. However, keep 'overriden_command' as an
alias for now in order not to break many packages which were written for
pkg-kde-tools << 0.12.
---
debian/changelog | 2 ++
qt-kde-team/2/dhmk.mk | 7 +++++--
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index dbd4f6d..bf178dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ pkg-kde-tools (0.12.0~pre7) UNRELEASED; urgency=low
libpkgs_addsubst_allLibraries work.
* qt-kde-team/2/debian-qt-kde.mk: attach debian/stamp-man-pages properly.
dh_auto_build is executed when build* targets are run, not binary*.
+ * Rename 'overriden_command' to 'overridden_command' (which is correct
+ spelling). But keep 'overriden_command' as an alias for now.
-- Modestas Vainius <modax at debian.org> Wed, 30 Mar 2011 16:32:12 +0300
diff --git a/qt-kde-team/2/dhmk.mk b/qt-kde-team/2/dhmk.mk
index fd2191c..a24b689 100644
--- a/qt-kde-team/2/dhmk.mk
+++ b/qt-kde-team/2/dhmk.mk
@@ -37,9 +37,12 @@ set_command_options = $(foreach t,$(filter $(or $3,%),$(dhmk_standard_targets)),
# $(call butfirstword,TEXT,DELIMITER)
butfirstword = $(patsubst $(firstword $(subst $2, ,$1))$2%,%,$1)
-# Use this to retrieve full command line to the overriden command in the
+# Use this to retrieve full command line to the overridden command in the
# override_% targets
-overriden_command = $($(DHMK_TARGET)_$(call butfirstword,$@,_)) $(DHMK_OPTIONS)
+overridden_command = $($(DHMK_TARGET)_$(call butfirstword,$@,_)) $(DHMK_OPTIONS)
+# Keep $(overriden_command) alias to preserve compatibility with debian/rules which
+# were written for pkg-kde-tools << 0.12.
+overriden_command = $(overridden_command)
# This makefile is not parallel compatible by design (e.g. command chains
# below)
--
Debian Qt/KDE packaging tools
More information about the pkg-kde-commits
mailing list