[SCM] dataset manipulation GUI generator branch, master, updated. debian/1.4.1-1-1-g93bcb63

Picca Frédéric-Emma?==?UTF-8?Q?nuel picca at debian.org
Sun Feb 19 16:59:18 UTC 2012


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

    prepare for backport

diff --git a/debian/changelog b/debian/changelog
index ccb4f1f..da2280a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+guidata (1.4.1-2) UNRELEASED; urgency=low
+
+  * prepare for backport
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org>  Sun, 19 Feb 2012 14:28:57 +0100
+
 guidata (1.4.1-1) unstable; urgency=low
 
   * Imported Upstream version 1.4.1
diff --git a/debian/control b/debian/control
index bce63aa..fadd483 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,11 @@ 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),
+Build-Depends: debhelper (>= 8),
 	       python-all (>= 2.6.6-3~),
 	       python-qt4,
 	       python-spyderlib (>= 2.0.10)
-Build-Depends-Indep: python-sphinx (>= 1.0.7+dfsg)
+Build-Depends-Indep: python-sphinx
 X-Python-Version: >= 2.6
 Standards-Version: 3.9.2
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/guidata.git
diff --git a/debian/rules b/debian/rules
index cfc0c6b..1d7438f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 
 VERSION := $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p')
+# for backport without bpo on stable
+WITH_SPHINXDOC = $(shell if [ -x /usr/bin/dh_sphinxdoc ]; then echo "--with sphinxdoc"; fi)
 
 get-orig-source:
 	uscan --force-download --upstream-version $(VERSION) --repack
@@ -10,6 +12,6 @@ override_dh_clean:
 	dh_clean
 
 %:
-	dh $@ --with python2 --with sphinxdoc
+	dh $@ --with python2 $(WITH_SPHINXDOC)
 
 .PHONY: get-orig-source

-- 
dataset manipulation GUI generator



More information about the debian-science-commits mailing list