[SCM] pyepr branch, master, updated. upstream/0.6.1-29-gdfaa575

[Antonio Valentino]

The following commit has been merged in the master branch:
commit dfaa5750387250ee741089193c5c7c8cee0fc5ee
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Mon Apr 30 22:54:25 2012 +0200

    Only run dh_sphinxdoc on the -doc package

diff --git a/debian/changelog b/debian/changelog
index 14c037e..8e6ecc4 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+pyepr (0.6.1-2) unstable; urgency=low
+
+  * Only run dh_sphinxdoc on the -doc package (Closes: #671048).
+    See also #647233.
+
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Tue, 01 May 2012 17:45:39 +0200
+
 pyepr (0.6.1-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/rules b/debian/rules
index e66429f..ab7f860 100755
--- a/debian/rules
+++ b/debian/rules
@@ -77,6 +77,12 @@ override_dh_compress:
 	dh_compress -X.txt
 
 
+override_dh_sphinxdoc:
+ifneq "$(shell dh_listpackages | grep -- -doc)" ""
+	dh_sphinxdoc
+endif
+
+
 override_dh_installdocs:
 ifeq (,$(findstring nodoc,$(DEB_BUILD_OPTIONS)))
 	$(MAKE) -C doc html
@@ -88,5 +94,4 @@ endif
 
 .PHONY: override_dh_auto_build override_dh_auto_clean override_dh_auto_test \
         override_dh_installchangelogs override_dh_compress override_dh_install \
-        override_dh_auto_install override_dh_installdocs
-
+        override_dh_auto_install dh_sphinxdoc override_dh_installdocs

-- 
Python ENVISAT Product Reader API