[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 2485548587a51652de2fccef288b053b8f9e92fc
Merge: b9bd2e5 bd7aedc
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Tue Jan 3 09:24:55 2017 +0000

    merge patched into master

 .travis.yml                                       |  3 ++-
 CMakeLists.txt                                    |  5 +++++
 README.md                                         | 15 ++++++++-------
 debian/.git-dpm                                   |  6 +++---
 debian/patches/0001-Use-system-include-path.patch |  2 +-
 docs/changelog.rst                                | 22 +++++++++++++++++-----
 docs/compiling.rst                                |  9 +++++++++
 docs/conf.py                                      |  2 +-
 docs/intro.rst                                    | 15 +++++++--------
 docs/release.rst                                  |  5 +++--
 include/pybind11/common.h                         |  6 +++---
 include/pybind11/pybind11.h                       |  7 ++++++-
 pybind11/_version.py                              |  2 +-
 tests/test_methods_and_attributes.cpp             |  2 ++
 tests/test_methods_and_attributes.py              |  2 ++
 tests/test_pickling.cpp                           |  2 ++
 tests/test_python_types.py                        |  6 ++++++
 17 files changed, 78 insertions(+), 33 deletions(-)

diff --cc debian/.git-dpm
index 1f908a9,0000000..cf40383
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
- 473b9c87f534623580a1d2bb1d887133bf9da8cc
- 473b9c87f534623580a1d2bb1d887133bf9da8cc
- 90da4af1ff3a4abbd4b647f2d8fa58a23972d210
++bd7aedc94c32b273571944910199964d7f7535dc
++bd7aedc94c32b273571944910199964d7f7535dc
++863e6570fe1951034708c563b00954e71d768e6f
 +863e6570fe1951034708c563b00954e71d768e6f
 +pybind11_2.0.0.orig.tar.gz
 +1583b3c1d015762845995d99a9101b3f595a4cd7
 +398189
 +debianTag="debian/%e%v"
 +patchedTag="patched/%e%v"
 +upstreamTag="upstream/%e%u"
diff --cc debian/patches/0001-Use-system-include-path.patch
index 36e3b88,0000000..b926677
mode 100644,000000..100644
--- a/debian/patches/0001-Use-system-include-path.patch
+++ b/debian/patches/0001-Use-system-include-path.patch
@@@ -1,56 -1,0 +1,56 @@@
- From 473b9c87f534623580a1d2bb1d887133bf9da8cc Mon Sep 17 00:00:00 2001
++From bd7aedc94c32b273571944910199964d7f7535dc Mon Sep 17 00:00:00 2001
 +From: Ghislain Antony Vaillant <ghisvail at gmail.com>
 +Date: Fri, 23 Dec 2016 16:31:56 +0000
 +Subject: Use system include path
 +
 +---
 + pybind11/__init__.py |  8 +-------
 + setup.py             | 19 -------------------
 + 2 files changed, 1 insertion(+), 26 deletions(-)
 +
 +diff --git a/pybind11/__init__.py b/pybind11/__init__.py
 +index a765692..a7d57c3 100644
 +--- a/pybind11/__init__.py
 ++++ b/pybind11/__init__.py
 +@@ -2,10 +2,4 @@ from ._version import version_info, __version__  # noqa: F401 imported but unuse
 + 
 + 
 + def get_include(*args, **kwargs):
 +-    import os
 +-    try:
 +-        from pip import locations
 +-        return os.path.dirname(
 +-            locations.distutils_scheme('pybind11', *args, **kwargs)['headers'])
 +-    except ImportError:
 +-        return 'include'
 ++    return '/usr/include'
 +diff --git a/setup.py b/setup.py
 +index e9bc3c3..30cfb02 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=[
 +-        'include/pybind11/attr.h',
 +-        'include/pybind11/cast.h',
 +-        'include/pybind11/chrono.h',
 +-        'include/pybind11/common.h',
 +-        'include/pybind11/complex.h',
 +-        'include/pybind11/descr.h',
 +-        'include/pybind11/eigen.h',
 +-        'include/pybind11/eval.h',
 +-        'include/pybind11/functional.h',
 +-        'include/pybind11/numpy.h',
 +-        'include/pybind11/operators.h',
 +-        'include/pybind11/options.h',
 +-        'include/pybind11/pybind11.h',
 +-        'include/pybind11/pytypes.h',
 +-        'include/pybind11/stl.h',
 +-        'include/pybind11/stl_bind.h',
 +-        'include/pybind11/typeid.h',
 +-    ],
 +     classifiers=[
 +         'Development Status :: 5 - Production/Stable',
 +         'Intended Audience :: Developers',

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