[SCM] KDevelop PG-Qt packaging branch, master, updated. debian/0.9.5-2-8-g8a164a3

Pino Toscano pino at alioth.debian.org
Mon Mar 26 09:57:00 UTC 2012


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/kdevelop-pg-qt.git;a=commitdiff;h=55a577d

The following commit has been merged in the master branch:
commit 55a577dbca8c3057a20ee569e350a95db40aab61
Author: Pino Toscano <pino at debian.org>
Date:   Sun Mar 25 16:20:10 2012 +0200

    fix the installation of the cmake config files
    
    ... if there is no KDE4 stuff available
---
 debian/changelog                           |    2 ++
 debian/patches/fix_cmake_installation.diff |   15 +++++++++++++++
 debian/patches/series                      |    1 +
 3 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8703e1b..2fc718e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ kdevelop-pg-qt (1.0.0-0r0) UNRELEASED; urgency=low
   * Add a watch file.
   * Bump Standards-Version to 3.9.3, no changes required.
   * Bump debhelper build dependency and compat to 9.
+  * Fix the installation of the cmake config files if there is no KDE4 stuff
+    available (patch fix_cmake_installation.diff).
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Mon, 30 Jan 2012 21:38:08 +0100
 
diff --git a/debian/patches/fix_cmake_installation.diff b/debian/patches/fix_cmake_installation.diff
new file mode 100644
index 0000000..7eabf21
--- /dev/null
+++ b/debian/patches/fix_cmake_installation.diff
@@ -0,0 +1,15 @@
+Author: Pino Toscano <pino at debian.org>
+Description: Set LIB_INSTALL_DIR even with no KDE4 stuff.
+Forwarded: no
+Last-Update: 2012-03-25
+
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -15,6 +15,7 @@ if(NOT KDE4_FOUND)
+     cmake_policy(SET CMP0002 OLD)
+     find_package(Qt4)
+     set(DATA_INSTALL_DIR share)
++    set(LIB_INSTALL_DIR lib)
+ endif(NOT KDE4_FOUND)
+ 
+ # Use colored output (since cmake 2.4.0)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..1374984
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+fix_cmake_installation.diff

-- 
KDevelop PG-Qt packaging



More information about the pkg-kde-commits mailing list