[SCM] Debian Qt/KDE packaging tools branch, master, updated. debian/0.6.8-11-g9433db3

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 658667c2baf10b1c4df0b617a0e06bd62834a1b5
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sun Mar 14 01:14:53 2010 +0200

    Completely drop makefiles/1/debhelper/kde.mk.
    
    It was deprecated in 0.5.
---
 debian/README.Debian         |    4 ++--
 debian/changelog             |    1 +
 makefiles/1/debhelper/kde.mk |   21 ---------------------
 3 files changed, 3 insertions(+), 23 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index 1b1623a..f34da0d 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -9,8 +9,8 @@ pkg-kde-tools for Debian
     $(DEB_CMAKE_KDE4_FLAGS) to get the kde4 default variables.
   - If you want to use Debhelper dh(1) command sequencer, you will find section
     "Using with Debhelper Command Sequencer `dh`" below interesting. Please
-    note that /usr/share/pkg-kde-tools/makefiles/1/debhelper/kde.mk snippet
-    has been deprecated since pkg-kde-tools 0.5.0.
+    note that /usr/share/pkg-kde-tools/makefiles/1/debhelper/kde.mk has been
+    dropped in pkg-kde-tools 0.7.0.
 
  Note: to enable linking with --as-needed (disabled by default), you should set
        DEB_KDE_LINK_WITH_AS_NEEDED to 'yes' before the include.
diff --git a/debian/changelog b/debian/changelog
index 1d6c1df..6460602 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,7 @@ pkg-kde-tools (0.6.9~pre2) UNRELEASED; urgency=low
   * Move kde4_flags to /usr/share/pkg-kde-tools/lib subdir.
   * `pkgkde-symbolshelper *patch`: properly assign version that was chosen in
     the prompt.
+  * Completely drop makefiles/1/debhelper/kde.mk. It was deprecated in 0.5.
 
  -- Modestas Vainius <modax at debian.org>  Wed, 03 Mar 2010 23:43:10 +0200
 
diff --git a/makefiles/1/debhelper/kde.mk b/makefiles/1/debhelper/kde.mk
deleted file mode 100644
index 042a2f9..0000000
--- a/makefiles/1/debhelper/kde.mk
+++ /dev/null
@@ -1,21 +0,0 @@
-# Include default KDE 4 cmake configuration variables
-include /usr/share/pkg-kde-tools/makefiles/1/variables.mk
-
-# Check if debhelper (>= 7.3) is installed
-DEB_DH_VERSION := $(shell perl -MDebian::Debhelper::Dh_Version -e \
-    'my $$v=$$Debian::Debhelper::Dh_Version::version;\
-     my @v=split(/\./,$$v); \
-     print (($$v[0]>7 || $$v[0]==7 && $$v[1]>=3) ? "ok" : $$v), "\n";' 2>/dev/null)
-ifneq ($(DEB_DH_VERSION),ok)
-    $(error Debhelper is too old ($(DEB_DH_VERSION)) on your system. Upgrade to 7.3.0 or later)
-endif
-
-$(warning This kde.mk make snippet is deprecated. Please use kde sequence addon and/or kde buildsystem)
-
-# Configure with KDE cmake flags by default.
-DEB_KDE_OVERRIDE_DH_AUTO_CONFIGURE ?= override_dh_auto_configure
-$(DEB_KDE_OVERRIDE_DH_AUTO_CONFIGURE):
-	dh_auto_configure -- $(DEB_CMAKE_KDE4_FLAGS) $(DEB_CMAKE_CUSTOM_FLAGS)
-
-%:
-	dh $@

-- 
Debian Qt/KDE packaging tools