[opencv] 04/05: for that mathjax patch, use a name that has been accepted upstream

[Mattia Rizzolo]

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

mattia pushed a commit to branch sid
in repository opencv.

commit 11b3c28074b6c50d91b3efe20cb1130a31ac6ee3
Author: Mattia Rizzolo <mattia at debian.org>
Date:   Tue Oct 17 16:19:19 2017 +0200

    for that mathjax patch, use a name that has been accepted upstream
    
    Gbp-Dch: Ignore
    Signed-off-by: Mattia Rizzolo <mattia at debian.org>
---
 debian/patches/mathjax | 4 ++--
 debian/rules           | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/patches/mathjax b/debian/patches/mathjax
index 5ef643d..e96b265 100644
--- a/debian/patches/mathjax
+++ b/debian/patches/mathjax
@@ -8,7 +8,7 @@ Forwarded: https://github.com/opencv/opencv/pull/9866
  USE_MATHJAX            = YES
  MATHJAX_FORMAT         = HTML-CSS
 -MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
-+MATHJAX_RELPATH        = @OCV_MATHJAX_RELPATH@
++MATHJAX_RELPATH        = @OPENCV_MATHJAX_RELPATH@
  MATHJAX_EXTENSIONS     = TeX/AMSmath TeX/AMSsymbols
  MATHJAX_CODEFILE       = @CMAKE_CURRENT_SOURCE_DIR@/mymath.js
  SEARCHENGINE           = YES
@@ -18,7 +18,7 @@ Forwarded: https://github.com/opencv/opencv/pull/9866
    list(APPEND blacklist "ts" "java" "python2" "python3" "world" "contrib_world")
    unset(CMAKE_DOXYGEN_TUTORIAL_CONTRIB_ROOT)
  
-+  set(OCV_MATHJAX_RELPATH "http://cdn.mathjax.org/mathjax/latest" CACHE STRING "URI to a MathJax installation")
++  set(OPENCV_MATHJAX_RELPATH "http://cdn.mathjax.org/mathjax/latest" CACHE STRING "URI to a MathJax installation")
 +
    # gathering headers
    set(paths_include)
diff --git a/debian/rules b/debian/rules
index 9b973b2..0b384f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,7 @@ CMAKE_FLAGS = \
 	-DCMAKE_C_FLAGS_RELEASE="$(CFLAGS)" \
 	-DCMAKE_CXX_FLAGS_RELEASE="$(CXXFLAGS)" \
 	-DCMAKE_EXE_LINKER_FLAGS_RELEASE="$(LDFLAGS)" \
-	-DOCV_MATHJAX_RELPATH=/usr/share/javascript/mathjax/ \
+	-DOPENCV_MATHJAX_RELPATH=/usr/share/javascript/mathjax/ \
 	-DCMAKE_BUILD_TYPE=Release	\
 	-DBUILD_EXAMPLES=ON	\
 	-DINSTALL_C_EXAMPLES=ON	\

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