[SCM] efficient 2D data-plotting library branch, master, updated. debian/2.1.6-2-1-gc35f0bb

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

The following commit has been merged in the master branch:
commit c35f0bb3ad417b215e02fca205bdd1ceedbb884a
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Sun Feb 19 14:42:02 2012 +0100

    prepare for backport on stable

diff --git a/debian/changelog b/debian/changelog
index 984a3c6..e58147d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+guiqwt (2.1.6-3) UNRELEASED; urgency=low
+
+  * prepare for backport on stable
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org>  Sun, 19 Feb 2012 14:40:58 +0100
+
 guiqwt (2.1.6-2) unstable; urgency=low
 
   * use dh_numpy for better numpy dependency.
diff --git a/debian/control b/debian/control
index aaeb74b..fc6ba36 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,13 @@ Section: science
 Priority: extra
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Picca Frédéric-Emmanuel <picca at debian.org>
-Build-Depends: debhelper (>= 8.1.1),
-	       python-all-dev,
-	       python-numpy (>= 1.3),
+Build-Depends: debhelper (>= 8),
 	       gfortran,
-	       python-sphinx (>= 1.0.7+dfsg),
+	       python-all-dev,
 	       python-guidata (>= 1.3.2),
-	       python-qwt5-qt4
+	       python-numpy,
+	       python-qwt5-qt4,
+	       python-sphinx
 X-Python-Version: >= 2.6
 Standards-Version: 3.9.2
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/guiqwt.git
@@ -23,11 +23,11 @@ Depends: ${shlibs:Depends},
 	 ${misc:Depends},
 	 ${python:Depends},
 	 ${sphinxdoc:Depends},
-	 python-qwt5-qt4 (>= 5.2),
 	 python-guidata (>= 1.3.2),
 	 python-h5py,
-	 python-scipy (>= 0.7),
-	 python-imaging (>= 1.1.6)
+	 python-imaging (>= 1.1.6),
+	 python-qwt5-qt4 (>= 5.2),
+	 python-scipy (>= 0.7)
 Recommends: python-dicom
 Suggests: spyder (>= 2.0.10)
 Provides: ${python:Provides}
diff --git a/debian/rules b/debian/rules
index ba4b169..c3dceef 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,6 +5,9 @@ export FFLAGS = $(shell dpkg-buildflags --get FFLAGS) -fPIC
 
 VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')
 
+# for backport on stable without bpo
+WITH_SPHINXDOC = $(shell if [ -x /usr/bin/dh_sphinxdoc ]; then echo "--with sphinxdoc"; fi)
+
 get-orig-source:
 	uscan --force-download --upstream-version $(VERSION) --repack
 
@@ -17,6 +20,6 @@ override_dh_auto_install:
 	dh_numpy
 
 %:
-	dh $@ --with python2 --with sphinxdoc
+	dh $@ --with python2 $(WITH_SPHINXDOC)
 
 .PHONY: get-orig-source

-- 
efficient 2D data-plotting library