[opencv] 01/01: Drop unused patch file

Mattia Rizzolo mattia at debian.org
Fri Oct 13 19:52:36 UTC 2017


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

mattia pushed a commit to branch master
in repository opencv.

commit 621f4fcc2c75c02e30504fff7a14dab88f2151d1
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Fri Oct 13 21:50:46 2017 +0200

    Drop unused patch file
    
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 .../patches/Don-t-check-sphinx-build-version.patch | 34 ----------------------
 1 file changed, 34 deletions(-)

diff --git a/debian/patches/Don-t-check-sphinx-build-version.patch b/debian/patches/Don-t-check-sphinx-build-version.patch
deleted file mode 100644
index 4a93cf2..0000000
--- a/debian/patches/Don-t-check-sphinx-build-version.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From: Simon McVittie <smcv at debian.org>
-Date: Wed, 19 Aug 2015 21:27:54 +0100
-Subject: Don't check sphinx-build version
-
-It isn't really used for anything anyway, and sphinx-build's
-output changed in 1.3 (<https://bugs.debian.org/792715>) resulting
-in FTBFS.
-
-Forwarded: not-needed, upstream have removed the Sphinx docs
----
- cmake/OpenCVDetectPython.cmake | 8 +-------
- 1 file changed, 1 insertion(+), 7 deletions(-)
-
-diff --git a/cmake/OpenCVDetectPython.cmake b/cmake/OpenCVDetectPython.cmake
-index d02b759..acd69e8 100644
---- a/cmake/OpenCVDetectPython.cmake
-+++ b/cmake/OpenCVDetectPython.cmake
-@@ -120,15 +120,9 @@ if(PYTHON_EXECUTABLE)
-   if(BUILD_DOCS)
-     find_host_program(SPHINX_BUILD sphinx-build)
-     if(SPHINX_BUILD)
--        execute_process(COMMAND "${SPHINX_BUILD}"
--                        OUTPUT_QUIET
--                        ERROR_VARIABLE SPHINX_OUTPUT
--                        OUTPUT_STRIP_TRAILING_WHITESPACE)
--        if(SPHINX_OUTPUT MATCHES "Sphinx v([0-9][^ \n]*)")
--          set(SPHINX_VERSION "${CMAKE_MATCH_1}")
-+          set(SPHINX_VERSION "(unknown version)")
-           set(HAVE_SPHINX 1)
-           message(STATUS "Found Sphinx ${SPHINX_VERSION}: ${SPHINX_BUILD}")
--        endif()
-     endif()
-   endif(BUILD_DOCS)
- endif(PYTHON_EXECUTABLE)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/opencv.git



More information about the debian-science-commits mailing list