[SCM] Small boost::python wrapper of parts of the Eigen library. branch, master, updated. upstream/0.3_bzr23-21-g03475a7

[Anton Gladky]

The following commit has been merged in the master branch:
commit 683362ce591c09b2e35e892b049108848369c293
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sat Jan 26 18:02:12 2013 +0100

    Use packaged version of double-conversion.

diff --git a/debian/patches/remove_embedded_library.patch b/debian/patches/remove_embedded_library.patch
new file mode 100644
index 0000000..38c7990
--- /dev/null
+++ b/debian/patches/remove_embedded_library.patch
@@ -0,0 +1,33 @@
+--- 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.3-5',
+@@ -37,14 +37,6 @@
+ 	],
+ 	ext_modules=[Extension('minieigen',
+ 		sources=['minieigen/minieigen.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/remove_headers.patch b/debian/patches/remove_headers.patch
deleted file mode 100644
index d37aab3..0000000
--- a/debian/patches/remove_headers.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/setup.py
-+++ b/setup.py
-@@ -34,7 +34,5 @@
- 		include_dirs=['/usr/include/eigen3','minieigen'],
- 		define_macros=[('EIGEN_DONT_ALIGN',None)]
- 	)],
--	data_files=[('headers',glob.glob('minieigen/double-conversion/*.h'))],
--	#install_requires=['distribute'],
- )
- 
diff --git a/debian/patches/series b/debian/patches/series
index 2dc762d..377c40e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-remove_headers.patch
+remove_embedded_library.patch

-- 
Small boost::python wrapper of parts of the Eigen library.