[SCM] libkscreen packaging branch, master, updated. c0f29a8001687c3908bebe1d3923af3be84673e3

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-extras/libkscreen.git;a=commitdiff;h=7862594

The following commit has been merged in the master branch:
commit 7862594eebfa0e36c2f11551507d0de94489e2c4
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Dec 5 19:34:04 2013 +0100

    New patch: libdir.diff, install in the m-a paths.
---
 debian/changelog           |  1 +
 debian/patches/libdir.diff | 44 ++++++++++++++++++++++++++++++++++++++++++++
 debian/patches/series      |  1 +
 3 files changed, 46 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8675049..8e5dc38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 libkscreen (1.0.2-1) UNRELEASED; urgency=low
 
   * Initial release.
+  * New patch: libdir.diff, install in the m-a paths.
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 05 Dec 2013 12:52:48 +0100
diff --git a/debian/patches/libdir.diff b/debian/patches/libdir.diff
new file mode 100644
index 0000000..a423f64
--- /dev/null
+++ b/debian/patches/libdir.diff
@@ -0,0 +1,44 @@
+Index: libkscreen/CMakeLists.txt
+===================================================================
+--- libkscreen.orig/CMakeLists.txt	2013-12-05 18:59:52.814934202 +0100
++++ libkscreen/CMakeLists.txt	2013-12-05 19:29:31.047662754 +0100
+@@ -54,10 +54,14 @@
+ 
+ set(BIN_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/bin)
+ set(LIB_INSTALL_DIR ${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX})
++set(LIB_DESTINATION "${LIB_INSTALL_DIR}" CACHE STRING
++    "Library directory name")
++set(PKGCONFIG_INSTALL_PREFIX "${LIB_DESTINATION}/pkgconfig/" CACHE STRING
++    "Base directory for pkgconfig files")
+ 
+ set(INSTALL_TARGETS_DEFAULT_ARGS  RUNTIME DESTINATION "${BIN_INSTALL_DIR}"
+-                                  LIBRARY DESTINATION "${LIB_INSTALL_DIR}"
+-                                  ARCHIVE DESTINATION "${LIB_INSTALL_DIR}" COMPONENT Devel )
++                                  LIBRARY DESTINATION "${LIB_DESTINATION}"
++                                  ARCHIVE DESTINATION "${LIB_DESTINATION}" COMPONENT Devel )
+ 
+ include_directories(${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${QT_INCLUDES} ${KDE4_INCLUDES})
+ 
+Index: libkscreen/src/CMakeLists.txt
+===================================================================
+--- libkscreen.orig/src/CMakeLists.txt	2013-12-05 18:59:52.814934202 +0100
++++ libkscreen/src/CMakeLists.txt	2013-12-05 19:28:42.000000000 +0100
+@@ -34,5 +34,6 @@
+ 
+ if(NOT WIN32)
+    configure_file(${CMAKE_CURRENT_SOURCE_DIR}/kscreen.pc.in ${CMAKE_CURRENT_BINARY_DIR}/kscreen.pc @ONLY)
+-   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kscreen.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
++   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/kscreen.pc DESTINATION
++       ${PKGCONFIG_INSTALL_PREFIX})
+ endif(NOT WIN32)
+Index: libkscreen/src/kscreen.pc.in
+===================================================================
+--- libkscreen.orig/src/kscreen.pc.in	2013-12-05 16:16:41.965284266 +0100
++++ libkscreen/src/kscreen.pc.in	2013-12-05 19:31:25.730012516 +0100
+@@ -1,5 +1,5 @@
+ prefix=@CMAKE_INSTALL_PREFIX@
+-libdir=@LIB_INSTALL_DIR@
++libdir=@LIB_DESTINATION@
+ includedir=@CMAKE_INSTALL_PREFIX@/include
+ 
+ Name: kscreen
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..b7e163a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+libdir.diff

-- 
libkscreen packaging