[globjects] 02/06: Refresh patch queue.

[Ghislain Vaillant]

This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch debian/master
in repository globjects.

commit 8ea7611cdfee1254e2cb7a4faf9a74ba32432ff2
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Sun Nov 20 22:38:29 2016 +0000

    Refresh patch queue.
---
 debian/patches/Add-multiarch-support.patch     | 31 +++++++++++++++-----------
 debian/patches/Set-versioning-properties.patch |  4 ++--
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/debian/patches/Add-multiarch-support.patch b/debian/patches/Add-multiarch-support.patch
index 5bb642a..bacd9f5 100644
--- a/debian/patches/Add-multiarch-support.patch
+++ b/debian/patches/Add-multiarch-support.patch
@@ -3,16 +3,16 @@ Date: Sat, 17 Sep 2016 11:02:39 +0100
 Subject: Add multiarch support.
 
 ---
- CMakeLists.txt                  |  9 +++++----
- globjects-config.cmake          | 41 +----------------------------------------
+ CMakeLists.txt                  |  9 ++++----
+ globjects-config.cmake          | 46 +----------------------------------------
  source/globjects/CMakeLists.txt |  2 +-
- 3 files changed, 7 insertions(+), 45 deletions(-)
+ 3 files changed, 7 insertions(+), 50 deletions(-)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index c5566ed..0ec0354 100644
+index 2375f97..40fa652 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -101,14 +101,15 @@ endif()
+@@ -110,14 +110,15 @@ endif()
  
  # Installation paths
  if(UNIX AND SYSTEM_DIR_INSTALL)
@@ -31,7 +31,7 @@ index c5566ed..0ec0354 100644
      set(INSTALL_INCLUDE   "include")                # /usr/[local]/include
      set(INSTALL_DOC       "share/doc/${project}")   # /usr/[local]/share/doc/<project>
      set(INSTALL_SHORTCUTS "share/applications")     # /usr/[local]/share/applications
-@@ -162,7 +163,7 @@ add_subdirectory(deploy)
+@@ -171,7 +172,7 @@ add_subdirectory(deploy)
  install(FILES "${PROJECT_BINARY_DIR}/VERSION" DESTINATION ${INSTALL_ROOT} COMPONENT runtime)
  
  # Install cmake find script for the project
@@ -41,13 +41,13 @@ index c5566ed..0ec0354 100644
  # Install the project meta files
  install(FILES AUTHORS   DESTINATION ${INSTALL_ROOT} COMPONENT runtime)
 diff --git a/globjects-config.cmake b/globjects-config.cmake
-index f4e8d10..f1e6e33 100644
+index c90c0ba..f1e6e33 100644
 --- a/globjects-config.cmake
 +++ b/globjects-config.cmake
-@@ -1,40 +1 @@
+@@ -1,45 +1 @@
 -
 -# This config script tries to locate the project either in its source tree
--# of from an install location.
+-# or from an install location.
 -# 
 -# Please adjust the list of submodules to search for.
 -
@@ -83,14 +83,19 @@ index f4e8d10..f1e6e33 100644
 -endif()
 -
 -# Try common build locations
--find_modules("build/cmake")
--find_modules("build-debug/cmake")
+-if("${CMAKE_BUILD_TYPE}" STREQUAL "Debug")
+-    find_modules("build-debug/cmake")
+-    find_modules("build/cmake")
+-else()
+-    find_modules("build/cmake")
+-    find_modules("build-debug/cmake")
+-endif()
 +include("${CMAKE_CURRENT_LIST_DIR}/globjects-export.cmake")
 diff --git a/source/globjects/CMakeLists.txt b/source/globjects/CMakeLists.txt
-index a3b87f3..e12779f 100644
+index 86e315a..3d87d9a 100644
 --- a/source/globjects/CMakeLists.txt
 +++ b/source/globjects/CMakeLists.txt
-@@ -432,6 +432,6 @@ install(DIRECTORY
+@@ -434,6 +434,6 @@ install(DIRECTORY
  # CMake config
  install(EXPORT ${target}-export
      NAMESPACE   ${META_PROJECT_NAME}::
diff --git a/debian/patches/Set-versioning-properties.patch b/debian/patches/Set-versioning-properties.patch
index 611751b..8acda58 100644
--- a/debian/patches/Set-versioning-properties.patch
+++ b/debian/patches/Set-versioning-properties.patch
@@ -7,10 +7,10 @@ Subject: Set versioning properties.
  1 file changed, 2 insertions(+)
 
 diff --git a/source/globjects/CMakeLists.txt b/source/globjects/CMakeLists.txt
-index e12779f..3d49eda 100644
+index 3d87d9a..281435e 100644
 --- a/source/globjects/CMakeLists.txt
 +++ b/source/globjects/CMakeLists.txt
-@@ -322,6 +322,8 @@ set_target_properties(${target}
+@@ -324,6 +324,8 @@ set_target_properties(${target}
      PROPERTIES
      ${DEFAULT_PROJECT_OPTIONS}
      FOLDER "${IDE_FOLDER}"

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/globjects.git