[SCM] QJson library packaging branch, master, updated. debian/0.8.1-3-5-g1ecc13d

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit f77f548dbf8fc66241512ceef73e8296c4470243
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Nov 9 20:26:48 2015 -0300

    Refresh enable_multiarch.patch.
---
 debian/changelog                      |  1 +
 debian/patches/enable_multiarch.patch | 10 +++++++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 994ff12..b15d468 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 qjson (0.8.1+git103-gee054a7) UNRELEASED; urgency=medium
 
   * New upstream snapshot.
+  * Refresh enable_multiarch.patch.
 
  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Sun, 09 Mar 2014 00:18:52 -0300
 
diff --git a/debian/patches/enable_multiarch.patch b/debian/patches/enable_multiarch.patch
index 9e881a0..4046d7b 100644
--- a/debian/patches/enable_multiarch.patch
+++ b/debian/patches/enable_multiarch.patch
@@ -7,15 +7,19 @@ Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
 Forwarded: not-needed
 Last-Update: 2012-11-22
 
+---
+ CMakeLists.txt |    3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -42,8 +42,7 @@ ENDIF()
- INCLUDE( ${QT_USE_FILE} )
+@@ -73,8 +73,7 @@ ENDIF()
+ 
  
  #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/${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 (CMAKECONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/cmake/${CMAKE_PROJECT_NAME}" CACHE PATH "Directory where to install QJSONConfig.cmake")
+ SET (CMAKECONFIG_INSTALL_DIR "${LIB_INSTALL_DIR}/cmake/${CMAKE_PROJECT_NAME}${QJSON_SUFFIX}" CACHE PATH "Directory where to install QJSONConfig.cmake")
  

-- 
QJson library packaging