[Pkg-ganeti-devel] [ganeti] 05/07: Drop debian/patches/FTBFS_with_sphinx_1.2.patch

[Apollon Oikonomopoulos]

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

apoikos pushed a commit to branch master
in repository ganeti.

commit d9bc393fad8cab9e50e9aa2cd997e4c01a2fec00
Author: Apollon Oikonomopoulos <apoikos at debian.org>
Date:   Tue Jan 28 11:50:36 2014 +0200

    Drop debian/patches/FTBFS_with_sphinx_1.2.patch
    
    It has already been merged upstream.
---
 debian/patches/FTBFS_with_sphinx_1.2.patch | 16 ----------------
 debian/patches/series                      |  1 -
 2 files changed, 17 deletions(-)

diff --git a/debian/patches/FTBFS_with_sphinx_1.2.patch b/debian/patches/FTBFS_with_sphinx_1.2.patch
deleted file mode 100644
index 93c9da1..0000000
--- a/debian/patches/FTBFS_with_sphinx_1.2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-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 1304cea..e82830b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@ 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