[SCM] QJson library packaging branch, master, updated. debian/0.7.1-1-20-g760cd73
Lisandro D. N. Pérez Meyer
lisandropm-guest at alioth.debian.org
Sun Jun 12 19:09:52 UTC 2011
The following commit has been merged in the master branch:
commit 760cd738aa06a64c520f2789487eee8f9425fe85
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date: Sun Jun 12 15:45:49 2011 -0300
Create CMake's config files.
---
debian/changelog | 2 +
debian/libqjson-dev.install | 2 +-
debian/patches/install_cmake_config.patch | 90 +++++++++++++++++++++++++++++
debian/patches/series | 1 +
4 files changed, 94 insertions(+), 1 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7d056a6..517589b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -17,6 +17,8 @@ qjson (0.7.1-2) UNRELEASED; urgency=low
* Be more verbose on install files.
* Build-Depend on pkg-kde-tools in order to use pkgkde-symbolshelper.
* Enable parallel build.
+ * Create CMake's config files using changes introduced upstream. See
+ install_cmake_config.patch for more info (Closes: #628981).
-- Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com> Wed, 27 Oct 2010 15:17:47 -0300
diff --git a/debian/libqjson-dev.install b/debian/libqjson-dev.install
index bc7eee3..db3e9a0 100644
--- a/debian/libqjson-dev.install
+++ b/debian/libqjson-dev.install
@@ -1,4 +1,4 @@
usr/include/*
usr/lib/libqjson.so
usr/lib/pkgconfig/*
-usr/share/apps/cmake/modules/FindQJSON.cmake
+usr/share/cmake-*/Modules/FindQJSON.cmake
diff --git a/debian/patches/install_cmake_config.patch b/debian/patches/install_cmake_config.patch
new file mode 100644
index 0000000..923515c
--- /dev/null
+++ b/debian/patches/install_cmake_config.patch
@@ -0,0 +1,90 @@
+Description: install a CMake config file.
+ This patch enables the creation of CMake's config files for
+ QJson. It has been taken from upstream's GIT, taking the difference between
+ tag 0.7.1 and master's commit 83c1323 of CMakeLists.txt.
+ It also adds qjson-config-version.cmake.in and qjson-config.cmake.in,
+ taken from the same commit mentioned above.
+Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
+Bug-Debian: http://bugs.debian.org/628981
+Forwarded: not-needed
+
+--- /dev/null
++++ qjson-0.7.1/qjson-config-version.cmake.in
+@@ -0,0 +1,9 @@
++SET(PACKAGE_VERSION "@QJSON_LIB_VERSION_STRING@")
++IF (PACKAGE_FIND_VERSION VERSION_EQUAL PACKAGE_VERSION)
++ SET(PACKAGE_VERSION_EXACT "true")
++ENDIF (PACKAGE_FIND_VERSION VERSION_EQUAL PACKAGE_VERSION)
++IF (NOT PACKAGE_FIND_VERSION VERSION_GREATER PACKAGE_VERSION)
++ SET(PACKAGE_VERSION_COMPATIBLE "true")
++ELSE (NOT PACKAGE_FIND_VERSION VERSION_GREATER PACKAGE_VERSION)
++ SET(PACKAGE_VERSION_UNSUITABLE "true")
++ENDIF (NOT PACKAGE_FIND_VERSION VERSION_GREATER PACKAGE_VERSION)
+--- /dev/null
++++ qjson-0.7.1/qjson-config.cmake.in
+@@ -0,0 +1,3 @@
++SET(@CMAKE_PROJECT_NAME at _LIBRARIES "@LIB_INSTALL_DIR@/@LIB_OUT_NAME@" CACHE FILEPATH "Libraries for @CMAKE_PROJECT_NAME@")
++SET(@CMAKE_PROJECT_NAME at _INCLUDE_DIR "@INCLUDE_INSTALL_DIR@" CACHE PATH "Include path for @CMAKE_PROJECT_NAME@")
++SET(@CMAKE_PROJECT_NAME at _FOUND "TRUE")
+--- qjson-0.7.1.orig/CMakeLists.txt
++++ qjson-0.7.1/CMakeLists.txt
+@@ -39,7 +39,7 @@ SET( QT_DONT_USE_QTGUI TRUE )
+ SET (LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
+ SET (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}" CACHE STRING "Directory where lib will install")
+ SET (INCLUDE_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/include" CACHE PATH "The directory the headers are installed in")
+-SET (CMAKE_MODULES_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/apps/cmake/modules" CACHE PATH "The directory to install FindQRpc.cmake to")
++SET (CMAKE_MODULES_INSTALL_DIR "${CMAKE_ROOT}/Modules" CACHE PATH "The directory to install FindQJSON.cmake to")
+
+
+ set(QJSON_LIB_MAJOR_VERSION "0")
+@@ -72,10 +72,24 @@ ENDIF (KDE4_BUILD_TESTS OR QJSON_BUILD_T
+ add_subdirectory(cmake/modules)
+
+
+-#CONFIGURE_FILE(
+-# "${CMAKE_MODULE_PATH}/cmake_uninstall.cmake.in"
+-# "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
+-# IMMEDIATE @ONLY)
++CONFIGURE_FILE(
++ "${CMAKE_MODULE_PATH}/cmake_uninstall.cmake.in"
++ "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake"
++ IMMEDIATE @ONLY)
++
++GET_TARGET_PROPERTY(LIB_OUT_NAME qjson LOCATION)
++GET_FILENAME_COMPONENT(LIB_OUT_NAME ${LIB_OUT_NAME} NAME)
++
++# cmake-modules
++CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/qjson-config.cmake.in
++ ${CMAKE_CURRENT_BINARY_DIR}/qjson-config.cmake
++ @ONLY)
++CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/qjson-config-version.cmake.in
++ ${CMAKE_CURRENT_BINARY_DIR}/qjson-config-version.cmake
++ @ONLY)
++INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/qjson-config.cmake
++ ${CMAKE_CURRENT_BINARY_DIR}/qjson-config-version.cmake
++ DESTINATION "lib/cmake/qjson")
+
+-#ADD_CUSTOM_TARGET(uninstall
+-# "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
++ADD_CUSTOM_TARGET(uninstall
++ "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")
+--- /dev/null
++++ qjson-0.7.1/cmake/modules/cmake_uninstall.cmake.in
+@@ -0,0 +1,17 @@
++IF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
++ MESSAGE(FATAL_ERROR "Cannot find install manifest: \"@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt\"")
++ENDIF(NOT EXISTS "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt")
++
++FILE(READ "@CMAKE_CURRENT_BINARY_DIR@/install_manifest.txt" files)
++STRING(REGEX REPLACE "
" ";" files "${files}")
++FOREACH(file ${files})
++ MESSAGE(STATUS "Uninstalling \"$ENV{DESTDIR}${file}\"")
++ EXEC_PROGRAM(
++ "@CMAKE_COMMAND@" ARGS "-E remove \"$ENV{DESTDIR}${file}\""
++ OUTPUT_VARIABLE rm_out
++ RETURN_VALUE rm_retval
++ )
++ IF(NOT "${rm_retval}" STREQUAL 0)
++ MESSAGE(FATAL_ERROR "Problem when removing \"$ENV{DESTDIR}${file}\"")
++ ENDIF(NOT "${rm_retval}" STREQUAL 0)
++ENDFOREACH(file)
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..41d02d6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+install_cmake_config.patch
--
QJson library packaging
More information about the pkg-kde-commits
mailing list