[cvxopt] 57/64: Add Python3 and doc package

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository cvxopt.

commit 91073a97148bb7c50114da5c4a47d79520e2c29e
Author: Andreas Tille <tille at debian.org>
Date:   Wed Jul 20 12:10:03 2016 +0200

    Add Python3 and doc package
---
 debian/changelog                                |  2 +
 debian/control                                  | 49 ++++++++++++++++++++++++-
 debian/{examples => python-cvxopt-doc.examples} |  0
 debian/rules                                    | 17 +++++----
 4 files changed, 60 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 173a5e9..bd7c740 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ cvxopt (1.1.8+dfsg-1) UNRELEASED; urgency=medium
   * debian/rules: dh + pybuild
   * exclude suitesparse code copy
     Closes: #719804
+  * hardening=+bindnow
+  * Python3 + doc package
 
  -- Andreas Tille <tille at debian.org>  Wed, 20 Jul 2016 08:33:05 +0200
 
diff --git a/debian/control b/debian/control
index 7267ac7..f934979 100644
--- a/debian/control
+++ b/debian/control
@@ -19,7 +19,8 @@ Build-Depends: debhelper (>= 9),
                texlive-latex-extra,
                texlive-fonts-recommended,
                texlive-generic-extra,
-               python-all-dev
+               python-all-dev,
+               python3-all-dev
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/cvxopt.git
 Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/cvxopt.git
@@ -45,3 +46,49 @@ Description: Python package for convex optimization
     linear and quadratic programming solvers in MOSEK
   * a modeling tool for specifying convex piecewise-linear
     optimization problems.
+ .
+ This package contains the Python 2 module.
+
+Package: python3-cvxopt
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends},
+         ${python3:Depends}
+Provides: ${python:Provides}
+Description: Python3 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.
+ .
+ This package contains the Python 3 module.
+
+Package: python-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends},
+         ${sphinxdoc:Depends},
+         libjs-mathjax
+Description: Python package for convex optimization (documentation)
+ 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.
+ .
+ This package contains the documentation of the Python module.
diff --git a/debian/examples b/debian/python-cvxopt-doc.examples
similarity index 100%
rename from debian/examples
rename to debian/python-cvxopt-doc.examples
diff --git a/debian/rules b/debian/rules
index 570da3c..8844028 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,19 +1,22 @@
 #! /usr/bin/make -f 
 
-DH_VERBOSE := 1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+bindnow
 
-DEBPKGNAME:=$(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
-docpkg:=$(DEBPKGNAME)-doc
+DH_VERBOSE := 1
 
 export PYBUILD_NAME=cvxopt
 
 %:
-	dh $@ --with python2,sphinxdoc --buildsystem=pybuild
+	dh $@ --with python2,python3,sphinxdoc --buildsystem=pybuild
+
+override_dh_auto_clean:
+	dh_auto_clean
+	rm -rf doc/build
 
 override_dh_auto_build-indep:
-	dh_auto_build-indep
-	PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N -b html doc build/html
-	PYTHONPATH=. http_proxy='127.0.0.1:9' sphinx-build -N -b pdf doc build/pdf
+	# $(pyrun) 'make --directory=doc html latex'
+	make --directory=doc html latex
+	make --directory=doc/build/latex all-pdf
 
 override_dh_install:
 	dh_install

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cvxopt.git