[cvxopt] 22/64: Imported Debian patch 1.0-2
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 52faa7721a81eddb50d074ce2158da862da41964
Author: Torsten Werner <twerner at debian.org>
Date: Wed Jun 11 20:41:57 2008 +0200
Imported Debian patch 1.0-2
---
debian/changelog | 11 +++++++++++
debian/patches/doc-makefile.diff | 9 +++++----
debian/patches/doc.diff | 26 +++++++++++++-------------
debian/patches/python24_buildfix.diff | 18 +++++++++---------
debian/patches/setup.diff | 6 ++++--
debian/python-cvxopt.debhelper.log | 1 -
debian/python-cvxopt.doc-base | 2 +-
debian/rules | 2 ++
8 files changed, 45 insertions(+), 30 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2883f3a..2b2c72b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+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.
diff --git a/debian/patches/doc-makefile.diff b/debian/patches/doc-makefile.diff
index c9b038b..a92a9e2 100644
--- a/debian/patches/doc-makefile.diff
+++ b/debian/patches/doc-makefile.diff
@@ -1,6 +1,8 @@
---- ../../doc/Makefile 2007-12-27 05:08:41.000000000 +0100
-+++ ../../doc/Makefile 2008-01-01 20:32:49.000000000 +0100
-@@ -3,7 +3,11 @@
+Index: cvxopt-1.0/doc/Makefile
+===================================================================
+--- cvxopt-1.0.orig/doc/Makefile 2008-04-24 06:57:42.000000000 +0200
++++ cvxopt-1.0/doc/Makefile 2008-06-11 20:39:36.000000000 +0200
+@@ -3,6 +3,10 @@
all: html
@@ -11,4 +13,3 @@
html: Makefile $(SOURCES)
htlatex cvxopt.tex "html,3,info"
tex4ht -f/cvxopt -i/usr/share/texmf/tex4ht/ht-fonts/ \
-
diff --git a/debian/patches/doc.diff b/debian/patches/doc.diff
index 1afde9c..15bc789 100644
--- a/debian/patches/doc.diff
+++ b/debian/patches/doc.diff
@@ -1,7 +1,7 @@
-Index: cvxopt-0.9.3/doc/cvxopt.tex
+Index: cvxopt-1.0/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
+--- 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
@@ -1,5 +1,7 @@
\documentclass{book}
\usepackage{graphicx}
@@ -27,16 +27,16 @@ Index: cvxopt-0.9.3/doc/cvxopt.tex
\newcommand{\dtc}{\code{'d'}}
@@ -84,7 +86,6 @@
\author{Joachim Dahl \& Lieven Vandenberghe}
- \date{Release 0.9.3 -- February 24, 2008}
+ \date{Release 1.0 -- April 24, 2008}
\begin{document}
-\Configure{crosslinks*}{next}{prev}{up}{}
\maketitle
-Index: cvxopt-0.9.3/doc/modeling.tex
+Index: cvxopt-1.0/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
+--- 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 @@
\end{verbatim}
@@ -46,10 +46,10 @@ Index: cvxopt-0.9.3/doc/modeling.tex
\end{center}
Equivalently, we can formulate and solve the problems as LPs.
-Index: cvxopt-0.9.3/doc/solvers.tex
+Index: cvxopt-1.0/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
+--- 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 @@
\end{verbatim}
@@ -59,10 +59,10 @@ Index: cvxopt-0.9.3/doc/solvers.tex
\end{center}
\end{description}
-Index: cvxopt-0.9.3/doc/coneprog.tex
+Index: cvxopt-1.0/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
+--- 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 @@
The code below computes the trade-off curve and produces two figures
using the \ulink{Matplotlib}{http://matplotlib.sourceforge.net} package.
diff --git a/debian/patches/python24_buildfix.diff b/debian/patches/python24_buildfix.diff
index 98e0b01..1975709 100644
--- a/debian/patches/python24_buildfix.diff
+++ b/debian/patches/python24_buildfix.diff
@@ -1,7 +1,7 @@
-Index: src/C/cvxopt.h
+Index: cvxopt-1.0/src/C/cvxopt.h
===================================================================
---- src/C/cvxopt.h 2008-04-27 17:39:11.000000000 +0200
-+++ src/C/cvxopt.h 2008-04-27 17:39:27.000000000 +0200
+--- 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
@@ -43,6 +43,10 @@
#define malloc(size) malloc_aligned(size)
*/
@@ -13,10 +13,10 @@ Index: src/C/cvxopt.h
#define INT 0
#define DOUBLE 1
#define COMPLEX 2
-Index: src/C/dense.c
+Index: cvxopt-1.0/src/C/dense.c
===================================================================
---- src/C/dense.c 2008-04-27 17:41:02.000000000 +0200
-+++ src/C/dense.c 2008-04-27 17:42:20.000000000 +0200
+--- 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
@@ -25,6 +25,10 @@
#include <complexobject.h>
@@ -28,10 +28,10 @@ Index: src/C/dense.c
/* NumPy array protocol */
typedef struct {
int version;
-Index: src/C/sparse.c
+Index: cvxopt-1.0/src/C/sparse.c
===================================================================
---- src/C/sparse.c 2008-04-27 17:42:45.000000000 +0200
-+++ src/C/sparse.c 2008-04-27 17:43:53.000000000 +0200
+--- 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
@@ -25,6 +25,10 @@
#include <complexobject.h>
diff --git a/debian/patches/setup.diff b/debian/patches/setup.diff
index cbfccff..b92a338 100644
--- a/debian/patches/setup.diff
+++ b/debian/patches/setup.diff
@@ -1,5 +1,7 @@
---- src/setup.py 2007-12-27 05:00:01.000000000 +0100
-+++ src/setup.py 2008-01-01 20:36:56.000000000 +0100
+Index: cvxopt-1.0/src/setup.py
+===================================================================
+--- cvxopt-1.0.orig/src/setup.py 2008-04-24 07:15:30.000000000 +0200
++++ cvxopt-1.0/src/setup.py 2008-06-11 20:39:36.000000000 +0200
@@ -2,11 +2,11 @@
from os import listdir
diff --git a/debian/python-cvxopt.debhelper.log b/debian/python-cvxopt.debhelper.log
deleted file mode 100644
index f60a074..0000000
--- a/debian/python-cvxopt.debhelper.log
+++ /dev/null
@@ -1 +0,0 @@
-dh_listpackages
diff --git a/debian/python-cvxopt.doc-base b/debian/python-cvxopt.doc-base
index 88384e8..884004e 100644
--- a/debian/python-cvxopt.doc-base
+++ b/debian/python-cvxopt.doc-base
@@ -13,7 +13,7 @@ Abstract: CVXOPT is a Python package for convex optimization.
quadratic programming solvers in MOSEK and a a modeling tool
for specifying convex piecewise-linear optimization
problems.
-Section: Apps/Science
+Section: Science/Mathematics
Format: PDF
Index: /usr/share/doc/python-cvxopt/cvxopt.pdf
diff --git a/debian/rules b/debian/rules
index 319b0d6..231942c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,6 +9,8 @@ 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
--
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