[pybind11] 03/08: Refresh the patch queue

[Ghislain Vaillant]

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

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

commit b867f1ea814c8aaa2e197720636cac274ecdb01b
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Fri Mar 24 21:36:18 2017 +0000

    Refresh the patch queue
---
 debian/patches/0001-Use-system-include-path.patch  | 32 ++++++++++++++--------
 ...02-Arch-indep-CMake-package-configuration.patch |  4 +--
 2 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/debian/patches/0001-Use-system-include-path.patch b/debian/patches/0001-Use-system-include-path.patch
index b39a084..65cb95d 100644
--- a/debian/patches/0001-Use-system-include-path.patch
+++ b/debian/patches/0001-Use-system-include-path.patch
@@ -4,8 +4,8 @@ Subject: Use system include path
 
 ---
  pybind11/__init__.py |  8 +-------
- setup.py             | 19 -------------------
- 2 files changed, 1 insertion(+), 26 deletions(-)
+ setup.py             | 27 ++-------------------------
+ 2 files changed, 3 insertions(+), 32 deletions(-)
 
 diff --git a/pybind11/__init__.py b/pybind11/__init__.py
 index a765692..a7d57c3 100644
@@ -24,17 +24,23 @@ index a765692..a7d57c3 100644
 -        return 'include'
 +    return '/usr/include'
 diff --git a/setup.py b/setup.py
-index a25f1af..29eeb34 100644
+index 0cf4e47..de6a136 100644
 --- a/setup.py
 +++ b/setup.py
-@@ -15,25 +15,6 @@ setup(
-     download_url='https://github.com/wjakob/pybind11/tarball/v' + __version__,
-     packages=['pybind11'],
-     license='BSD',
--    headers=[
+@@ -6,31 +6,8 @@ from setuptools import setup
+ from pybind11 import __version__
+ import os
+ 
+-# Prevent installation of pybind11 headers by setting
+-# PYBIND11_USE_CMAKE.
+-if os.environ.get('PYBIND11_USE_CMAKE'):
+-    headers = []
+-else:
+-    headers = [
 -        'include/pybind11/attr.h',
 -        'include/pybind11/cast.h',
 -        'include/pybind11/chrono.h',
+-        'include/pybind11/class_support.h',
 -        'include/pybind11/common.h',
 -        'include/pybind11/complex.h',
 -        'include/pybind11/descr.h',
@@ -49,7 +55,9 @@ index a25f1af..29eeb34 100644
 -        'include/pybind11/stl.h',
 -        'include/pybind11/stl_bind.h',
 -        'include/pybind11/typeid.h'
--    ],
-     classifiers=[
-         'Development Status :: 5 - Production/Stable',
-         'Intended Audience :: Developers',
+-    ]
++# Prevent installation of pybind11 headers
++headers = []
+ 
+ setup(
+     name='pybind11',
diff --git a/debian/patches/0002-Arch-indep-CMake-package-configuration.patch b/debian/patches/0002-Arch-indep-CMake-package-configuration.patch
index d33af90..0937c93 100644
--- a/debian/patches/0002-Arch-indep-CMake-package-configuration.patch
+++ b/debian/patches/0002-Arch-indep-CMake-package-configuration.patch
@@ -7,10 +7,10 @@ Subject: Arch-indep CMake package configuration
  1 file changed, 3 insertions(+)
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 341f845..4757ea4 100644
+index 16f1d67..ef41e72 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -117,9 +117,12 @@ if (PYBIND11_INSTALL)
+@@ -105,9 +105,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})

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