[SCM] pyepr branch, master, updated. upstream/0.6-20-gcca3ffe

[Antonio Valentino]

The following commit has been merged in the master branch:
commit 4c7d0790f7eb107d0157814e4d836226214cb3cc
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Thu Feb 23 20:27:06 2012 +0100

    Honor nodoc DEB_BUILD_OPTIONS

diff --git a/debian/changelog b/debian/changelog
index 3c1b140..fec0277 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,9 @@ pyepr (0.6-1) unstable; urgency=low
   * Use dh_sphinxdoc and common javascript code from libjs-sphinxdoc
   * Call dh_numpy for an appropriate managements of dependency from
     numpy
+  * Honor nodoc DEB_BUILD_OPTIONS
 
- -- Antonio Valentino <antonio.valentino at tiscali.it>  Thu, 23 Feb 2012 20:19:24 +0100
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Thu, 23 Feb 2012 20:25:29 +0100
 
 pyepr (0.5-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 20b59cc..af08ffd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,7 +11,11 @@
 
 override_dh_auto_build:
 	dh_auto_build
+ifeq (,$(findstring nodoc,$(DEB_BUILD_OPTIONS)))
 	$(MAKE) -C doc html
+else
+	mkdir -p doc/html
+endif
 
 
 override_dh_auto_clean:

-- 
Python ENVISAT Product Reader API