[cvxopt] 19/64: Imported Debian patch 0.9.3-1

Andreas Tille tille at debian.org
Wed Jul 20 11:23:50 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 0c6ec4e6eaaf76f5846cda76395c66c8f1f2ad4e
Merge: 57ef7c1 3ac301c
Author: Torsten Werner <twerner at debian.org>
Date:   Mon Mar 17 20:48:08 2008 +0100

    Imported Debian patch 0.9.3-1

 INSTALL                                 |    2 +-
 LICENSE                                 |    2 +-
 debian/changelog                        |    8 +
 debian/orig-tar.sh                      |    2 +-
 debian/patches/doc.diff                 |   90 +-
 debian/watch                            |    3 +-
 doc/base.tex                            |    2 +-
 doc/base_sparse.tex                     |    2 +-
 doc/blas.tex                            |  122 +-
 doc/c-api.tex                           |    2 +-
 doc/coneprog.tex                        |  770 +++++--
 doc/copyright.tex                       |   46 +
 doc/cvxopt.tex                          |   62 +-
 doc/figures/floorplan.pdf               |  Bin 17885 -> 17887 bytes
 doc/figures/normappr.pdf                |  Bin 21648 -> 21648 bytes
 doc/figures/portfolio1.pdf              |  Bin 21166 -> 21164 bytes
 doc/figures/portfolio2.pdf              |  Bin 22818 -> 22818 bytes
 doc/intro.tex                           |    2 +-
 doc/lapack.tex                          |  296 +--
 doc/modeling.tex                        |    6 +-
 doc/printing.tex                        |   20 +-
 doc/solvers.tex                         |  515 ++---
 doc/spsolvers.tex                       |   46 +-
 examples/book/chap6/basispursuit        |   71 +-
 examples/book/chap6/cvxfit              |    5 +-
 examples/book/chap6/tv                  |   66 +-
 examples/doc/chap4/acent                |    1 -
 examples/doc/chap8/conelp               |   21 +
 examples/doc/chap8/coneqp               |   23 +
 examples/doc/chap8/l1                   |    7 +-
 examples/doc/{chap9 => chap8}/l1regls   |   83 +-
 examples/doc/chap8/mcsdp                |    4 +-
 examples/doc/{chap9 => chap8}/portfolio |    2 +-
 examples/doc/chap8/qcl1                 |    2 +-
 examples/doc/chap8/sdp                  |    2 +-
 examples/doc/chap8/socp                 |    2 +-
 examples/doc/chap9/gp                   |    2 +-
 examples/doc/chap9/l2ac                 |   79 +
 src/C/amd.c                             |    4 +-
 src/C/base.c                            |    4 +-
 src/C/blas.c                            |    4 +-
 src/C/cholmod.c                         |    4 +-
 src/C/cvxopt.h                          |    6 +-
 src/C/dense.c                           |    6 +-
 src/C/dsdp.c                            |    4 +-
 src/C/fftw.c                            |    4 +-
 src/C/glpk.c                            |    4 +-
 src/C/gsl.c                             |    4 +-
 src/C/lapack.c                          |    4 +-
 src/C/misc.h                            |    4 +-
 src/C/sparse.c                          |    8 +-
 src/C/umfpack.c                         |    4 +-
 src/python/__init__.py                  |   24 +-
 src/python/coneprog.py                  | 3456 ++++++++++++++-----------------
 src/python/cvxprog.py                   | 1465 +++----------
 src/python/info.py                      |    6 +-
 src/python/misc.py                      | 1302 +++++++++++-
 src/python/modeling.py                  |    4 +-
 src/python/mosek.py                     |    4 +-
 src/python/printing.py                  |    5 +-
 src/python/solvers.py                   |   14 +-
 src/setup.py                            |    2 +-
 62 files changed, 4530 insertions(+), 4184 deletions(-)

diff --cc debian/changelog
index 0f2c7c7,0000000..a22c062
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,173 -1,0 +1,181 @@@
++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/orig-tar.sh
index b9d99d5,0000000..e72628b
mode 100644,000000..100644
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@@ -1,23 -1,0 +1,23 @@@
 +#!/bin/sh
 +
 +# called by uscan with '--upstream-version' <version> <file>
 +
- VERSION=$(dpkg-parsechangelog | sed -ne 's,^Version: \(.*\)-.*,\1,p')
++VERSION=$2
 +SOURCE=$(dpkg-parsechangelog | sed -ne 's,Source: \(.*\),\1,p')
 +TAR=../${SOURCE}_${VERSION}.orig.tar.gz
 +
 +tar xf $3 --exclude '*.gif' --exclude '*.pdf' --exclude '*.html' 
 +make -C cvxopt-$2/doc clean
 +for i in cvxopt-$2/doc/figures/*.eps ; do epstopdf $i && rm -f $i; done
 +
 +tar czf $TAR cvxopt-$2
 +rm -rf cvxopt-$2
 +
 +# move to directory 'tarballs'
 +if [ -r .svn/deb-layout ]; then
 +  . .svn/deb-layout
 +  mv $TAR $origDir
 +  echo "moved $TAR to $origDir"
 +fi
 +
 +exit 0
diff --cc debian/patches/doc.diff
index 4f97ece,0000000..1afde9c
mode 100644,000000..100644
--- a/debian/patches/doc.diff
+++ b/debian/patches/doc.diff
@@@ -1,115 -1,0 +1,77 @@@
- --- ../../doc/cvxopt.tex	2008-01-01 20:37:50.000000000 +0100
- +++ ../../doc/cvxopt.tex	2008-01-01 21:15:33.000000000 +0100
- @@ -2,5 +2,7 @@
++Index: cvxopt-0.9.3/doc/cvxopt.tex
++===================================================================
++--- ../../doc/cvxopt.tex	2008-02-24 01:12:43.000000000 +0100
+++++ ../../doc/cvxopt.tex	2008-03-17 20:59:04.000000000 +0100
++@@ -1,5 +1,7 @@
++ \documentclass{book}
 + \usepackage{graphicx}
-  %\usepackage{html,graphicx}
 ++\usepackage{fullpage,times,url}
 ++\usepackage[pdftex]{hyperref}
 + 
-  \parindent 0pt
-  
- @@ -54,10 +56,10 @@
++ \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'}}
- @@ -80,7 +81,6 @@
-  \date{Release 0.9.2 -- December 27, 2007} 
-  
++@@ -84,7 +86,6 @@
++ \author{Joachim Dahl \& Lieven Vandenberghe}
++ \date{Release 0.9.3 -- February 24, 2008} 
 + \begin{document}
 +-\Configure{crosslinks*}{next}{prev}{up}{}
 + 
 + \maketitle
 + 
- --- ../../doc/modeling.tex	2007-12-27 05:08:41.000000000 +0100
- +++ ../../doc/modeling.tex	2008-01-01 21:17:43.000000000 +0100
++Index: cvxopt-0.9.3/doc/modeling.tex
++===================================================================
++--- ../../doc/modeling.tex	2008-02-24 01:12:43.000000000 +0100
+++++ ../../doc/modeling.tex	2008-03-17 20:58:30.000000000 +0100
 +@@ -655,7 +655,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.
- --- ../../doc/printing.tex	2007-12-27 05:08:41.000000000 +0100
- +++ ../../doc/printing.tex	2008-01-01 21:13:03.000000000 +0100
- @@ -51,15 +51,15 @@
-  In order to make the built-in Python functions \function{repr()} and 
-  \function{str()} accessible for further customization, two functions
-  are provided in \module{cvxopt.base}.  
- -The function \function{base.matrix_repr()} is used when \function{repr()}
- +The function \function{base.matrix\_repr()} is used when \function{repr()}
-  is called with a matrix argument;
- -and \function{base.matrix_str()} is used when \function{str()}
- +and \function{base.matrix\_str()} is used when \function{str()}
-  is called with a matrix argument.  By default, the functions are set to
- -\function{printing.matrix_repr_default()} and
- -\function{printing.matrix_str_default()}, respectively,
- +\function{printing.matrix\_repr\_default()} and
- +\function{printing.matrix\_str\_default()}, respectively,
-  but they can be redefined to any other Python functions. 
-  For example, if we prefer \code{"A"} to return the same output
- -as \code{"print A"}, we can simply redefine \function{base.matrix_repr()} 
- +as \code{"print A"}, we can simply redefine \function{base.matrix\_repr()} 
-  as shown below.
-  \begin{verbatim}
-  >>> from cvxopt import base, printing
- @@ -74,10 +74,10 @@
-  
-  The formatting for sparse matrices is similar.  
-  The functions \function{repr()} and \function{str()} for sparse
- -matrices are \function{base.spmatrix_repr()} 
- -and \function{base.spmatrix_str()}, respectively.
- -By default, they are set to \function{printing.spmatrix_repr_default()}
- -and \function{printing.spmatrix_repr_str()}.
- +matrices are \function{base.spmatrix\_repr()} 
- +and \function{base.spmatrix\_str()}, respectively.
- +By default, they are set to \function{printing.spmatrix\_repr\_default()}
- +and \function{printing.spmatrix\_repr\_str()}.
-  
-  \begin{verbatim}
-  >>> from cvxopt import base, printing 
- @@ -102,7 +102,7 @@
-  
-  As can be seen from the example, the default behaviour is to print
-  the entire matrix including structural zeros. An alternative triplet 
- -printing style is defined in \function{printing.spmatrix_str_triplet}. 
- +printing style is defined in \function{printing.spmatrix\_str\_triplet}. 
-  \begin{verbatim}
-  >>> base.spmatrix_str = printing.spmatrix_str_triplet
-  >>> print A
- --- ../../doc/solvers.tex	2007-12-27 05:08:41.000000000 +0100
- +++ ../../doc/solvers.tex	2008-01-01 21:17:50.000000000 +0100
- @@ -512,7 +512,7 @@
++Index: cvxopt-0.9.3/doc/solvers.tex
++===================================================================
++--- ../../doc/solvers.tex	2008-02-24 01:12:43.000000000 +0100
+++++ ../../doc/solvers.tex	2008-03-17 20:58:30.000000000 +0100
++@@ -507,7 +507,7 @@
 + \end{verbatim}
 + 
 + \begin{center}
 +-\includegraphics[width=15cm]{figures/floorplan.eps}
 ++\includegraphics[width=15cm]{figures/floorplan.pdf}
 + \end{center}
 + \end{description}
 + 
- @@ -593,9 +593,9 @@
++Index: cvxopt-0.9.3/doc/coneprog.tex
++===================================================================
++--- ../../doc/coneprog.tex	2008-03-17 21:01:54.000000000 +0100
+++++ ../../doc/coneprog.tex	2008-03-17 21:01:58.000000000 +0100
++@@ -508,9 +508,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/watch
index aa45798,0000000..a1dd7a3
mode 100644,000000..100644
--- a/debian/watch
+++ b/debian/watch
@@@ -1,3 -1,0 +1,2 @@@
 +version=3
- opts="dversionmangle=s/\+nogs\d//" \
-   http://abel.ee.ucla.edu/src/cvxopt-(.*).tar.gz debian debian/orig-tar.sh
++http://abel.ee.ucla.edu/src/cvxopt-(.*).tar.gz debian debian/orig-tar.sh

-- 
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