[Python-modules-commits] r24243 - in packages/scipy/trunk/debian (5 files)
jtaylor-guest at users.alioth.debian.org
jtaylor-guest at users.alioth.debian.org
Thu May 9 10:42:48 UTC 2013
Date: Thursday, May 9, 2013 @ 10:42:46
Author: jtaylor-guest
Revision: 24243
add-swig-filetypes.patch, reswig.patch
reswigging from setup.py, dropped from debian/rules
Added:
packages/scipy/trunk/debian/patches/add-swig-filetypes.patch
packages/scipy/trunk/debian/patches/reswig.patch
Modified:
packages/scipy/trunk/debian/changelog
packages/scipy/trunk/debian/patches/series
packages/scipy/trunk/debian/rules
Modified: packages/scipy/trunk/debian/changelog
===================================================================
--- packages/scipy/trunk/debian/changelog 2013-05-09 10:42:40 UTC (rev 24242)
+++ packages/scipy/trunk/debian/changelog 2013-05-09 10:42:46 UTC (rev 24243)
@@ -5,13 +5,15 @@
* also fail on test failures not only test errors
* skip failing test_mio on big endian python3 >= 3.2
* print skipped tests and unused skips in autopkgtest scripts
+ * add-swig-filetypes.patch, reswig.patch:
+ reswigging from setup.py, dropped from debian/rules
[ Jakub Wilk ]
* Use canonical URIs for Vcs-* fields.
* Remove DM-Upload-Allowed; it's no longer used by the archive
software.
- -- Julian Taylor <jtaylor.debian at googlemail.com> Sun, 03 Mar 2013 18:53:39 +0100
+ -- Julian Taylor <jtaylor.debian at googlemail.com> Thu, 09 May 2013 11:35:07 +0200
python-scipy (0.11.0+dfsg1-1) experimental; urgency=low
Added: packages/scipy/trunk/debian/patches/add-swig-filetypes.patch
===================================================================
--- packages/scipy/trunk/debian/patches/add-swig-filetypes.patch (rev 0)
+++ packages/scipy/trunk/debian/patches/add-swig-filetypes.patch 2013-05-09 10:42:46 UTC (rev 24243)
@@ -0,0 +1,66 @@
+Author: Julian Taylor <jtaylor.debian at googlemail.com>
+Description: add swig file type headers
+ The swig files use C++ features so they should be declared as C++.
+ This allows reswigging with setup.py.
+Origin: 6bcb152642ab966b2e3959159ba9a6dc986b1210
+Applied-Upstream: 0.13
+
+--- a/scipy/sparse/sparsetools/bsr.i
++++ b/scipy/sparse/sparsetools/bsr.i
+@@ -1,3 +1,4 @@
++/* -*- C++ -*- */
+ %module bsr
+
+ %include "sparsetools.i"
+--- a/scipy/sparse/sparsetools/coo.i
++++ b/scipy/sparse/sparsetools/coo.i
+@@ -1,3 +1,4 @@
++/* -*- C++ -*- */
+ %module coo
+
+ %include "sparsetools.i"
+--- a/scipy/sparse/sparsetools/csc.i
++++ b/scipy/sparse/sparsetools/csc.i
+@@ -1,3 +1,4 @@
++/* -*- C++ -*- */
+ %module csc
+
+ %include "sparsetools.i"
+--- a/scipy/sparse/sparsetools/csgraph.i
++++ b/scipy/sparse/sparsetools/csgraph.i
+@@ -1,4 +1,4 @@
+-/* -*- C -*- */
++/* -*- C++ -*- */
+ %module csgraph
+
+ %include "sparsetools.i"
+--- a/scipy/sparse/sparsetools/csr.i
++++ b/scipy/sparse/sparsetools/csr.i
+@@ -1,3 +1,4 @@
++/* -*- C++ -*- */
+ %module csr
+
+ %include "sparsetools.i"
+--- a/scipy/sparse/sparsetools/dia.i
++++ b/scipy/sparse/sparsetools/dia.i
+@@ -1,3 +1,4 @@
++/* -*- C++ -*- */
+ %module dia
+
+ %include "sparsetools.i"
+--- a/scipy/sparse/sparsetools/numpy.i
++++ b/scipy/sparse/sparsetools/numpy.i
+@@ -1,4 +1,4 @@
+-/* -*- C -*- (not really, but good for syntax highlighting) */
++/* -*- C -*- */
+ %{
+ #ifndef SWIG_FILE_WITH_INIT
+ # define NO_IMPORT_ARRAY
+--- a/scipy/sparse/sparsetools/sparsetools.i
++++ b/scipy/sparse/sparsetools/sparsetools.i
+@@ -1,4 +1,4 @@
+-/* -*- C -*- (not really, but good for syntax highlighting) */
++/* -*- C++ -*- */
+ /*%module sparsetools*/
+
+ /* why does SWIG complain about int arrays? a typecheck is provided */
Added: packages/scipy/trunk/debian/patches/reswig.patch
===================================================================
--- packages/scipy/trunk/debian/patches/reswig.patch (rev 0)
+++ packages/scipy/trunk/debian/patches/reswig.patch 2013-05-09 10:42:46 UTC (rev 24243)
@@ -0,0 +1,21 @@
+Author: Julian Taylor <jtaylor.debian at googlemail.com>
+Description: reswig files
+Applied-Upstream: no
+Forwarded: not accepted to avoid user swig build dependency
+
+--- a/scipy/sparse/sparsetools/setup.py
++++ b/scipy/sparse/sparsetools/setup.py
+@@ -8,11 +8,11 @@ def configuration(parent_package='',top_
+ config = Configuration('sparsetools',parent_package,top_path)
+
+ for fmt in ['csr','csc','coo','bsr','dia','csgraph']:
+- sources = [ fmt + '_wrap.cxx' ]
++ sources = [ fmt + '.i' ]
+ depends = [ fmt + '.h' ]
+ config.add_extension('_' + fmt, sources=sources,
+ define_macros=[('__STDC_FORMAT_MACROS', 1)],
+- depends=depends)
++ depends=depends, include_dirs=["."])
+
+ return config
+
Modified: packages/scipy/trunk/debian/patches/series
===================================================================
--- packages/scipy/trunk/debian/patches/series 2013-05-09 10:42:40 UTC (rev 24242)
+++ packages/scipy/trunk/debian/patches/series 2013-05-09 10:42:46 UTC (rev 24243)
@@ -6,3 +6,5 @@
python3.3-incdir.diff
fix-dbg-crash.patch
fix-f2py-dependencies.patch
+add-swig-filetypes.patch
+reswig.patch
Modified: packages/scipy/trunk/debian/rules
===================================================================
--- packages/scipy/trunk/debian/rules 2013-05-09 10:42:40 UTC (rev 24242)
+++ packages/scipy/trunk/debian/rules 2013-05-09 10:42:46 UTC (rev 24243)
@@ -19,20 +19,12 @@
find . -name "*.pyc" -exec rm {} \;
override_dh_auto_configure:
+ # not required for 0.13 anymore
find scipy -name "*.pyx" | xargs cython
cd scipy/spatial/ && python generate_qhull.py
cd scipy/interpolate && python generate_interpnd.py
- # needed for > 0.11
- #cd scipy/special && python generate_ufuncs.py
- # umfpack.i is rebuild by setup.py
- # numpy.i and sparetools.i are included in the other sparsetools/*.i
- swig -python -c++ scipy/sparse/sparsetools/dia.i
- swig -python -c++ scipy/sparse/sparsetools/csr.i
- swig -python -c++ scipy/sparse/sparsetools/csgraph.i
- swig -python -c++ scipy/sparse/sparsetools/csc.i
- swig -python -c++ scipy/sparse/sparsetools/coo.i
- swig -python -c++ scipy/sparse/sparsetools/bsr.i
- swig -python -c++ scipy/weave/examples/swig2_ext.i
+ cd scipy/special && python generate_ufuncs.py
+ # reswigging done by sparsetools/setup.py
build-python%:
python$* setup.py config_fc --noarch build;
More information about the Python-modules-commits
mailing list