[Pkg-ganeti-devel] [ganeti] 01/04: Fix FTBFS with python-sphinx 1.2

[Apollon Oikonomopoulos]

This is an automated email from the git hooks/post-receive script.

apoikos-guest pushed a commit to branch master
in repository ganeti.

commit 979f8dd27ceff49cc5f57bf174a1baf60313bac1
Author: Apollon Oikonomopoulos <apoikos at gmail.com>
Date:   Fri Dec 27 10:38:52 2013 +0200

    Fix FTBFS with python-sphinx 1.2
---
 debian/changelog                           |  7 +++++++
 debian/patches/FTBFS_with_sphinx_1.2.patch | 16 ++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index f8a7b42..70ca5dd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+ganeti (2.9.2-2) unstable; urgency=medium
+
+  * Add patch fixing FTBFS with python-sphinx 1.2. Thanks to Andreas Moog!
+    (closes: #733181)
+
+ -- Apollon Oikonomopoulos <apoikos at gmail.com>  Fri, 27 Dec 2013 10:38:05 +0200
+
 ganeti (2.9.2-1) unstable; urgency=medium
 
   * New upstream bugfix release (see /usr/share/doc/ganeti/NEWS.gz)
diff --git a/debian/patches/FTBFS_with_sphinx_1.2.patch b/debian/patches/FTBFS_with_sphinx_1.2.patch
new file mode 100644
index 0000000..93c9da1
--- /dev/null
+++ b/debian/patches/FTBFS_with_sphinx_1.2.patch
@@ -0,0 +1,16 @@
+Author: Apollon Oikonomopoulos
+Description: Fix FTBFS with python-sphinx 1.2
+Bug: http://code.google.com/p/ganeti/issues/detail?id=502
+Forwarded: No
+Last-Update: 2013-12-27
+--- a/configure
++++ b/configure
+@@ -3075,7 +3075,7 @@
+ 
+   # Note: Character classes ([...]) need to be double quoted due to autoconf
+   # using m4
+-  elif ! echo "$sphinxver" | grep -q -E '^Sphinx[[:space:]]+v[1-9]\>'; then
++  elif ! echo "$sphinxver" | grep -q -E '^Sphinx[[:space:]]+(\(sphinx-build\)[[:space:]]+|v)[1-9]\>'; then
+     as_fn_error $? "Sphinx 1.0 or higher is required" "$LINENO" 5
+   fi
+ fi
diff --git a/debian/patches/series b/debian/patches/series
index e82830b..1304cea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ fix-startup-with-old-config.patch
 cfgupgrade12-remove-old-ssconf.patch
 0003-Disable-local-checks-during-build.patch
 pass-ghc-linker-flags.patch
+FTBFS_with_sphinx_1.2.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ganeti/ganeti.git