[pybind11] 04/07: merge patched into master

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository pybind11.

commit ff73215e0a52a67d990c8d34215fa22fe8fec583
Merge: 62a7aef 4b4ca77
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Fri Feb 10 16:42:44 2017 +0000

    merge patched into master

 CMakeLists.txt                                     |  3 +++
 debian/.git-dpm                                    |  4 ++--
 ...03-Arch-indep-CMake-package-configuration.patch | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 4 files changed, 32 insertions(+), 2 deletions(-)

diff --cc debian/.git-dpm
index 3cbfca3,0000000..826c608
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,11 -1,0 +1,11 @@@
 +# see git-dpm(1) from git-dpm package
- 3477f64b6fc33b30e49c85f8f23997ef5efb61ba
- 3477f64b6fc33b30e49c85f8f23997ef5efb61ba
++4b4ca77e50c3e4a729e1ef5b7da8620c845ce217
++4b4ca77e50c3e4a729e1ef5b7da8620c845ce217
 +72d57df80676e2965c20128f76f00d4ae6fd696d
 +72d57df80676e2965c20128f76f00d4ae6fd696d
 +pybind11_2.0.1.orig.tar.gz
 +e558565968cd385d9fad73c18362a46f70eea8aa
 +398236
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0003-Arch-indep-CMake-package-configuration.patch
index 0000000,0000000..c06f583
new file mode 100644
--- /dev/null
+++ b/debian/patches/0003-Arch-indep-CMake-package-configuration.patch
@@@ -1,0 -1,0 +1,26 @@@
++From 4b4ca77e50c3e4a729e1ef5b7da8620c845ce217 Mon Sep 17 00:00:00 2001
++From: Ghislain Antony Vaillant <ghisvail at gmail.com>
++Date: Tue, 7 Feb 2017 20:08:59 +0000
++Subject: Arch-indep CMake package configuration
++
++---
++ CMakeLists.txt | 3 +++
++ 1 file changed, 3 insertions(+)
++
++diff --git a/CMakeLists.txt b/CMakeLists.txt
++index 341f845..4757ea4 100644
++--- a/CMakeLists.txt
+++++ b/CMakeLists.txt
++@@ -117,9 +117,12 @@ if (PYBIND11_INSTALL)
++   configure_package_config_file(tools/${PROJECT_NAME}Config.cmake.in
++                                 "${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake"
++                                 INSTALL_DESTINATION ${PYBIND11_CMAKECONFIG_INSTALL_DIR})
+++  set(_PYBIND11_CMAKE_SIZEOF_VOID_P ${CMAKE_SIZEOF_VOID_P})
+++  unset(CMAKE_SIZEOF_VOID_P)
++   write_basic_package_version_file(${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
++                                    VERSION ${${PROJECT_NAME}_VERSION}
++                                    COMPATIBILITY AnyNewerVersion)
+++  set(CMAKE_SIZEOF_VOID_P ${_PYBIND11_CMAKE_SIZEOF_VOID_P})
++   install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}Config.cmake
++                 ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}ConfigVersion.cmake
++                 tools/FindPythonLibsNew.cmake
diff --cc debian/patches/series
index 9b09112,0000000..735ff74
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,3 @@@
 +0001-Use-system-include-path.patch
 +0002-Temporary-fix-for-the-gcc-6-LTO-regression.patch
++0003-Arch-indep-CMake-package-configuration.patch

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