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

[Lisandro Damián Nicanor Pérez]

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

The following commit has been merged in the master branch:
commit 178333b14e7c081fa6dca62ff3e1c5293fc4bc8c
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Thu Nov 22 20:23:54 2012 -0300

    Refresh debian/patches/enable_multiarch.patch.
---
 debian/changelog                      |    1 +
 debian/patches/enable_multiarch.patch |   18 +++++-------------
 2 files changed, 6 insertions(+), 13 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 359b282..7da9197 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ qjson (0.8.0-1) UNRELEASED; urgency=low
 
   * New upstream release.
   * Remove fix_cmake_variables.patch, not necessary anymore.
+  * Refresh enable_multiarch.patch.
 
  -- Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>  Thu, 22 Nov 2012 19:58:21 -0300
 
diff --git a/debian/patches/enable_multiarch.patch b/debian/patches/enable_multiarch.patch
index 31c779e..9e881a0 100644
--- a/debian/patches/enable_multiarch.patch
+++ b/debian/patches/enable_multiarch.patch
@@ -5,25 +5,17 @@ and companion files with patchs with arch triplets.
 
 Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
 Forwarded: not-needed
-Last-Update: 2012-11-07
+Last-Update: 2012-11-22
 
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -37,7 +37,7 @@ SET( QT_DONT_USE_QTGUI TRUE )
+@@ -42,8 +42,7 @@ ENDIF()
+ INCLUDE( ${QT_USE_FILE} )
  
  #add extra search paths for libraries and includes
- SET (LIB_SUFFIX "" CACHE STRING "Define suffix of directory name (32/64)" )
+-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 (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")
  
-@@ -56,7 +56,7 @@ IF (NOT WIN32)
-                   ${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

-- 
QJson library packaging