[cvxopt] 46/64: Use dh-python instead of cdbs, fix some patches

[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 8da8f0b5a7314b628caddf1b4dfda974664bd6f1
Author: Andreas Tille <tille at debian.org>
Date:   Wed Jul 20 10:10:28 2016 +0200

    Use dh-python instead of cdbs, fix some patches
---
 debian/changelog              |  2 ++
 debian/compat                 |  2 +-
 debian/control                |  4 ++--
 debian/copyright              |  1 +
 debian/patches/glpk-4.49.diff |  4 ++--
 debian/rules                  | 27 +++++++++------------------
 6 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 2126acd..0953999 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ cvxopt (1.1.8+dfsg-1) UNRELEASED; urgency=medium
   * Team maintenance in Debian Science team
   * DEP5
   * cme fix dpkg-control
+  * debhelper 9
+  * debian/rules: dh + pybuild
 
  -- Andreas Tille <tille at debian.org>  Wed, 20 Jul 2016 08:33:05 +0200
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index 591049e..7267ac7 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Uploaders: Soeren Sonnenburg <sonne at debian.org>,
            Andreas Tille <tille at debian.org>
 Section: python
 Priority: optional
-Build-Depends: cdbs,
-               debhelper (>= 5),
+Build-Depends: debhelper (>= 9),
+               dh-python,
                libatlas-base-dev [!powerpc !alpha !arm !armel],
                libblas-dev,
                liblapack-dev,
diff --git a/debian/copyright b/debian/copyright
index f705fbc..c00d7f3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,6 +4,7 @@ Source: https://github.com/cvxopt/cvxopt/releases
 Files-Excluded: */*.gif
                 */*.pdf
                 */*.html
+                */src/C/SuiteSparse*
 
 Files: *
 Copyright: 2004-2015 Joachim Dahl <joachim at kom.aau.dk>
diff --git a/debian/patches/glpk-4.49.diff b/debian/patches/glpk-4.49.diff
index 6bee1b9..f35da87 100644
--- a/debian/patches/glpk-4.49.diff
+++ b/debian/patches/glpk-4.49.diff
@@ -16,7 +16,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
  #include "cvxopt.h"
  #include "misc.h"
 -#include <glpk.h>
-+#include <lpx.h>
++#include "lpx.h"
  #include <float.h>
  #include <limits.h>
  
@@ -2117,7 +2117,7 @@ This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
          include_dirs = [ GLPK_INC_DIR ],
          library_dirs = [ GLPK_LIB_DIR ],
 -        sources = ['src/C/glpk.c'] )
-+        sources = ['src/C/glpk.c', 'C/lpx.c'] )
++        sources = ['src/C/glpk.c', 'src/C/lpx.c'] )
      extmods += [glpk];
  
  if BUILD_DSDP:
diff --git a/debian/rules b/debian/rules
index 453c029..f800f73 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,15 @@
 #! /usr/bin/make -f 
 
-DEB_SRCDIR            := src
-DEB_COMPRESS_EXCLUDE  := CVXOPT.pdf
-DEB_SHLIBDEPS_INCLUDE := /usr/lib/atlas
+DH_VERBOSE := 1
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/python-distutils.mk
+DEBPKGNAME:=$(shell dpkg-parsechangelog | awk '/^Source:/ {print $$2}')
+docpkg:=$(DEBPKGNAME)-doc
 
-build/python-cvxopt:: debian/stamp-docs
-debian/stamp-docs:
-	make -C doc latex
-	make -C doc/build/latex all-pdf
-	touch $@
+export PYBUILD_NAME=cvxopt
 
-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
+%:
+	dh $@ --with python2,sphinxdoc --buildsystem=pybuild
 
+override_dh_install:
+	dh_install
+	dh_install -ppython-cvxopt src/C/cvxopt.h src/C/blas_redefines.h  usr/include/cvxopt

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