[SCM] pyepr branch, master, updated. upstream/0.8.1-50-g5d24578

[Antonio Valentino]

The following commit has been merged in the master branch:
commit f9068be327103776d7fbea333daa4a7edc8ce033
Author: Antonio Valentino <antonio.valentino at tiscali.it>
Date:   Sat Oct 26 08:52:57 2013 +0000

    Only use local files for generating sphinx doc.
    
    Set the "intersphinx_mapping" parameter in the doc/conf.py to
    point to local object.inv files.
    This makes the package self contained and no download attempt
    happens any longer (Closes: #726859).

diff --git a/debian/changelog b/debian/changelog
index e7fa5b1..bc96145 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,11 +6,19 @@ pyepr (0.8.1-1) UNRELEASED; urgency=low
     - Build-depend from debhelper (>= 9)
     - Removed unnecessary versioned dependency from libepr-api2-dev (>= 2.2)
     - Removed unnecessary "${sphinxdoc:Depends}" from non-doc packages
+    - Added build dependencies from python-doc and python-numpy-doc.
+      It is necessary to make the package build self-contained.
   * debian/copyright
     - Updated copyright dates
     - Fixed formatting of copyright file
+  * debian/patches:
+    - Only use local files for generating sphinx doc.
+      Set the "intersphinx_mapping" parameter in the doc/conf.py to
+      point to local object.inv files.
+      This makes the package self contained and no download attempt
+      happens any longer (Closes: #726859).
 
- -- Antonio Valentino <antonio.valentino at tiscali.it>  Thu, 20 Jun 2013 17:52:19 +0000
+ -- Antonio Valentino <antonio.valentino at tiscali.it>  Sat, 26 Oct 2013 08:51:44 +0000
 
 pyepr (0.6.1-3) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 1a60c22..789d100 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,8 @@ Build-Depends: python-all-dev, python-all-dbg,
                python-numpy, python-numpy-dbg,
                python3-numpy, python3-numpy-dbg,
                libepr-api2-dev,
-               python-sphinx (>= 1.0.7+dfsg), texlive-latex-extra
+               python-sphinx (>= 1.0.7+dfsg), texlive-latex-extra,
+               python-doc, python-numpy-doc
 Standards-Version: 3.9.4
 Homepage: http://avalentino.github.com/pyepr
 Vcs-Git: git://anonscm.debian.org/pkg-grass/pyepr.git
diff --git a/debian/patches/0001-Only-use-local-files-for-generating-sphinx-doc.patch b/debian/patches/0001-Only-use-local-files-for-generating-sphinx-doc.patch
new file mode 100644
index 0000000..c0e7e81
--- /dev/null
+++ b/debian/patches/0001-Only-use-local-files-for-generating-sphinx-doc.patch
@@ -0,0 +1,29 @@
+From: Antonio Valentino <antonio.valentino at tiscali.it>
+Date: Sat, 26 Oct 2013 08:30:36 +0000
+Subject: Only use local files for generating sphinx doc.
+
+Set the "intersphinx_mapping" parameter in the doc/conf.py to
+point to local object.inv files.
+This makes the package self contained and no download attempt
+happens any longer (Closes: #726859).
+---
+ doc/conf.py | 6 ++++--
+ 1 file changed, 4 insertions(+), 2 deletions(-)
+
+diff --git a/doc/conf.py b/doc/conf.py
+index 39584de..aed9802 100644
+--- a/doc/conf.py
++++ b/doc/conf.py
+@@ -123,8 +123,10 @@ extlinks = {
+ 
+ # Intersphinx
+ intersphinx_mapping = {
+-    'python': ('http://docs.python.org', None),
+-    'numpy':  ('http://docs.scipy.org/doc/numpy', None),
++    'python': ('http://docs.python.org',
++               '/usr/share/doc/python-doc/html/objects.inv'),
++    'numpy':  ('http://docs.scipy.org/doc/numpy',
++               '/usr/share/doc/python-numpy-doc/html/objects.inv'),
+ }
+ 
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..282fdc4
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Only-use-local-files-for-generating-sphinx-doc.patch

-- 
Python ENVISAT Product Reader API