[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.14.0-3-g4f44195

Modestas Vainius modax at alioth.debian.org
Mon May 30 10:35:07 UTC 2011


The following commit has been merged in the master branch:
commit 4f44195f9cda7d8786b61bfaa2b5855d9f3268d2
Author: Modestas Vainius <modax at debian.org>
Date:   Mon May 30 13:35:02 2011 +0300

    Drop overriden_command alias from dhmk.mk.
    
    Most packages should have already been transitioned to correct spelling.
---
 debian/changelog      |    2 ++
 qt-kde-team/2/dhmk.mk |    3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5d0581f..0b2a4d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ pkg-kde-tools (0.14.1) UNRELEASED; urgency=low
   * pkgkde-symbolshelper: no longer replace substs in the symbol name unless
     the symbol is tagged with a 'subst' tag. This was kept for compatibility
     with << 0.6 symbol files.
+  * Drop overriden_command alias from dhmk.mk. Most packages should have
+    already been transitioned to correct spelling.
 
  -- Modestas Vainius <modax at debian.org>  Sun, 29 May 2011 23:57:00 +0300
 
diff --git a/qt-kde-team/2/dhmk.mk b/qt-kde-team/2/dhmk.mk
index a24b689..267c4d5 100644
--- a/qt-kde-team/2/dhmk.mk
+++ b/qt-kde-team/2/dhmk.mk
@@ -40,9 +40,6 @@ butfirstword = $(patsubst $(firstword $(subst $2, ,$1))$2%,%,$1)
 # Use this to retrieve full command line to the overridden command in the
 # override_% targets
 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