[med-svn] [python-cobra] 05/07: Clean up d/control and d/rules

[Afif Elghraoui]

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

afif pushed a commit to branch master
in repository python-cobra.

commit 046737a43d987db1da66fbe1ec1b65f793cd33f0
Author: Afif Elghraoui <afif at debian.org>
Date:   Sun Jul 17 15:31:02 2016 -0700

    Clean up d/control and d/rules
    
    * Use consistent formatting
    * Remove unnecessary lines
---
 debian/control | 65 +++++++++++++++++++++++++++++++---------------------------
 debian/rules   |  4 ++--
 2 files changed, 37 insertions(+), 32 deletions(-)

diff --git a/debian/control b/debian/control
index 6133d5d..a79f657 100644
--- a/debian/control
+++ b/debian/control
@@ -3,19 +3,22 @@ Section: python
 Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Afif Elghraoui <afif at debian.org>
-Build-Depends: debhelper (>= 9),
-	       dh-python,
-	       python-all,
-	       python-all-dev,
-	       python-setuptools,
-	       python-six,
-	       cython,
-	       python3-all,
-	       python3-all-dev,
-	       python3-setuptools,
-	       python3-six,
-	       cython3,
-	       libglpk-dev,
+Build-Depends:
+	debhelper (>= 9),
+	dh-python,
+	libglpk-dev,
+# Python2
+	python-all,
+	python-all-dev,
+	python-setuptools,
+	python-six,
+	cython,
+# Python3
+	python3-all,
+	python3-all-dev,
+	python3-setuptools,
+	python3-six,
+	cython3,
 # Test-Depends:
 	python-jsonschema (>> 2.5.0),
 	python-numpy,
@@ -23,8 +26,6 @@ Build-Depends: debhelper (>= 9),
 	python3-jsonschema (>> 2.5.0),
 	python3-numpy,
 	python3-scipy,
-X-Python-Version: >= 2.7
-X-Python3-Version: >= 3.4
 Standards-Version: 3.9.8
 Homepage: http://opencobra.github.io/cobrapy/
 Vcs-Git: https://anonscm.debian.org/git/debian-med/python-cobra.git
@@ -33,14 +34,16 @@ Vcs-Browser: https://anonscm.debian.org/cgit/debian-med/python-cobra.git
 
 Package: python-cobra
 Architecture: any
-Depends: ${shlibs:Depends},
-	 ${misc:Depends},
-	 ${python:Depends},
-	 python-cobra-data (= ${source:Version})
-Recommends: python-numpy,
-	    python-scipy,
-	    libsbml5-python,
-	    python-pandas
+Depends:
+	${shlibs:Depends},
+	${misc:Depends},
+	${python:Depends},
+	python-cobra-data (= ${source:Version}),
+Recommends:
+	python-numpy,
+	python-scipy,
+	libsbml5-python,
+	python-pandas,
 Suggests:
 	python-matplotlib,
 	qsopt-ex,
@@ -57,13 +60,15 @@ Description: constraint-based modeling of biological networks (Python 2)
 
 Package: python3-cobra
 Architecture: any
-Depends: ${shlibs:Depends},
-	 ${misc:Depends},
-	 ${python3:Depends},
-	 python-cobra-data (= ${source:Version})
-Recommends: python3-numpy,
-	    python3-scipy,
-	    python3-pandas
+Depends:
+	${shlibs:Depends},
+	${misc:Depends},
+	${python3:Depends},
+	python-cobra-data (= ${source:Version}),
+Recommends:
+	python3-numpy,
+	python3-scipy,
+	python3-pandas,
 Suggests:
 	python3-matplotlib,
 	qsopt-ex,
diff --git a/debian/rules b/debian/rules
index b9c466d..d823bcf 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,10 @@
 #!/usr/bin/make -f
+
 #DH_VERBOSE = 1
+#include /usr/share/dpkg/default.mk
 export LC_ALL=C.UTF-8
 export PYBUILD_NAME=cobra
 
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/default.mk
 
 %:
 	dh $@ --with python2,python3 --buildsystem=pybuild

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/python-cobra.git