[Pkg-freeipa-devel] custodia: Changes to 'master'

[Timo Aaltonen]

 debian/changelog                        |    8 +++++++
 debian/control                          |    2 -
 debian/patches/disable-intersphinx.diff |   33 ++++++++++++++++++++++++++++++++
 debian/patches/series                   |    1 
 4 files changed, 43 insertions(+), 1 deletion(-)

New commits:
commit fdb5c95fb1b993f0f3cf1d7d9dd12430b3593a0d
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Thu Oct 27 09:37:28 2016 +0300

    releasing package custodia version 0.1.0-6

diff --git a/debian/changelog b/debian/changelog
index 91dee68..bfe3038 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,10 @@
-custodia (0.1.0-6) UNRELEASED; urgency=medium
+custodia (0.1.0-6) unstable; urgency=medium
 
   * disable-intersphinx.diff: Disable intersphinx, which would download
     stuff from the net. (Closes: #834587)
   * control: Fix section. (Closes: #832203)
 
- -- Timo Aaltonen <tjaalton at debian.org>  Thu, 27 Oct 2016 09:34:47 +0300
+ -- Timo Aaltonen <tjaalton at debian.org>  Thu, 27 Oct 2016 09:37:22 +0300
 
 custodia (0.1.0-5) unstable; urgency=medium
 

commit cf9cbcd628cdb35da90b87019626f3b554ea5676
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Thu Oct 27 09:37:09 2016 +0300

    control: Fix section. (Closes: #832203)

diff --git a/debian/changelog b/debian/changelog
index df9cc36..91dee68 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ custodia (0.1.0-6) UNRELEASED; urgency=medium
 
   * disable-intersphinx.diff: Disable intersphinx, which would download
     stuff from the net. (Closes: #834587)
+  * control: Fix section. (Closes: #832203)
 
  -- Timo Aaltonen <tjaalton at debian.org>  Thu, 27 Oct 2016 09:34:47 +0300
 
diff --git a/debian/control b/debian/control
index 393e810..b03ecc9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,7 @@
 Source: custodia
 Maintainer: Debian FreeIPA Team <pkg-freeipa-devel at lists.alioth.debian.org>
 Uploaders: Timo Aaltonen <tjaalton at debian.org>
-Section: python
+Section: admin
 Priority: optional
 Build-Depends:
  debhelper (>= 9),

commit 5e51b5ba23af15847f708f990a8f375729b01a50
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Thu Oct 27 09:36:36 2016 +0300

    disable-intersphinx.diff: Disable intersphinx, which would download stuff from the net. (Closes: #834587)

diff --git a/debian/changelog b/debian/changelog
index e6e5bc3..df9cc36 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+custodia (0.1.0-6) UNRELEASED; urgency=medium
+
+  * disable-intersphinx.diff: Disable intersphinx, which would download
+    stuff from the net. (Closes: #834587)
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Thu, 27 Oct 2016 09:34:47 +0300
+
 custodia (0.1.0-5) unstable; urgency=medium
 
   * rules: Run tox directly instead via 'make tests'.
diff --git a/debian/patches/disable-intersphinx.diff b/debian/patches/disable-intersphinx.diff
new file mode 100644
index 0000000..266ef20
--- /dev/null
+++ b/debian/patches/disable-intersphinx.diff
@@ -0,0 +1,33 @@
+commit 8e40db86909de67dca1a9b08530bb74e9d6d2c37
+Author: Christian Heimes <cheimes at redhat.com>
+Date:   Thu Sep 15 17:23:33 2016 +0200
+
+    Disable intersphinx
+    
+    Interspinx downloads an inventory file from docs.python.org. Custodia
+    doesn't need the feature. It just slows down make html and causes
+    trouble for packagers.
+    
+    Closes: #13
+    Signed-off-by: Christian Heimes <cheimes at redhat.com>
+    Reviewed-by: Simo Sorce <simo at redhat.com>
+    Closes #78
+
+--- a/docs/source/conf.py
++++ b/docs/source/conf.py
+@@ -30,7 +30,7 @@ import os
+ # ones.
+ extensions = [
+     'sphinx.ext.autodoc',
+-    'sphinx.ext.intersphinx',
++#    'sphinx.ext.intersphinx',
+ ]
+ 
+ # Add any paths that contain templates here, relative to this directory.
+@@ -262,4 +262,5 @@ texinfo_documents = [
+ 
+ 
+ # Example configuration for intersphinx: refer to the Python standard library.
+-intersphinx_mapping = {'http://docs.python.org/': None}
++# Disabled, see https://github.com/latchset/custodia/issues/13
++# intersphinx_mapping = {'http://docs.python.org/': None}
diff --git a/debian/patches/series b/debian/patches/series
index 700e7da..4a935a3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ Allow-tox-to-use-locally-installed-packages.patch
 call-python-coverage.diff
 fix-tox-env-for-machine-installed-python-version.diff
 dont-install-deps.diff
+disable-intersphinx.diff