summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorModestas Vainius <modestas@vainius.eu>2010-03-13 19:29:13 +0200
committerModestas Vainius <modestas@vainius.eu>2010-03-13 19:29:13 +0200
commita61b20cde13d90a9534e2ba5c8ce6c91cf8cd757 (patch)
tree309cee60f90c86a143e84d6a02ceb55c71ff1318
parent54baf0e04cda545616f7e959113e595a22040d9a (diff)
downloadpkg-kde-tools-a61b20cde13d90a9534e2ba5c8ce6c91cf8cd757.tar.gz
Move kde4_flags to /usr/share/pkg-kde-tools/lib subdir.
-rw-r--r--datalib/kde4_flags (renamed from kde4_flags)0
-rw-r--r--debhelper/Debian/Debhelper/Buildsystem/kde.pm2
-rw-r--r--debian/changelog1
-rw-r--r--debian/install1
-rw-r--r--makefiles/1/variables.mk2
5 files changed, 3 insertions, 3 deletions
diff --git a/kde4_flags b/datalib/kde4_flags
index 3d2f65f..3d2f65f 100644
--- a/kde4_flags
+++ b/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@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