[minieigen] 01/05: Add python3-package.

Anton Gladky gladk at moszumanska.debian.org
Tue May 12 20:39:04 UTC 2015


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

gladk pushed a commit to branch master
in repository minieigen.

commit 35ad0e4c58fa22030d8533be322684c8d2fa4cb7
Author: Anton Gladky <gladk at debian.org>
Date:   Tue May 12 20:47:27 2015 +0200

    Add python3-package.
---
 debian/control                                     | 70 ++++++++++++++--------
 .../10_remove_embedded_double-conversion.patch     | 30 ++++++++++
 debian/patches/remove_embedded_library.patch       | 37 ------------
 debian/patches/series                              |  2 +-
 debian/rules                                       |  4 +-
 5 files changed, 78 insertions(+), 65 deletions(-)

diff --git a/debian/control b/debian/control
index 6079dca..19a4b67 100644
--- a/debian/control
+++ b/debian/control
@@ -1,40 +1,58 @@
 Source: minieigen
-Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders:
- Václav Šmilauer <eu at doxos.eu>,
- Anton Gladky <gladk at debian.org>
-Build-Depends:
- debhelper (>= 9),
- libboost-python-dev,
- libdouble-conversion-dev,
- libeigen3-dev,
- python-dev (>=2.6.6-3~),
- python-sphinx (>= 1.0.7+dfsg)
-X-Python-Version: >= 2.7
-Standards-Version: 3.9.5
+Uploaders: Václav Šmilauer <eu at doxos.eu>,
+           Anton Gladky <gladk at debian.org>
 Section: libs
-Homepage: http://www.launchpad.net/minieigen
+Testsuite: autopkgtest
+Priority: optional
+Build-Depends: debhelper (>= 9),
+               libboost-python-dev,
+               libdouble-conversion-dev,
+               libeigen3-dev,
+               python-dev,
+               python-sphinx (>= 1.0.7+dfsg),
+               python3-all,
+               python3-dev,
+               python3-setuptools
+Standards-Version: 3.9.6
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/minieigen.git
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/minieigen.git
-Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/minieigen.git
-XS-Testsuite: autopkgtest
+Homepage: http://www.launchpad.net/minieigen
+X-Python-Version: >= 2.7
+X-Python3-Version: >= 3.2
 
 Package: python-minieigen
+Architecture: any
 Section: python
+Depends: ${misc:Depends},
+         ${python:Depends},
+         ${shlibs:Depends},
+         ${sphinxdoc:Depends}
+Recommends: libeigen3-dev
+Description: Wrapper of parts of the Eigen library (Python 2)
+ Small wrapper for core parts of Eigen, c++ library for linear algebra.
+ It is mainly useful for inspecting c++ code which already uses eigen and
+ boost::python. Supported types are Vectors (2,3,6 and dynamic-sized with
+ integer and floating-point values), Matrices (3x3, 6x6 and dynamic-sized
+ with floating-point values) and Quaternions. Numerous methods are wrapped
+ and the original API of Eigen is followed.
+ .
+ This is the Python 2 version of the package.
+
+Package: python3-minieigen
 Architecture: any
-Depends:
- python (<<2.8),
- python (>= 2.7),
- ${misc:Depends},
- ${python:Depends},
- ${shlibs:Depends},
- ${sphinxdoc:Depends}
-Recommends:
- libeigen3-dev
-Description: Small boost::python wrapper of parts of the Eigen library
+Section: python
+Depends: ${misc:Depends},
+         ${python3:Depends},
+         ${shlibs:Depends},
+         ${sphinxdoc:Depends}
+Recommends: libeigen3-dev
+Description: Wrapper of parts of the Eigen library (Python 3)
  Small wrapper for core parts of Eigen, c++ library for linear algebra.
  It is mainly useful for inspecting c++ code which already uses eigen and
  boost::python. Supported types are Vectors (2,3,6 and dynamic-sized with
  integer and floating-point values), Matrices (3x3, 6x6 and dynamic-sized
  with floating-point values) and Quaternions. Numerous methods are wrapped
  and the original API of Eigen is followed.
+ .
+ This is the Python 3 version of the package.
diff --git a/debian/patches/10_remove_embedded_double-conversion.patch b/debian/patches/10_remove_embedded_double-conversion.patch
new file mode 100644
index 0000000..61ef29f
--- /dev/null
+++ b/debian/patches/10_remove_embedded_double-conversion.patch
@@ -0,0 +1,30 @@
+Description: Remove embedded double-conversion
+Author: Anton Gladky <gladk at debian.org>
+Last-Update: 2015-05-12
+
+--- minieigen-0.42~dfsg~bzr51.orig/setup.py
++++ minieigen-0.42~dfsg~bzr51/setup.py
+@@ -20,7 +20,7 @@ if sys.platform=='win32':
+ 		define_macros+=[('EIGEN_DONT_VECTORIZE',None)]
+ else:
+ 	py3k=(sys.version_info[0]==3)
+-	libraries=['boost_python-py3%d'%sys.version_info[1] if py3k else 'boost_python']
++	libraries=['boost_python', 'double-conversion']
+ 	library_dirs=[]
+ 	include_dirs=['/usr/include/eigen3','minieigen']
+ 
+@@ -50,14 +50,6 @@ A small wrapper for core parts of Eigen
+ 			'src/expose-matrices.cpp',
+ 			'src/expose-quaternion.cpp',
+ 			'src/expose-vectors.cpp',
+-			'src/double-conversion/bignum.cc',
+-			'src/double-conversion/bignum-dtoa.cc',
+-			'src/double-conversion/cached-powers.cc',
+-			'src/double-conversion/diy-fp.cc',
+-			'src/double-conversion/double-conversion.cc',
+-			'src/double-conversion/fast-dtoa.cc',
+-			'src/double-conversion/fixed-dtoa.cc',
+-			'src/double-conversion/strtod.cc'
+ 		],
+ 		libraries=libraries,
+ 		library_dirs=library_dirs,
diff --git a/debian/patches/remove_embedded_library.patch b/debian/patches/remove_embedded_library.patch
deleted file mode 100644
index 088eb52..0000000
--- a/debian/patches/remove_embedded_library.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Description: Use packaged version of double-conversion
-Author: Anton Gladky <gladk at debian.org>
-Last-Update: 2014-03-10
-
---- a/setup.py
-+++ b/setup.py
-@@ -13,9 +13,9 @@
- 	# * https://bugs.launchpad.net/panda3d/+bug/919237
- 	define_macros+=[('EIGEN_DONT_VECTORIZE',None)]
- else:
--	libraries=['boost_python']
-+	libraries=['boost_python','double-conversion']
- 	library_dirs=[]
--	include_dirs=['/usr/include/eigen3','minieigen']
-+	include_dirs=['/usr/include/eigen3','minieigen','/usr/include/python2.7/']
- 
- setup(name='minieigen',
- 	version='0.4-1',
-@@ -43,14 +43,6 @@
- 			'minieigen/expose-matrices.cpp',
- 			'minieigen/expose-quaternion.cpp',
- 			'minieigen/expose-vectors.cpp',
--			'minieigen/double-conversion/bignum.cc',
--			'minieigen/double-conversion/bignum-dtoa.cc',
--			'minieigen/double-conversion/cached-powers.cc',
--			'minieigen/double-conversion/diy-fp.cc',
--			'minieigen/double-conversion/double-conversion.cc',
--			'minieigen/double-conversion/fast-dtoa.cc',
--			'minieigen/double-conversion/fixed-dtoa.cc',
--			'minieigen/double-conversion/strtod.cc'
- 		],
- 		libraries=libraries,
- 		library_dirs=library_dirs,
---- a/MANIFEST.in
-+++ /dev/null
-@@ -1 +0,0 @@
--recursive-include minieigen/double-conversion *.h
diff --git a/debian/patches/series b/debian/patches/series
index 377c40e..f42864d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-remove_embedded_library.patch
+10_remove_embedded_double-conversion.patch
diff --git a/debian/rules b/debian/rules
index c9545ee..d146bf8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,9 @@
 #!/usr/bin/make -f
 
+export PYBUILD_NAME=minieigen
+
 %:
-	dh $@ --with python2 --parallel
+	dh $@ --with python2,python3 --parallel --buildsystem=pybuild
 
 PYVER = $(shell pyversions -dv)
 DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)

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



More information about the debian-science-commits mailing list