[SCM] QJson library packaging branch, master, updated. debian/0.7.1-6-7-g55d2a95

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/krap/qjson.git;a=commitdiff;h=35c70a8

The following commit has been merged in the master branch:
commit 35c70a8cd710a5d18236c743d43fdc7705cb1c03
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Nov 7 18:55:32 2012 -0300

    refresh the patch that enables multiarch installation.
---
 debian/changelog                      |    1 +
 debian/patches/enable_multiarch.patch |   15 +++------------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 8e2821a..48909cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qjson (0.7.1-6r1) UNRELEASED; urgency=low
 
   * Add fix_cmake_variables.patch by Ralf Jung (Closes: #687537).
     - Remove now obsolete install_cmake_config.patch.
+    - Refresh enable_multiarch.patch.
 
  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Wed, 07 Nov 2012 17:42:29 -0300
 
diff --git a/debian/patches/enable_multiarch.patch b/debian/patches/enable_multiarch.patch
index 3e858d2..10b7ed8 100644
--- a/debian/patches/enable_multiarch.patch
+++ b/debian/patches/enable_multiarch.patch
@@ -8,16 +8,16 @@ Forwarded: not-needed
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -37,7 +37,7 @@
+@@ -37,7 +37,7 @@ SET( QT_DONT_USE_QTGUI TRUE )
  
  #add extra search paths for libraries and includes
  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 (LIB_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/lib${LIB_SUFFIX}/${CMAKE_LIBRARY_ARCHITECTURE}" 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_ROOT}/Modules" CACHE PATH "The directory to install FindQJSON.cmake to")
+ SET (CMAKECONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/cmake/${CMAKE_PROJECT_NAME}" CACHE PATH "Directory where to install QJSONConfig.cmake")
  
-@@ -56,7 +56,7 @@
+@@ -56,7 +56,7 @@ IF (NOT WIN32)
                    ${CMAKE_CURRENT_BINARY_DIR}/QJson.pc
                    @ONLY)
    INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/QJson.pc
@@ -26,12 +26,3 @@ Forwarded: not-needed
  ENDIF (NOT WIN32)
  
  # Include the cmake file needed to use qt4
-@@ -89,7 +89,7 @@
-                @ONLY)
- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/qjson-config.cmake
-               ${CMAKE_CURRENT_BINARY_DIR}/qjson-config-version.cmake
--        DESTINATION "lib/cmake/qjson")
-+        DESTINATION "lib/${CMAKE_LIBRARY_ARCHITECTURE}/cmake/qjson")
- 
- ADD_CUSTOM_TARGET(uninstall
-   "${CMAKE_COMMAND}" -P "${CMAKE_CURRENT_BINARY_DIR}/cmake_uninstall.cmake")

-- 
QJson library packaging