[SCM] Debian Qt/KDE packaging tools branch, master, updated. master/0.4.11-10-g7c870a4

[Modestas Vainius]

The following commit has been merged in the master branch:
commit 7c870a47027590ce7d49f0beb49b4dad0168fc7c
Author: Modestas Vainius <modestas at vainius.eu>
Date:   Thu Aug 27 17:47:33 2009 +0300

    Move kde4_flags to the top level directory (/usr/share/pkg-kde-tools/).
    
    This means it is no longer under "version control".
---
 debhelper/Debian/Debhelper/Buildsystem/kde.pm |    4 ++--
 debian/install                                |    1 +
 makefiles/1/kde4_flags => kde4_flags          |    0 
 makefiles/1/variables.mk                      |    2 +-
 4 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debhelper/Debian/Debhelper/Buildsystem/kde.pm b/debhelper/Debian/Debhelper/Buildsystem/kde.pm
index 5903836..cdc1afe 100644
--- a/debhelper/Debian/Debhelper/Buildsystem/kde.pm
+++ b/debhelper/Debian/Debhelper/Buildsystem/kde.pm
@@ -16,9 +16,9 @@ sub DESCRIPTION {
 }
 
 sub KDE4_FLAGS_FILE {
-    my $file = "makefiles/1/kde4_flags";
+    my $file = "kde4_flags";
     if (! -r $file) {
-        $file = "/usr/share/pkg-kde-tools/makefiles/1/kde4_flags";
+        $file = "/usr/share/pkg-kde-tools/kde4_flags";
     }
     if (! -r $file) {
         error "kde4_flags file could not be found";
diff --git a/debian/install b/debian/install
index dfef926..a85d363 100644
--- a/debian/install
+++ b/debian/install
@@ -1,2 +1,3 @@
 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/kde4_flags b/kde4_flags
similarity index 100%
rename from makefiles/1/kde4_flags
rename to kde4_flags
diff --git a/makefiles/1/variables.mk b/makefiles/1/variables.mk
index de75430..a86bb29 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)))../../kde4_flags)
 DEB_CMAKE_KDE4_FLAGS += $(_kde4_flags)
 
 # Custom KDE 4 global configuration file installation directory

-- 
Debian Qt/KDE packaging tools