[cvxopt] 29/64: Imported Debian patch 1.1.3-1

Andreas Tille tille at debian.org
Wed Jul 20 11:23:52 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 4338176604e40ce261a2d0b75f2ea62e5bcf3c49
Merge: c9dc1c3 eb56b14
Author: Soeren Sonnenburg <sonne at debian.org>
Date:   Wed Jan 12 15:04:47 2011 +0100

    Imported Debian patch 1.1.3-1

 INSTALL                                            |  10 +-
 LICENSE                                            |   5 +-
 debian/README.source                               |  47 --
 debian/changelog                                   |  11 +
 debian/control                                     |   2 +-
 debian/orig-tar.sh                                 |   1 +
 debian/rules                                       |   5 +-
 debian/source/format                               |   1 +
 doc/source/coneprog.rst                            |  13 +-
 doc/source/copyright.rst                           |   5 +-
 doc/source/index.rst                               |   2 +-
 doc/source/matrices.rst                            |   6 +-
 doc/source/modeling.rst                            |  12 +-
 doc/source/spsolvers.rst                           |  10 +-
 examples/book/chap4/{portfolio => portfolio.py}    |   2 -
 examples/book/chap4/{rls => rls.py}                |   2 -
 .../book/chap6/{basispursuit => basispursuit.py}   |   2 -
 .../book/chap6/{consumerpref => consumerpref.py}   |   2 -
 examples/book/chap6/{cvxfit => cvxfit.py}          |   2 -
 examples/book/chap6/{huber => huber.py}            |   2 -
 .../book/chap6/{inputdesign => inputdesign.py}     |   2 -
 examples/book/chap6/{penalties => penalties.py}    |   2 -
 examples/book/chap6/{polapprox => polapprox.py}    |   2 -
 examples/book/chap6/{regsel => regsel.py}          |   2 -
 examples/book/chap6/{robls => robls.py}            |   2 -
 examples/book/chap6/{smoothrec => smoothrec.py}    |   2 -
 examples/book/chap6/{tv => tv.py}                  |   2 -
 examples/book/chap7/{chernoff => chernoff.py}      |   2 -
 examples/book/chap7/{expdesign => expdesign.py}    |   2 -
 examples/book/chap7/{logreg => logreg.py}          |   2 -
 examples/book/chap7/{maxent => maxent.py}          |   2 -
 examples/book/chap7/{probbounds => probbounds.py}  |   2 -
 examples/book/chap8/{centers => centers.py}        |   2 -
 examples/book/chap8/{ellipsoids => ellipsoids.py}  |   2 -
 examples/book/chap8/{floorplan => floorplan.py}    |   2 -
 examples/book/chap8/{linsep => linsep.py}          |   2 -
 examples/book/chap8/{placement => placement.py}    |   2 -
 examples/doc/chap10/{l1svc => l1svc.py}            |   2 -
 examples/doc/chap10/{lp => lp.py}                  |   2 -
 examples/doc/chap10/{normappr => normappr.py}      |   2 -
 examples/doc/chap10/{roblp => roblp.py}            |   2 -
 examples/doc/chap4/acent.py                        |  74 ++
 examples/doc/chap7/{covsel => covsel.py}           |   2 -
 examples/doc/chap8/{conelp => conelp.py}           |   2 -
 examples/doc/chap8/{coneqp => coneqp.py}           |   2 -
 examples/doc/chap8/{l1 => l1.py}                   |   2 -
 examples/doc/chap8/{l1regls => l1regls.py}         |   2 -
 examples/doc/chap8/{lp => lp.py}                   |   2 -
 examples/doc/chap8/{mcsdp => mcsdp.py}             |   2 -
 examples/doc/chap8/{portfolio => portfolio.py}     |   2 -
 examples/doc/chap8/{qcl1 => qcl1.py}               |   2 -
 examples/doc/chap8/{sdp => sdp.py}                 |   2 -
 examples/doc/chap8/{socp => socp.py}               |   2 -
 examples/doc/chap9/{acent => acent.py}             |   2 -
 examples/doc/chap9/{acent2 => acent2.py}           |   2 -
 examples/doc/chap9/{floorplan => floorplan.py}     |   2 -
 examples/doc/chap9/{gp => gp.py}                   |   2 -
 examples/doc/chap9/{l2ac => l2ac.py}               |   2 -
 examples/doc/chap9/{robls => robls.py}             |   2 -
 src/C/SuiteSparse/README_cvxopt                    |   4 +-
 src/C/amd.c                                        |   3 +-
 src/C/base.c                                       |   3 +-
 src/C/blas.c                                       |   3 +-
 src/C/cholmod.c                                    |   3 +-
 src/C/cvxopt.h                                     |   3 +-
 src/C/dense.c                                      |   5 +-
 src/C/dsdp.c                                       |   3 +-
 src/C/fftw.c                                       |   3 +-
 src/C/glpk.c                                       |   3 +-
 src/C/gsl.c                                        |   3 +-
 src/C/lapack.c                                     |   3 +-
 src/C/misc.h                                       |   3 +-
 src/C/misc_solvers.c                               |  67 +-
 src/C/sparse.c                                     |   5 +-
 src/C/umfpack.c                                    |   3 +-
 src/python/__init__.py                             |   3 +-
 src/python/coneprog.py                             | 403 +++++-----
 src/python/cvxprog.py                              | 192 ++---
 src/python/info.py                                 |   6 +-
 src/python/misc.py                                 |  35 +-
 src/python/modeling.py                             | 281 +++----
 src/python/mosek.py                                | 871 --------------------
 src/python/msk.py                                  | 881 +++++++++++++++++++++
 src/python/printing.py                             |  22 +-
 src/python/solvers.py                              |   3 +-
 src/setup.py                                       |   4 +-
 86 files changed, 1553 insertions(+), 1557 deletions(-)

diff --cc debian/changelog
index 813897f,0000000..b45ae5d
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,231 -1,0 +1,242 @@@
++cvxopt (1.1.3-1) unstable; urgency=low
++
++  * New upstream release.
++    - Install header files (Closes: #604894)
++    - Fixes build with Sphinx 1.0 (Closes: #608841).
++  * Bump standards version to 3.9.1
++    - Convert package to format 3.0 (quilt)
++    - Remove debian/README.source
++
++ -- Soeren Sonnenburg <sonne at debian.org>  Wed, 12 Jan 2011 15:04:47 +0100
++
 +cvxopt (1.1.2-1) unstable; urgency=low
 +
 +  [ Torsten Werner ]
 +  * Remove myself from Uploaders as discussed with Sören
 +
 +  [ Soeren Sonnenburg ]
 +  * New upstream release.
 +    - Now uses python-spinx to build documentation.
 +    - Refresh patches.
 +    - Require at least python 2.5.
 +    - Require lapack and blas.
 +  * Bump standards version to 3.8.3 (no changes required).
 +
 + -- Soeren Sonnenburg <sonne at debian.org>  Sun, 20 Dec 2009 07:09:46 +0100
 +
 +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 ffdd4f1,0000000..3ad9e17
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,33 -1,0 +1,33 @@@
 +Source: cvxopt
 +Section: python
 +Priority: optional
 +Maintainer: Soeren Sonnenburg <sonne at debian.org>
 +Build-Depends: cdbs, debhelper (>= 5), python-central (>= 0.5), python-all-dev,
 + libatlas-base-dev [!powerpc !alpha !arm !armel], libblas-dev, liblapack-dev,
 + python-sphinx, libglpk-dev, libfftw3-dev, libgsl0-dev, libdsdp-dev (>= 5.8-4),
 + texlive-latex-base, texlive-latex-recommended, texlive-latex-extra,
 + texlive-fonts-recommended, quilt
 +XS-Python-Version: >= 2.5
- Standards-Version: 3.8.3
++Standards-Version: 3.9.1
 +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/orig-tar.sh
index 7b81537,0000000..3316e13
mode 100644,000000..100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@@ -1,22 -1,0 +1,23 @@@
 +#!/bin/sh
 +
 +# called by uscan with '--upstream-version' <version> <file>
 +
 +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
++chmod ugo-x cvxopt-$2/examples/doc/*/*.py cvxopt-$2/examples/book/*/*.py
 +
 +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/rules
index 79a167a,0000000..e6afdc9
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,30 -1,0 +1,31 @@@
 +#! /usr/bin/make -f 
 +
 +DEB_PYTHON_SYSTEM     := pycentral
 +DEB_SRCDIR            := src
 +DEB_COMPRESS_EXCLUDE  := CVXOPT.pdf
 +DEB_SHLIBDEPS_INCLUDE := /usr/lib/atlas
 +
 +include /usr/share/cdbs/1/rules/debhelper.mk
 +include /usr/share/cdbs/1/class/python-distutils.mk
 +include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 +
 +DEB_QUILT_CMD = QUILT_PATCHES=$(DEB_PATCHDIRS) quilt --quiltrc /dev/null
 +
 +build/python-cvxopt:: debian/stamp-docs
 +debian/stamp-docs:
 +	make -C doc latex
 +	make -C doc/build/latex all-pdf
 +	touch $@
 +
- #install/python-cvxopt::
- #	dh_install -ppython-cvxopt doc/cvxopt/*.html doc/cvxopt/*.gif doc/cvxopt/*.css usr/share/doc/python-cvxopt/html
++install/python-cvxopt::
++	mkdir -p usr/include/cvxopt
++	dh_install -ppython-cvxopt src/C/cvxopt.h src/C/blas_redefines.h  usr/include/cvxopt
 +
 +clean::
 +	$(RM) debian/stamp-docs 
 +	make -C doc clean
 +	$(RM) -r src/build
 +
 +get-orig-source:
 +	-uscan --rename --upstream-version 0
 +	@echo successfully retrieved upstream tarball
diff --cc debian/source/format
index 0000000,0000000..163aaf8
new file mode 100644
--- /dev/null
+++ b/debian/source/format
@@@ -1,0 -1,0 +1,1 @@@
++3.0 (quilt)

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