[SCM] A Python IDE for scientists branch, master, updated. debian/2.1.7-1-1-g6753a7f

[Picca Frédéric-Emma?==?UTF-8?Q?nuel]

The following commit has been merged in the master branch:
commit 6753a7f3ec32fc712dbc64aa5f0ef1fcd2c894e3
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sun Feb 19 17:41:03 2012 +0100

    prepare for backport

diff --git a/debian/changelog b/debian/changelog
index 401a9ad..8083dd0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+spyder (2.1.7-2) UNRELEASED; urgency=low
+
+  * prepare for backport
+
+ -- Picca Frédéric-Emmanuel <picca at synchrotron-soleil.fr>  Sun, 19 Feb 2012 14:33:29 +0100
+
 spyder (2.1.7-1) unstable; urgency=low
 
   * Imported Upstream version 2.1.7
diff --git a/debian/control b/debian/control
index 5cbcafc..986636a 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,10 @@ Uploaders: Ludovic Aubry <laubrycomm at free.fr>,
 	   Alexandre Fayolle <afayolle at debian.org>,
 	   Picca Frédéric-Emmanuel <picca at debian.org>
 DM-Upload-Allowed: yes
-Build-Depends: debhelper (>= 8.1.1), python-all (>= 2.6.6-3~)
-Build-Depends-Indep: python-sphinx (>= 1.0.7+dfsg), xsltproc
+Build-Depends: debhelper (>= 8),
+	       python-all (>= 2.6.6-3~)
+Build-Depends-Indep: python-sphinx,
+		     xsltproc
 Standards-Version: 3.9.2
 X-Python-Version: >= 2.6
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/spyder.git
@@ -32,7 +34,15 @@ Depends: ${misc:Depends},
 	 ${python:Depends},
 	 ${sphinxdoc:Depends},
 	 python-qt4
-Recommends: python-scipy, python-numpy, python-matplotlib, ipython, pyflakes (>= 0.5.0), pylint, python-rope (>= 0.9.2), python-sphinx (>= 0.6.0), pep8
+Recommends: ipython,
+	    pep8,
+	    pyflakes (>= 0.5.0),
+	    pylint,
+	    python-matplotlib,
+	    python-rope (>= 0.9.2),
+	    python-numpy,
+	    python-scipy,
+	    python-sphinx (>= 0.6.0)
 Provides: ${python:Provides}
 Breaks: ${python:Breaks}, spyder (<< 2.0.12-1),
 Replaces: spyder (<< 2.0.12-1)
diff --git a/debian/rules b/debian/rules
index 93e2a5c..86e95a9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,9 @@
 DB2MAN = /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
 XP     = xsltproc -''-nonet -''-param man.charmap.use.subset "0"
 
+# for backport on stable without bpo
+WITH_SPHINXDOC = $(shell if [ -x /usr/bin/dh_sphinxdoc ]; then echo "--with sphinxdoc"; fi)
+
 debian/spyder.1: debian/manpage.xml
 	$(XP) $(DB2MAN) $<
 
@@ -18,4 +21,4 @@ override_dh_clean:
 	dh_clean
 
 %:
-	dh  $@ --with python2 --with sphinxdoc
+	dh  $@ --with python2 $(WITH_SPHINXDOC)

-- 
A Python IDE for scientists