[SCM] QJson library packaging branch, master, updated. debian/0.7.1-2-18-gf1f2c61

[Lisandro D. N. Pérez Meyer]

The following commit has been merged in the master branch:
commit 86dced5f9bf45db5d37d49c80fd05be432162b62
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Jul 28 14:24:29 2011 -0300

    Patch CMakeLists.txt to install stuff in arch-triplet.
---
 debian/changelog                      |    2 ++
 debian/patches/enable_multiarch.patch |   29 +++++++++++++++++++++++++++++
 debian/patches/series                 |    1 +
 3 files changed, 32 insertions(+), 0 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 5390127..1b64b2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ qjson (0.7.1-4) UNRELEASED; urgency=low
     - B-D on cmake >= 2.8.5. Thanks Modestas Vainius for the tip.
     - Update debian/compat to 9.
     - Modify debian/*.install files to support arch triplets.
+    - Patch CMakeLists.txt to install stuff in ${CMAKE_LIBRARY_ARCHITECTURE},
+      wich is the same as DEB_HOST_MULTIARCH. Also thanks Modestas.
 
  -- Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>  Thu, 28 Jul 2011 13:08:55 -0300
 
diff --git a/debian/patches/enable_multiarch.patch b/debian/patches/enable_multiarch.patch
new file mode 100644
index 0000000..fe9d1e1
--- /dev/null
+++ b/debian/patches/enable_multiarch.patch
@@ -0,0 +1,29 @@
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -37,7 +37,7 @@
+ 
+ #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")
+ 
+@@ -56,7 +56,7 @@
+                   ${CMAKE_CURRENT_BINARY_DIR}/QJson.pc
+                   @ONLY)
+   INSTALL (FILES ${CMAKE_CURRENT_BINARY_DIR}/QJson.pc
+-           DESTINATION lib${LIB_SUFFIX}/pkgconfig)
++           DESTINATION lib${LIB_SUFFIX}/${CMAKE_LIBRARY_ARCHITECTURE}/pkgconfig)
+ 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")
diff --git a/debian/patches/series b/debian/patches/series
index 41d02d6..3383f8b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 install_cmake_config.patch
+enable_multiarch.patch

-- 
QJson library packaging