[pybind11] 02/03: 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 f453a0a794a6ae7e9184cb340490e6e6a0ad616d
Merge: 27f0906 c91e0ad
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Thu Feb 23 13:16:02 2017 +0000

    merge patched into master

 debian/.git-dpm                                    |  4 ++--
 ...2-Arch-indep-CMake-package-configuration.patch} |  2 +-
 ...emporary-fix-for-the-gcc-6-LTO-regression.patch | 22 ----------------------
 debian/patches/series                              |  3 +--
 tests/CMakeLists.txt                               |  2 +-
 5 files changed, 5 insertions(+), 28 deletions(-)

diff --cc debian/.git-dpm
index 826c608,0000000..f0241da
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
- 4b4ca77e50c3e4a729e1ef5b7da8620c845ce217
- 4b4ca77e50c3e4a729e1ef5b7da8620c845ce217
++c91e0ad75aa42ff3252b14c90a9b77c2309a76be
++c91e0ad75aa42ff3252b14c90a9b77c2309a76be
 +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/0002-Arch-indep-CMake-package-configuration.patch
index c06f583,0000000..2c9ecf7
mode 100644,000000..100644
--- a/debian/patches/0002-Arch-indep-CMake-package-configuration.patch
+++ b/debian/patches/0002-Arch-indep-CMake-package-configuration.patch
@@@ -1,26 -1,0 +1,26 @@@
- From 4b4ca77e50c3e4a729e1ef5b7da8620c845ce217 Mon Sep 17 00:00:00 2001
++From c91e0ad75aa42ff3252b14c90a9b77c2309a76be 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 735ff74,0000000..e78094b
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,3 -1,0 +1,2 @@@
 +0001-Use-system-include-path.patch
- 0002-Temporary-fix-for-the-gcc-6-LTO-regression.patch
- 0003-Arch-indep-CMake-package-configuration.patch
++0002-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