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

[Modestas Vainius]

The following commit has been merged in the master branch:
commit a61b20cde13d90a9534e2ba5c8ce6c91cf8cd757
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Sat Mar 13 19:29:13 2010 +0200

    Move kde4_flags to /usr/share/pkg-kde-tools/lib subdir.
---
 kde4_flags => datalib/kde4_flags              |    0
 debhelper/Debian/Debhelper/Buildsystem/kde.pm |    2 +-
 debian/changelog                              |    1 +
 debian/install                                |    1 -
 makefiles/1/variables.mk                      |    2 +-
 5 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/kde4_flags b/datalib/kde4_flags
similarity index 100%
rename from kde4_flags
rename to datalib/kde4_flags
diff --git a/debhelper/Debian/Debhelper/Buildsystem/kde.pm b/debhelper/Debian/Debhelper/Buildsystem/kde.pm
index 79f7229..c88961b 100644
--- a/debhelper/Debian/Debhelper/Buildsystem/kde.pm
+++ b/debhelper/Debian/Debhelper/Buildsystem/kde.pm
@@ -18,7 +18,7 @@ sub DESCRIPTION {
 sub KDE4_FLAGS_FILE {
     my $file = "kde4_flags";
     if (! -r $file) {
-        $file = "/usr/share/pkg-kde-tools/kde4_flags";
+        $file = "/usr/share/pkg-kde-tools/lib/kde4_flags";
     }
     if (! -r $file) {
         error "kde4_flags file could not be found";
diff --git a/debian/changelog b/debian/changelog
index 11674fc..f8838f6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ pkg-kde-tools (0.6.9~pre1) UNRELEASED; urgency=low
     hit by this bug.
   * Add a new tool `pkgkde-getbuildlogs` that can be used to get
     build logs from https://buildd.debian.org for the specified package.
+  * Move kde4_flags to /usr/share/pkg-kde-tools/lib subdir.
 
  -- Modestas Vainius <modax at debian.org>  Wed, 03 Mar 2010 23:43:10 +0200
 
diff --git a/debian/install b/debian/install
index d4c050b..cffca1a 100644
--- a/debian/install
+++ b/debian/install
@@ -1,3 +1,2 @@
 makefiles usr/share/pkg-kde-tools/
 qt-kde-team usr/share/pkg-kde-tools/
-kde4_flags usr/share/pkg-kde-tools/
diff --git a/makefiles/1/variables.mk b/makefiles/1/variables.mk
index 4b1dcbb..6957062 100644
--- a/makefiles/1/variables.mk
+++ b/makefiles/1/variables.mk
@@ -1,5 +1,5 @@
 # Standard Debian KDE 4 cmake flags
-_kde4_flags := $(shell cat $(dir $(lastword $(MAKEFILE_LIST)))../../kde4_flags)
+_kde4_flags := $(shell cat $(dir $(lastword $(MAKEFILE_LIST)))../../lib/kde4_flags)
 DEB_CMAKE_KDE4_FLAGS += $(_kde4_flags)
 
 # Custom KDE 4 global configuration file installation directory

-- 
Debian Qt/KDE packaging tools