[SCM] Packaging for pytango branch, master, updated. debian/7.2.2-2-1-g57d2661

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


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

    prepare for backport on stable without bpo

diff --git a/debian/changelog b/debian/changelog
index 2bb2cd0..4d8338a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+pytango (7.2.2-3) UNRELEASED; urgency=low
+
+  * prepare for backport on stable without bpo
+
+ -- Picca Frédéric-Emmanuel <picca at debian.org>  Sun, 19 Feb 2012 14:49:19 +0100
+
 pytango (7.2.2-2) unstable; urgency=low
 
   * use dh_numpy for better python-numpy dependency.
diff --git a/debian/control b/debian/control
index 5bf795e..b1aba2f 100644
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,15 @@ 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.0.0),
-	       python-all-dev (>= 2.6.6-3~),
+Build-Depends: debhelper (>= 8),
+	       graphviz,
+	       ipython,
+	       libboost-python-dev,
 	       liblog4tango4-dev,
 	       libtango7-dev (>= 7.2),
-	       libboost-python-dev,
+	       python-all-dev (>= 2.6.6-3~),
 	       python-numpy (>= 1:1.4.1-4~),
-	       ipython,
-	       python-sphinx (>= 1.0.7+dfsg),
-	       graphviz
+	       python-sphinx
 X-Python-Version: >= 2.5
 Standards-Version: 3.9.2
 Homepage: http://www.tango-controls.org/static/PyTango/latest/doc/html/
diff --git a/debian/rules b/debian/rules
index 0311987..6866952 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+# for backport on stable without bpo
+WITH_SPHINXDOC = $(shell if [ -x /usr/bin/dh_sphinxdoc ]; then echo "--with sphinxdoc"; fi)
+
 override_dh_clean:
 	rm -rf build/sphinx
 	dh_clean
@@ -12,4 +15,4 @@ override_dh_auto_build:
 	dh_auto_build -- --without-spock
 
 %:
-	dh $@ --with python2 --with sphinxdoc
+	dh $@ --with python2 $(WITH_SPHINXDOC)

-- 
Packaging for pytango



More information about the debian-science-commits mailing list