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

[Timo Aaltonen]

 debian/changelog                      |    7 +++++++
 debian/control                        |    2 --
 debian/patches/dont-install-deps.diff |   15 +++++++--------
 3 files changed, 14 insertions(+), 10 deletions(-)

New commits:
commit 67907d9c2454f66b1c7d9f360bf36dc259fb1c11
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Thu Mar 10 23:58:15 2016 +0200

    releasing package custodia version 0.1.0-4

diff --git a/debian/changelog b/debian/changelog
index ff46cac..010b35d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-custodia (0.1.0-4) UNRELEASED; urgency=medium
+custodia (0.1.0-4) unstable; urgency=medium
 
   * Don't run sphinx or python3 tests, they need network and have other
     issues.
 
- -- Timo Aaltonen <tjaalton at debian.org>  Thu, 10 Mar 2016 23:40:02 +0200
+ -- Timo Aaltonen <tjaalton at debian.org>  Thu, 10 Mar 2016 23:58:01 +0200
 
 custodia (0.1.0-3) unstable; urgency=medium
 

commit 9a07f7c0c525085b0d43284f67923d331813bd05
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Thu Mar 10 23:57:58 2016 +0200

    Don't run sphinx or python3 tests, they need network and have other issues.

diff --git a/debian/changelog b/debian/changelog
index fb1c0f4..ff46cac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+custodia (0.1.0-4) UNRELEASED; urgency=medium
+
+  * Don't run sphinx or python3 tests, they need network and have other
+    issues.
+
+ -- Timo Aaltonen <tjaalton at debian.org>  Thu, 10 Mar 2016 23:40:02 +0200
+
 custodia (0.1.0-3) unstable; urgency=medium
 
   * fix-tox-env-for-machine-installed-python-version.diff: Look harder
diff --git a/debian/control b/debian/control
index 2a14464..393e810 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,6 @@ Build-Depends:
  python-pytest,
  python-setuptools,
  python-six,
- python-sphinx,
  python3-all (>= 2.6.6-3),
  python3-coverage,
  python3-flake8,
@@ -26,7 +25,6 @@ Build-Depends:
  python3-pytest,
  python3-setuptools,
  python3-six,
- python3-sphinx,
  tox,
 Standards-Version: 3.9.6
 Homepage: https://github.com/simo5/custodia
diff --git a/debian/patches/dont-install-deps.diff b/debian/patches/dont-install-deps.diff
index 51b6a92..cbb6888 100644
--- a/debian/patches/dont-install-deps.diff
+++ b/debian/patches/dont-install-deps.diff
@@ -3,7 +3,7 @@
 @@ -1,14 +1,14 @@
  [tox]
 -envlist = py27,py34,doc,sphinx
-+envlist = py27,py34,sphinx
++envlist = py27
  
  [testenv]
  setenv =
@@ -46,12 +46,11 @@
  sitepackages = True
  commands =
      flake8 {posargs}
-@@ -52,7 +52,7 @@ basepython = python2.7
- sitepackages = True
+@@ -49,7 +49,6 @@ commands =
+ 
+ [testenv:sphinx]
+ basepython = python2.7
+-sitepackages = True
  changedir = docs/source
  deps =
--    sphinx < 1.3.0
-+#    sphinx < 1.3.0
- commands =
-     sphinx-build -v -W -b html -d {envtmpdir}/doctrees . {envtmpdir}/html
- 
+     sphinx < 1.3.0