[cvxopt] 25/64: Imported Debian patch 1.1-1
Andreas Tille
tille at debian.org
Wed Jul 20 11:23:51 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository cvxopt.
commit 2fdc366c104c1db590f3c661a7101d9efe15fa03
Merge: e2f3841 c5f59df
Author: Soeren Sonnenburg <sonne at debian.org>
Date: Sat Oct 25 23:14:39 2008 +0200
Imported Debian patch 1.1-1
INSTALL | 2 +-
LICENSE | 4 +-
debian/changelog | 7 +
debian/control | 2 +-
debian/patches/doc.diff | 32 +-
debian/patches/python24_buildfix.diff | 20 +-
doc/Makefile | 2 +-
doc/base.tex | 748 -------
doc/base_sparse.tex | 689 -------
doc/blas.tex | 13 +-
doc/c-api.tex | 2 +-
doc/coneprog.tex | 199 +-
doc/copyright.tex | 4 +-
doc/cvxopt.tex | 7 +-
doc/fftw.tex | 96 +-
doc/figures/floorplan.pdf | Bin 17885 -> 19279 bytes
doc/figures/normappr.pdf | Bin 21648 -> 23044 bytes
doc/figures/portfolio1.pdf | Bin 21164 -> 22566 bytes
doc/figures/portfolio2.pdf | Bin 22820 -> 24206 bytes
doc/intro.tex | 32 +-
doc/lapack.tex | 207 +-
doc/matrices.tex | 1363 ++++++++++++
doc/modeling.tex | 22 +-
doc/printing.tex | 39 +-
doc/solvers.tex | 222 +-
doc/spsolvers.tex | 27 +-
examples/book/README | 2 +-
examples/book/chap4/portfolio | 2 +-
examples/book/chap4/rls | 3 +-
examples/book/chap6/basispursuit | 2 +-
examples/book/chap6/consumerpref | 3 +-
examples/book/chap6/cvxfit | 3 +-
examples/book/chap6/huber | 3 +-
examples/book/chap6/inputdesign | 3 +-
examples/book/chap6/penalties | 17 +-
examples/book/chap6/polapprox | 3 +-
examples/book/chap6/regsel | 3 +-
examples/book/chap6/robls | 16 +-
examples/book/chap6/smoothrec | 5 +-
examples/book/chap6/tv | 6 +-
examples/book/chap7/chernoff | 5 +-
examples/book/chap7/expdesign | 4 +-
examples/book/chap7/logreg | 3 +-
examples/book/chap7/maxent | 3 +-
examples/book/chap7/probbounds | 3 +-
examples/book/chap8/centers | 2 +-
examples/book/chap8/ellipsoids | 3 +-
examples/book/chap8/floorplan | 3 +-
examples/book/chap8/linsep | 3 +-
examples/book/chap8/placement | 11 +-
examples/doc/chap10/l1svc | 4 +-
examples/doc/chap10/lp | 2 +-
examples/doc/chap10/normappr | 4 +-
examples/doc/chap10/roblp | 4 +-
examples/doc/chap4/acent | 3 +-
examples/doc/chap7/covsel | 3 +-
examples/doc/chap8/conelp | 3 +-
examples/doc/chap8/coneqp | 3 +-
examples/doc/chap8/l1 | 8 +-
examples/doc/chap8/l1regls | 12 +-
examples/doc/chap8/lp | 3 +-
examples/doc/chap8/mcsdp | 5 +-
examples/doc/chap8/portfolio | 2 +-
examples/doc/chap8/qcl1 | 7 +-
examples/doc/chap8/sdp | 3 +-
examples/doc/chap8/socp | 3 +-
examples/doc/chap9/acent | 13 +-
examples/doc/chap9/acent2 | 2 +-
examples/doc/chap9/floorplan | 3 +-
examples/doc/chap9/gp | 3 +-
examples/doc/chap9/l2ac | 13 +-
examples/doc/chap9/robls | 10 +-
examples/filterdemo/filterdemo_cli | 2 +-
examples/filterdemo/filterdemo_gui | 3 +-
src/C/SuiteSparse/CHOLMOD/Check/cholmod_check.c | 113 +-
src/C/SuiteSparse/CHOLMOD/Check/cholmod_write.c | 6 +-
.../SuiteSparse/CHOLMOD/Cholesky/cholmod_analyze.c | 66 +-
.../CHOLMOD/Cholesky/cholmod_postorder.c | 4 +-
src/C/SuiteSparse/CHOLMOD/Cholesky/cholmod_solve.c | 14 +-
src/C/SuiteSparse/CHOLMOD/Core/cholmod_common.c | 15 +
src/C/SuiteSparse/CHOLMOD/Core/cholmod_complex.c | 3 +
src/C/SuiteSparse/CHOLMOD/Core/cholmod_error.c | 4 +-
src/C/SuiteSparse/CHOLMOD/Core/cholmod_memory.c | 10 +-
src/C/SuiteSparse/CHOLMOD/Doc/ChangeLog | 17 +
src/C/SuiteSparse/CHOLMOD/Doc/UserGuide.tex | 4 +-
src/C/SuiteSparse/CHOLMOD/Include/cholmod_blas.h | 122 +-
src/C/SuiteSparse/CHOLMOD/Include/cholmod_check.h | 43 +-
.../SuiteSparse/CHOLMOD/Include/cholmod_cholesky.h | 19 +
src/C/SuiteSparse/CHOLMOD/Include/cholmod_core.h | 52 +-
.../SuiteSparse/CHOLMOD/Include/cholmod_internal.h | 43 +-
.../CHOLMOD/Include/cholmod_supernodal.h | 25 +
src/C/SuiteSparse/CHOLMOD/Makefile | 2 +-
.../CHOLMOD/Supernodal/cholmod_super_solve.c | 21 +-
.../CHOLMOD/Supernodal/cholmod_super_symbolic.c | 192 +-
.../CHOLMOD/Supernodal/t_cholmod_super_numeric.c | 6 +-
.../CHOLMOD/Supernodal/t_cholmod_super_solve.c | 15 +-
src/C/SuiteSparse/Contents.m | 10 +-
src/C/SuiteSparse/Makefile | 14 +-
src/C/SuiteSparse/README.txt | 45 +-
src/C/SuiteSparse/README_cvxopt | 7 +-
src/C/SuiteSparse/UFconfig/README.txt | 1 +
src/C/SuiteSparse/UFconfig/UFconfig.h | 9 +-
src/C/SuiteSparse/UFconfig/UFconfig.mk | 57 +-
src/C/SuiteSparse/UMFPACK/Doc/ChangeLog | 4 +
src/C/SuiteSparse/UMFPACK/Doc/License | 2 +-
src/C/SuiteSparse/UMFPACK/Doc/QuickStart.tex | 2 +-
src/C/SuiteSparse/UMFPACK/Doc/UserGuide.stex | 3 +-
src/C/amd.c | 2 +-
src/C/base.c | 743 ++++++-
src/C/blas.c | 176 +-
src/C/blas_redefines.h | 5 +
src/C/cholmod.c | 2 +-
src/C/cvxopt.h | 2 +-
src/C/dense.c | 197 +-
src/C/dsdp.c | 45 +-
src/C/fftw.c | 836 ++++++--
src/C/glpk.c | 3 +-
src/C/gsl.c | 2 +-
src/C/lapack.c | 739 ++++++-
src/C/misc.h | 3 +-
src/C/misc_solvers.c | 2 +-
src/C/sparse.c | 82 +-
src/C/umfpack.c | 2 +-
src/python/__init__.py | 166 +-
src/python/coneprog.py | 2173 +++++++++++++++++---
src/python/cvxprog.py | 301 ++-
src/python/info.py | 6 +-
src/python/misc.py | 2 +-
src/python/modeling.py | 4 +-
src/python/mosek.py | 39 +-
src/python/printing.py | 4 +-
src/python/solvers.py | 2 +-
src/setup.py | 2 +-
133 files changed, 7602 insertions(+), 2856 deletions(-)
diff --cc debian/changelog
index 99e2042,0000000..203be8e
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,209 -1,0 +1,216 @@@
++cvxopt (1.1-1) unstable; urgency=low
++
++ * New upstream release.
++ * Refresh patches.
++
++ -- Soeren Sonnenburg <sonne at debian.org> Sat, 25 Oct 2008 23:14:39 +0200
++
+cvxopt (1.0-3) unstable; urgency=low
+
+ * Update my email address to sonne at debian.org.
+ * Introduce README.source and patch target to make package compliant to
+ standards version 3.8.0.'
+
+ -- Soeren Sonnenburg <sonne at debian.org> Sun, 14 Sep 2008 16:37:10 +0200
+
+cvxopt (1.0-2) unstable; urgency=low
+
+ [ Torsten Werner ]
+ * Do not run quilt in $(DEB_SRCDIR) anymore. (Closes: #485142)
+ * Refresh all patches.
+
+ [ Soeren Sonnenburg ]
+ * Use Science/Mathematics as doc-base section.
+
+ -- Torsten Werner <twerner at debian.org> Wed, 11 Jun 2008 20:41:57 +0200
+
+cvxopt (1.0-1) unstable; urgency=low
+
+ * New upstream release.
+ * Fix build for python2.4
+ * Add a README.source, documenting that we are using quilt to add some
+ patches.
+
+ -- Soeren Sonnenburg <debian at nn7.de> Tue, 29 Apr 2008 06:55:27 +0200
+
+cvxopt (0.9.3-1) unstable; urgency=low
+
+ * new upstream release (Closes: #471368)
+ * Remove the former +nogs1 suffix.
+ * Update patch doc.diff.
+
+ -- Torsten Werner <twerner at debian.org> Mon, 17 Mar 2008 20:48:08 +0100
+
+cvxopt (0.9.2+nogs1-1) unstable; urgency=low
+
+ * Do not generate .pdf images on the fly but on obtaining source package to
+ workaround failing epstopdf on some architectures
+
+ -- Soeren Sonnenburg <debian at nn7.de> Sat, 23 Feb 2008 21:46:20 +0100
+
+cvxopt (0.9.2-2) unstable; urgency=low
+
+ [ Soeren Sonnenburg ]
+ * Change Build-Depends of atlas, blas and lapack to match gfortran
+ transition (Closes: #463938)
+ * Tighten Build-Depends on dsdp >= 5.8-3
+
+ [ Torsten Werner ]
+ * Remove atlas support temporarily.
+
+ -- Torsten Werner <twerner at debian.org> Fri, 08 Feb 2008 22:26:36 +0100
+
+cvxopt (0.9.2-1) unstable; urgency=low
+
+ [ Soeren Sonnenburg ]
+ * New upstream version
+ * Generate indexed pdf
+
+ [ Torsten Werner ]
+ * Add Build-Depends: texlive-latex-extra.
+ * Change Build-Depends: gs-gpl to ghostscript.
+ * Fix white space in doc-base file.
+
+ -- Torsten Werner <twerner at debian.org> Wed, 02 Jan 2008 20:19:49 +0100
+
+cvxopt (0.9.1-4) unstable; urgency=low
+
+ [ Soeren Sonnenburg ]
+ * add lapack3-dev to build depends for arm architecture
+
+ [ Torsten Werner ]
+ * Change Build-Depends: fftw3-dev to libfftw3-dev.
+
+ -- Torsten Werner <twerner at debian.org> Wed, 19 Dec 2007 16:53:24 +0100
+
+cvxopt (0.9.1-3) unstable; urgency=low
+
+ * Really enable GSL support.
+
+ -- Torsten Werner <twerner at debian.org> Mon, 17 Dec 2007 19:39:29 +0100
+
+cvxopt (0.9.1-2) unstable; urgency=low
+
+ [ Soeren Sonnenburg ]
+ * Enable gsl support and remove obsolete README.Debian (Closes: #456723)
+
+ [ Torsten Werner ]
+ * Remove Depends: lapack3-dev.
+ * Support newer versions of dpkg-shlibdeps.
+ * Update Homepage and Vcs headers in debian/control.
+ * Change Standards-Version: 3.7.3.
+ * Remove the full text of GPL-3 from debian/copyright because base-files
+ ships it now.
+
+ -- Torsten Werner <twerner at debian.org> Mon, 17 Dec 2007 19:18:11 +0100
+
+cvxopt (0.9.1-1) unstable; urgency=low
+
+ * New upstream version
+
+ -- Soeren Sonnenburg <debian at nn7.de> Sun, 25 Nov 2007 17:32:57 +0000
+
+cvxopt (0.9-3) unstable; urgency=low
+
+ [ Soeren Sonnenburg ]
+ * Fix FTBFS if build twice in a row. (Closes: #442537)
+
+ [ Torsten Werner ]
+ * Change Build-Depends: gs-common to gs-gpl.
+
+ -- Torsten Werner <twerner at debian.org> Wed, 19 Sep 2007 20:57:04 +0200
+
+cvxopt (0.9-2) unstable; urgency=low
+
+ * add lapack3-dev to build depends for arm architecture
+
+ -- Soeren Sonnenburg <debian at nn7.de> Thu, 16 Aug 2007 07:49:27 +0200
+
+cvxopt (0.9-1) unstable; urgency=low
+
+ * new upstream version
+ * build pdf version of documentation and add doc-base support
+
+ -- Soeren Sonnenburg <debian at nn7.de> Thu, 09 Aug 2007 21:08:44 +0200
+
+cvxopt (0.8.2-3) unstable; urgency=low
+
+ * add build dependency on libdsdp-dev and enable the dsdp semidefinite
+ programming solver
+
+ -- Soeren Sonnenburg <debian at nn7.de> Sun, 5 Aug 2007 12:10:22 +0200
+
+cvxopt (0.8.2-2) unstable; urgency=low
+
+ * disable atlas3-base-dev build dependency on arm as it is unavailable and
+ works without
+
+ -- Soeren Sonnenburg <debian at nn7.de> Tue, 31 Jul 2007 11:34:00 +0200
+
+cvxopt (0.8.2-1) unstable; urgency=low
+
+ [ Soeren Sonnenburg ]
+ * First upload to Debian. (Closes: #431233)
+ * Acknowledge ubuntu packaging from upstream.
+ * Switch to pycentral.
+
+ [ Torsten Werner ]
+ * Switch to quilt and more debhelper tools.
+ * Fix Build-Depends.
+
+ -- Torsten Werner <twerner at debian.org> Wed, 4 Jul 2007 21:33:44 +0200
+
+cvxopt (0.8-3) unstable; urgency=low
+
+ * Release of version 0.8.2
+
+ -- Joachim Dahl <joachim at kom.aau.dk> Tue, 6 Feb 2007 19:05:00 +0100
+
+cvxopt (0.8-2) unstable; urgency=low
+
+ * Release of version 0.8.1
+
+ -- Joachim Dahl <joachim at kom.aau.dk> Wed, 1 Nov 2006 20:05:00 +0100
+
+cvxopt (0.8-1) unstable; urgency=low
+
+ * Release of version 0.8
+
+ -- Joachim Dahl <joachim at kom.aau.dk> Tue, 19 Sep 2006 20:38:43 +0100
+
+cvxopt (0.7-2) unstable; urgency=low
+
+ * Release of version 0.7.1
+
+ -- Joachim Dahl <joachim at kom.aau.dk> Mon, 31 Jul 2006 19:46:43 +0100
+
+cvxopt (0.7-1) unstable; urgency=low
+
+ * Release of version 0.7.
+
+ -- Joachim Dahl <joachim at kom.aau.dk> Sat, 22 Apr 2006 10:00:00 -0700
+
+cvxopt (0.6-1) unstable; urgency=low
+
+ * Release of version 0.6.
+
+ -- Joachim Dahl <joachim at kom.aau.dk> Wed, 28 Dec 2005 09:19:00 -0700
+
+cvxopt (0.5-2) unstable; urgency=low
+
+ * Small bugfixes.
+
+ -- Joachim Dahl <joachim at kom.aau.dk> Fri, 3 Nov 2005 23:01:49 -0700
+
+cvxopt (0.5-1) unstable; urgency=low
+
+ * Release of version 0.5.
+
+ -- Joachim Dahl <joachim at kom.aau.dk> Fri, 21 Oct 2005 11:49:09 -0700
+
+cvxopt (0.4-1) unstable; urgency=low
+
+ * Initial Release.
+
+ -- Joachim Dahl <joachim at ee.ucla.edu> Thu, 19 May 2005 11:49:09 -0700
+
diff --cc debian/control
index 0ec98de,0000000..66d72e4
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,35 -1,0 +1,35 @@@
+Source: cvxopt
+Section: python
+Priority: optional
+Maintainer: Soeren Sonnenburg <sonne at debian.org>
+Uploaders: Torsten Werner <twerner at debian.org>
- Build-Depends: cdbs, debhelper, python-central (>= 0.5), python-all-dev,
++Build-Depends: cdbs, debhelper (>= 5), python-central (>= 0.5), python-all-dev,
+ libglpk-dev, libfftw3-dev, liblapack-dev,
+ libblas-dev, quilt, texlive-latex-recommended, texlive-fonts-recommended,
+ libgsl0-dev, libdsdp-dev (>= 5.8-4), texlive-latex-extra, ghostscript
+# remove atlas temporarily:
+# libglpk-dev, libfftw3-dev, liblapack-dev [arm], libatlas-base-dev [!arm],
+XS-Python-Version: all
+Standards-Version: 3.8.0
+Homepage: http://abel.ee.ucla.edu/cvxopt
+Vcs-Svn: https://bollin.googlecode.com/svn/cvxopt/trunk/
+Vcs-Browser: http://bollin.googlecode.com/svn/cvxopt/trunk/
+
+Package: python-cvxopt
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+Provides: ${python:Provides}
+XB-Python-Version: ${python:Versions}
+Description: Python package for convex optimization
+ CVXOPT is a Python package for convex optimization. It includes
+ * Python classes for storing and manipulating dense and sparse matrices
+ * an interface to most of the double-precision real and complex BLAS
+ * an interface to the dense linear equation solvers and eigenvalue
+ routines from LAPACK
+ * interfaces to the sparse LU and Cholesky solvers from UMFPACK and
+ CHOLMOD.
+ * routines for solving convex optimization problems, an interface to
+ the linear programming solver in GLPK, and interfaces to the
+ linear and quadratic programming solvers in MOSEK
+ * a modeling tool for specifying convex piecewise-linear
+ optimization problems.
diff --cc debian/patches/doc.diff
index 15bc789,0000000..f4bd4ba
mode 100644,000000..100644
--- a/debian/patches/doc.diff
+++ b/debian/patches/doc.diff
@@@ -1,77 -1,0 +1,77 @@@
- Index: cvxopt-1.0/doc/cvxopt.tex
++Index: cvxopt-1.1/doc/cvxopt.tex
+===================================================================
- --- cvxopt-1.0.orig/doc/cvxopt.tex 2008-04-24 06:57:42.000000000 +0200
- +++ cvxopt-1.0/doc/cvxopt.tex 2008-06-11 20:39:36.000000000 +0200
++--- cvxopt-1.1.orig/doc/cvxopt.tex 2008-10-25 23:13:36.000000000 +0200
+++++ cvxopt-1.1/doc/cvxopt.tex 2008-10-25 23:13:44.000000000 +0200
+@@ -1,5 +1,7 @@
+ \documentclass{book}
+ \usepackage{graphicx}
++\usepackage{fullpage,times,url}
++\usepackage[pdftex]{hyperref}
+
+ \def\BIT{\begin{itemize}}
+ \def\EIT{\end{itemize}}
+@@ -57,10 +59,10 @@
+ \newenvironment{methoddesc}[1]{\par{\bf #1}()%
+ \begin{list}{}{}\item[]}{\end{list}}
+ \newcommand{\seetext}[1]{#1}
+-\newcommand{\htmladdnormallink}[2]{\Link[#2]{}{}{#1}\EndLink}
+-\newcommand{\ulink}[2]{\htmladdnormallink{#1}{#2}}
+-\newcommand{\seelink}[3]{\htmladdnormallink{#2}{#1}}
+-\newcommand{\citetitle}[2]{\htmladdnormallink{#2}{#1}}
++%\newcommand{\htmladdnormallink}[2]{\Link[#2]{}{}{#1}\EndLink}
++\newcommand{\ulink}[2]{{#1}\footnote{\url{#2}}}
++\newcommand{\seelink}[3]{{#2}\footnote{\url{#1}}}
++\newcommand{\citetitle}[2]{{#2}\footnote{\url{#1}}}
+
+ % constants
+ \newcommand{\dtc}{\code{'d'}}
+@@ -84,7 +86,6 @@
+ \author{Joachim Dahl \& Lieven Vandenberghe}
- \date{Release 1.0 -- April 24, 2008}
++ \date{Release 1.1 -- October 15, 2008}
+ \begin{document}
+-\Configure{crosslinks*}{next}{prev}{up}{}
+
+ \maketitle
+
- Index: cvxopt-1.0/doc/modeling.tex
++Index: cvxopt-1.1/doc/modeling.tex
+===================================================================
- --- cvxopt-1.0.orig/doc/modeling.tex 2008-04-24 06:57:42.000000000 +0200
- +++ cvxopt-1.0/doc/modeling.tex 2008-06-11 20:39:36.000000000 +0200
- @@ -655,7 +655,7 @@
++--- cvxopt-1.1.orig/doc/modeling.tex 2008-10-25 23:13:36.000000000 +0200
+++++ cvxopt-1.1/doc/modeling.tex 2008-10-25 23:13:44.000000000 +0200
++@@ -659,7 +659,7 @@
+ \end{verbatim}
+
+ \begin{center}
+-\includegraphics[width=15cm]{figures/normappr.eps}
++\includegraphics[width=15cm]{figures/normappr.pdf}
+ \end{center}
+
+ Equivalently, we can formulate and solve the problems as LPs.
- Index: cvxopt-1.0/doc/solvers.tex
++Index: cvxopt-1.1/doc/solvers.tex
+===================================================================
- --- cvxopt-1.0.orig/doc/solvers.tex 2008-04-24 06:57:42.000000000 +0200
- +++ cvxopt-1.0/doc/solvers.tex 2008-06-11 20:39:36.000000000 +0200
- @@ -507,7 +507,7 @@
++--- cvxopt-1.1.orig/doc/solvers.tex 2008-10-25 23:13:36.000000000 +0200
+++++ cvxopt-1.1/doc/solvers.tex 2008-10-25 23:13:44.000000000 +0200
++@@ -643,7 +643,7 @@
+ \end{verbatim}
+
+ \begin{center}
+-\includegraphics[width=15cm]{figures/floorplan.eps}
++\includegraphics[width=15cm]{figures/floorplan.pdf}
+ \end{center}
+ \end{description}
+
- Index: cvxopt-1.0/doc/coneprog.tex
++Index: cvxopt-1.1/doc/coneprog.tex
+===================================================================
- --- cvxopt-1.0.orig/doc/coneprog.tex 2008-04-24 06:57:42.000000000 +0200
- +++ cvxopt-1.0/doc/coneprog.tex 2008-06-11 20:39:36.000000000 +0200
- @@ -508,9 +508,9 @@
++--- cvxopt-1.1.orig/doc/coneprog.tex 2008-10-25 23:13:36.000000000 +0200
+++++ cvxopt-1.1/doc/coneprog.tex 2008-10-25 23:13:44.000000000 +0200
++@@ -604,9 +604,9 @@
+ The code below computes the trade-off curve and produces two figures
+ using the \ulink{Matplotlib}{http://matplotlib.sourceforge.net} package.
+ \begin{center}
+-\includegraphics[width=10cm]{figures/portfolio1.eps}
++\includegraphics[width=10cm]{figures/portfolio1.pdf}
+ \hspace*{\fill}
+-\includegraphics[width=10cm]{figures/portfolio2.eps}
++\includegraphics[width=10cm]{figures/portfolio2.pdf}
+ \end{center}
+
+ \begin{verbatim}
diff --cc debian/patches/python24_buildfix.diff
index 1975709,0000000..e0f577f
mode 100644,000000..100644
--- a/debian/patches/python24_buildfix.diff
+++ b/debian/patches/python24_buildfix.diff
@@@ -1,45 -1,0 +1,45 @@@
- Index: cvxopt-1.0/src/C/cvxopt.h
++Index: cvxopt-1.1/src/C/cvxopt.h
+===================================================================
- --- cvxopt-1.0.orig/src/C/cvxopt.h 2008-04-24 06:46:26.000000000 +0200
- +++ cvxopt-1.0/src/C/cvxopt.h 2008-06-11 20:39:36.000000000 +0200
++--- cvxopt-1.1.orig/src/C/cvxopt.h 2008-10-25 23:13:16.000000000 +0200
+++++ cvxopt-1.1/src/C/cvxopt.h 2008-10-25 23:13:23.000000000 +0200
+@@ -43,6 +43,10 @@
+ #define malloc(size) malloc_aligned(size)
+ */
+
++#if (PY_VERSION_HEX < 0x02050000)
++typedef int Py_ssize_t;
++#endif
++
+ #define INT 0
+ #define DOUBLE 1
+ #define COMPLEX 2
- Index: cvxopt-1.0/src/C/dense.c
++Index: cvxopt-1.1/src/C/dense.c
+===================================================================
- --- cvxopt-1.0.orig/src/C/dense.c 2008-04-24 06:46:27.000000000 +0200
- +++ cvxopt-1.0/src/C/dense.c 2008-06-11 20:39:36.000000000 +0200
++--- cvxopt-1.1.orig/src/C/dense.c 2008-10-25 23:13:16.000000000 +0200
+++++ cvxopt-1.1/src/C/dense.c 2008-10-25 23:13:23.000000000 +0200
+@@ -25,6 +25,10 @@
+
+ #include <complexobject.h>
+
++#if (PY_VERSION_HEX < 0x02050000)
++#define lenfunc inquiry
++#endif
++
+ /* NumPy array protocol */
+ typedef struct {
+ int version;
- Index: cvxopt-1.0/src/C/sparse.c
++Index: cvxopt-1.1/src/C/sparse.c
+===================================================================
- --- cvxopt-1.0.orig/src/C/sparse.c 2008-04-24 06:46:27.000000000 +0200
- +++ cvxopt-1.0/src/C/sparse.c 2008-06-11 20:39:36.000000000 +0200
++--- cvxopt-1.1.orig/src/C/sparse.c 2008-10-25 23:13:16.000000000 +0200
+++++ cvxopt-1.1/src/C/sparse.c 2008-10-25 23:13:23.000000000 +0200
+@@ -25,6 +25,10 @@
+
+ #include <complexobject.h>
+
++#if (PY_VERSION_HEX < 0x02050000)
++#define lenfunc inquiry
++#endif
++
+ #define CONJ(flag, val) (flag == 'C' ? conj(val) : val)
+
- extern PyObject *base_mod;
++ extern const int E_SIZE[];
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cvxopt.git
More information about the debian-science-commits
mailing list