[pybind11] 01/08: Switch from git-dpm to gbp

[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 83bd2dae78f095a16851a65b7a161ea4cc5e81d7
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Fri Mar 24 20:49:30 2017 +0000

    Switch from git-dpm to gbp
    
    - Drop git-dpm configuration
    - Unapply the patch queue
    - Add gbp configuration
    - Refresh the patch queue
---
 CMakeLists.txt                                        |  3 ---
 debian/.git-dpm                                       | 11 -----------
 debian/gbp.conf                                       |  7 +++++++
 debian/patches/0001-Use-system-include-path.patch     |  1 -
 .../0002-Arch-indep-CMake-package-configuration.patch |  1 -
 pybind11/__init__.py                                  |  8 +++++++-
 setup.py                                              | 19 +++++++++++++++++++
 7 files changed, 33 insertions(+), 17 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4757ea4..341f845 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -117,12 +117,9 @@ 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 --git a/debian/.git-dpm b/debian/.git-dpm
deleted file mode 100644
index f0241da..0000000
--- a/debian/.git-dpm
+++ /dev/null
@@ -1,11 +0,0 @@
-# see git-dpm(1) from git-dpm package
-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 --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..f53906f
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,7 @@
+[DEFAULT]
+upstream-branch = upstream
+debian-branch = master
+upstream-tag = upstream/%(version)s
+debian-tag = debian/%(version)s
+sign-tags = True
+pristine-tar = True
diff --git a/debian/patches/0001-Use-system-include-path.patch b/debian/patches/0001-Use-system-include-path.patch
index 8fdecaf..b39a084 100644
--- a/debian/patches/0001-Use-system-include-path.patch
+++ b/debian/patches/0001-Use-system-include-path.patch
@@ -1,4 +1,3 @@
-From c2010fb61826c45bdd0ee6f36c17d7bf84d8daaf 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
diff --git a/debian/patches/0002-Arch-indep-CMake-package-configuration.patch b/debian/patches/0002-Arch-indep-CMake-package-configuration.patch
index 2c9ecf7..d33af90 100644
--- a/debian/patches/0002-Arch-indep-CMake-package-configuration.patch
+++ b/debian/patches/0002-Arch-indep-CMake-package-configuration.patch
@@ -1,4 +1,3 @@
-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
diff --git a/pybind11/__init__.py b/pybind11/__init__.py
index a7d57c3..a765692 100644
--- a/pybind11/__init__.py
+++ b/pybind11/__init__.py
@@ -2,4 +2,10 @@ from ._version import version_info, __version__  # noqa: F401 imported but unuse
 
 
 def get_include(*args, **kwargs):
-    return '/usr/include'
+    import os
+    try:
+        from pip import locations
+        return os.path.dirname(
+            locations.distutils_scheme('pybind11', *args, **kwargs)['headers'])
+    except ImportError:
+        return 'include'
diff --git a/setup.py b/setup.py
index 29eeb34..a25f1af 100644
--- a/setup.py
+++ b/setup.py
@@ -15,6 +15,25 @@ 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