[shark] 07/14: Add patch queue.
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Thu Nov 26 15:38:37 UTC 2015
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch debian/sid
in repository shark.
commit 1ae89acf246a427cb4fc3b63ae8923abb08cf014
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Mon Nov 23 18:20:20 2015 +0000
Add patch queue.
---
debian/patches/Disable-HTML-timestamps.patch | 21 +++++++++
debian/patches/Disable-doxylink.patch | 30 ++++++++++++
.../Disable-override-of-CMAKE_BUILD_TYPE.patch | 22 +++++++++
debian/patches/Fix-CMake-package-creation.patch | 48 +++++++++++++++++++
.../patches/Fix-documentation-install-target.patch | 39 +++++++++++++++
debian/patches/Fix-examples-install-target.patch | 32 +++++++++++++
debian/patches/Fix-library-install-target.patch | 21 +++++++++
debian/patches/Fix-typo-in-tutorials.patch | 21 +++++++++
debian/patches/Set-soversion-to-zero.patch | 21 +++++++++
debian/patches/Use-GNUInstallDirs.patch | 55 ++++++++++++++++++++++
debian/patches/Use-system-MathJax.patch | 54 +++++++++++++++++++++
debian/patches/series | 11 +++++
12 files changed, 375 insertions(+)
diff --git a/debian/patches/Disable-HTML-timestamps.patch b/debian/patches/Disable-HTML-timestamps.patch
new file mode 100644
index 0000000..68cf4a1
--- /dev/null
+++ b/debian/patches/Disable-HTML-timestamps.patch
@@ -0,0 +1,21 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Mon, 23 Nov 2015 23:11:15 +0000
+Subject: Disable HTML timestamps.
+
+---
+ doc/Shark.dox.in | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/Shark.dox.in b/doc/Shark.dox.in
+index d754567..0657ed0 100644
+--- a/doc/Shark.dox.in
++++ b/doc/Shark.dox.in
+@@ -951,7 +951,7 @@ HTML_COLORSTYLE_GAMMA = 80
+ # page will contain the date and time when the page was generated. Setting
+ # this to NO can help when comparing the output of multiple runs.
+
+-HTML_TIMESTAMP = YES
++HTML_TIMESTAMP = NO
+
+ # If the HTML_DYNAMIC_SECTIONS tag is set to YES then the generated HTML
+ # documentation will contain sections that can be hidden and shown after the
diff --git a/debian/patches/Disable-doxylink.patch b/debian/patches/Disable-doxylink.patch
new file mode 100644
index 0000000..d22361e
--- /dev/null
+++ b/debian/patches/Disable-doxylink.patch
@@ -0,0 +1,30 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Mon, 23 Nov 2015 23:14:18 +0000
+Subject: Disable doxylink.
+
+---
+ doc/sphinx_pages/conf.py.in | 7 +------
+ 1 file changed, 1 insertion(+), 6 deletions(-)
+
+diff --git a/doc/sphinx_pages/conf.py.in b/doc/sphinx_pages/conf.py.in
+index f5c0721..dcbfc99 100644
+--- a/doc/sphinx_pages/conf.py.in
++++ b/doc/sphinx_pages/conf.py.in
+@@ -8,16 +8,11 @@ import sys, os, glob
+
+ # Add any Sphinx extension module names here, as strings. They can be extensions
+ # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+-extensions = ['sphinx.ext.mathjax', 'sphinx.ext.todo', 'sphinxcontrib.doxylink'] #using mathjax
++extensions = ['sphinx.ext.mathjax', 'sphinx.ext.todo'] #using mathjax
+ mathjax_path = 'MathJax.js'
+
+ todo_include_todos = True
+
+-#set up doxylink tag file
+-print 'current working directory', os.path.abspath(os.path.curdir)
+-doxylink = {
+- 'doxy' : (os.path.abspath('@CMAKE_CURRENT_SOURCE_DIR@/doxygen_pages/tag_files/all.tag'), '../../../doxygen_pages/html/')
+-}
+
+
+
diff --git a/debian/patches/Disable-override-of-CMAKE_BUILD_TYPE.patch b/debian/patches/Disable-override-of-CMAKE_BUILD_TYPE.patch
new file mode 100644
index 0000000..b400cf7
--- /dev/null
+++ b/debian/patches/Disable-override-of-CMAKE_BUILD_TYPE.patch
@@ -0,0 +1,22 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Mon, 23 Nov 2015 18:18:41 +0000
+Subject: Disable override of CMAKE_BUILD_TYPE.
+
+---
+ CMakeLists.txt | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9f4d4ef..7dac309 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -119,8 +119,7 @@ if(NOT CMAKE_BUILD_TYPE)
+ set(CMAKE_BUILD_TYPE "Release")
+ endif()
+
+-string( TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE )
+-if(${CMAKE_BUILD_TYPE} MATCHES "debug")
++if(${CMAKE_BUILD_TYPE} MATCHES "Debug")
+ #we want to be warned in debug mode
+ if(UNIX)
+ # if(CMAKE_COMPILER_IS_GNUCC)
diff --git a/debian/patches/Fix-CMake-package-creation.patch b/debian/patches/Fix-CMake-package-creation.patch
new file mode 100644
index 0000000..c23f80d
--- /dev/null
+++ b/debian/patches/Fix-CMake-package-creation.patch
@@ -0,0 +1,48 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Tue, 24 Nov 2015 19:46:29 +0000
+Subject: Fix CMake package creation.
+
+---
+ CMakeLists.txt | 22 +++++-----------------
+ 1 file changed, 5 insertions(+), 17 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 7e54b6d..9f4d4ef 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -383,7 +383,7 @@ endif()
+ ###################################################################
+ # CPACK PACKAGING
+ ###################################################################
+-set(INSTALL_CMAKE_DIR lib/cmake/Shark/)
++set(INSTALL_CMAKE_DIR ${SHARK_INSTALL_LIB_DIR}/cmake/Shark)
+
+ # Add all targets to the build-tree export set
+ export(TARGETS shark SharkVersion FILE "${shark_BINARY_DIR}/SharkTargets.cmake")
+@@ -399,22 +399,10 @@ set(SHARK_INCLUDE_DIRS "${PROJECT_SOURCE_DIR}/include" "${PROJECT_BINARY_DIR}/in
+ configure_file(SharkConfig.cmake.in "${PROJECT_BINARY_DIR}/SharkConfig.cmake")
+ configure_file(SharkConfigVersion.cmake.in "${PROJECT_BINARY_DIR}/SharkConfigVersion.cmake")
+
+-# Configure the SharkConfig.cmake for the install tree
+-set(SHARK_CONFIG_CODE "
+- # Compute the installation prefix from this SharkConfig.cmake file location.
+- get_filename_component(SHARK_INSTALL_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)")
+-
+-# Construct the proper number of get_filename_component(... PATH)
+-# calls to compute the installation prefix.
+-string(REGEX REPLACE "/" ";" _count "${INSTALL_CMAKE_DIR}")
+-foreach(p ${_count})
+- set(SHARK_CONFIG_CODE "${SHARK_CONFIG_CODE}
+- get_filename_component(SHARK_INSTALL_PREFIX \"\${SHARK_INSTALL_PREFIX}\" DIRECTORY)")
+-endforeach()
+-set(SHARK_CONFIG_CODE "${SHARK_CONFIG_CODE}")
+-
+-set(SHARK_USE_FILE "\${SHARK_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR}UseShark.cmake")
+-set(SHARK_TARGETS_FILE "\${SHARK_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR}SharkTargets.cmake")
++set(SHARK_CONFIG_CODE "set(SHARK_INSTALL_PREFIX ${CMAKE_INSTALL_PREFIX})")
++
++set(SHARK_USE_FILE "\${SHARK_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR}/UseShark.cmake")
++set(SHARK_TARGETS_FILE "\${SHARK_INSTALL_PREFIX}/${INSTALL_CMAKE_DIR}/SharkTargets.cmake")
+ set(SHARK_LIBRARIES ${LINK_LIBRARIES} shark)
+ set(SHARK_LIBRARY_DIRS "\${SHARK_INSTALL_PREFIX}/lib")
+ set(SHARK_INCLUDE_DIRS "\${SHARK_INSTALL_PREFIX}/${SHARK_INSTALL_INCLUDE_DIR}" "${Boost_INCLUDE_DIR}" ${EXTRA_INCLUDE_DIRECTORIES})
diff --git a/debian/patches/Fix-documentation-install-target.patch b/debian/patches/Fix-documentation-install-target.patch
new file mode 100644
index 0000000..95dcaec
--- /dev/null
+++ b/debian/patches/Fix-documentation-install-target.patch
@@ -0,0 +1,39 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Tue, 24 Nov 2015 09:25:04 +0000
+Subject: Fix documentation install target.
+
+---
+ doc/CMakeLists.txt | 10 +++++-----
+ 1 file changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
+index 95ef9e4..66feb3c 100644
+--- a/doc/CMakeLists.txt
++++ b/doc/CMakeLists.txt
+@@ -49,21 +49,21 @@ OPTION( OPT_INSTALL_DOCUMENTATION "Install documentation." OFF )
+ IF( OPT_INSTALL_DOCUMENTATION )
+
+ INSTALL( FILES index.html
+- DESTINATION ${SHARK_INSTALL_DOC_DIR}
++ DESTINATION ${SHARK_INSTALL_DOC_DIR}/html
+ )
+
+ INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/doxygen_pages
+- DESTINATION ${SHARK_INSTALL_DOC_DIR}
++ DESTINATION ${SHARK_INSTALL_DOC_DIR}/html
+ PATTERN ".*" EXCLUDE
+ )
+
+ INSTALL( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/doxygen_pages/css
+- DESTINATION ${SHARK_INSTALL_DOC_DIR}/doxygen_pages
++ DESTINATION ${SHARK_INSTALL_DOC_DIR}/html/doxygen_pages
+ PATTERN ".*" EXCLUDE
+ )
+
+-INSTALL( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/sphinx_pages
+- DESTINATION ${SHARK_INSTALL_DOC_DIR}
++INSTALL( DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/sphinx_pages/build/html/
++ DESTINATION ${SHARK_INSTALL_DOC_DIR}/html/sphinx_pages
+ PATTERN ".*" EXCLUDE
+ )
+
diff --git a/debian/patches/Fix-examples-install-target.patch b/debian/patches/Fix-examples-install-target.patch
new file mode 100644
index 0000000..6f562e0
--- /dev/null
+++ b/debian/patches/Fix-examples-install-target.patch
@@ -0,0 +1,32 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Tue, 24 Nov 2015 09:49:43 +0000
+Subject: Fix examples install target.
+
+---
+ examples/CMakeLists.txt | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
+index ca18c5e..0eb0426 100755
+--- a/examples/CMakeLists.txt
++++ b/examples/CMakeLists.txt
+@@ -33,9 +33,9 @@ macro( SHARK_ADD_EXAMPLE TUT_SRC NAME COMPONENT )
+ set_target_properties( ${NAME} PROPERTIES FOLDER "Examples")
+
+ # Installation
+- install(TARGETS ${NAME}
+- RUNTIME DESTINATION ${SHARK_INSTALL_EXAMPLE_DIR}/${COMPONENT}/
+- COMPONENT EXAMPLES)
++ #install(TARGETS ${NAME}
++ # RUNTIME DESTINATION ${SHARK_INSTALL_EXAMPLE_DIR}/${COMPONENT}/
++ # COMPONENT EXAMPLES)
+
+ install(FILES ${EXAMPLES_CPP_DIR}/${TUT_SRC}.cpp
+ DESTINATION ${SHARK_INSTALL_EXAMPLE_DIR}/${COMPONENT})
+@@ -139,4 +139,4 @@ if( BUILD_EXAMPLES )
+ PATTERN ".*" EXCLUDE
+ )
+ endif()
+-
+\ No newline at end of file
++
diff --git a/debian/patches/Fix-library-install-target.patch b/debian/patches/Fix-library-install-target.patch
new file mode 100644
index 0000000..2e3dfa3
--- /dev/null
+++ b/debian/patches/Fix-library-install-target.patch
@@ -0,0 +1,21 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Tue, 24 Nov 2015 19:48:51 +0000
+Subject: Fix library install target.
+
+---
+ src/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 3c724a3..e0d12dc 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -54,7 +54,7 @@ install(TARGETS shark
+ ARCHIVE DESTINATION ${SHARK_INSTALL_LIB_DIR})
+
+ install(TARGETS SharkVersion
+- EXPORT SharkTargets
++ EXPORT SharkVersionTargets
+ RUNTIME DESTINATION ${SHARK_INSTALL_BIN_DIR})
+
+
diff --git a/debian/patches/Fix-typo-in-tutorials.patch b/debian/patches/Fix-typo-in-tutorials.patch
new file mode 100644
index 0000000..ba66d1b
--- /dev/null
+++ b/debian/patches/Fix-typo-in-tutorials.patch
@@ -0,0 +1,21 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Mon, 23 Nov 2015 23:01:45 +0000
+Subject: Fix typo in tutorials.
+
+---
+ doc/sphinx_pages/rest_sources/tutorials/concepts/misc/statistics.tut | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/doc/sphinx_pages/rest_sources/tutorials/concepts/misc/statistics.tut b/doc/sphinx_pages/rest_sources/tutorials/concepts/misc/statistics.tut
+index 499b274..2e817a6 100644
+--- a/doc/sphinx_pages/rest_sources/tutorials/concepts/misc/statistics.tut
++++ b/doc/sphinx_pages/rest_sources/tutorials/concepts/misc/statistics.tut
+@@ -35,7 +35,7 @@ and mark this input as missing. Finally, we insert the values into the table::
+ Next, we generate a :doxy:`Statistics` object and add the statistics, here
+ we use Mean, Variance and Percentage of Missing values::
+
+-..sharkcode<Statistics/Statistics.tpp,statisticse>
++..sharkcode<Statistics/Statistics.tpp,statistics>
+
+ We can output a summary as csv file to the console: ::
+
diff --git a/debian/patches/Set-soversion-to-zero.patch b/debian/patches/Set-soversion-to-zero.patch
new file mode 100644
index 0000000..15985e7
--- /dev/null
+++ b/debian/patches/Set-soversion-to-zero.patch
@@ -0,0 +1,21 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Tue, 24 Nov 2015 12:24:33 +0000
+Subject: Set soversion to zero.
+
+---
+ src/CMakeLists.txt | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 3c3c63e..3c724a3 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -45,7 +45,7 @@ target_link_libraries(SharkVersion shark)
+ # Install the library
+ set_target_properties( shark PROPERTIES
+ VERSION ${SHARK_VERSION_MAJOR}.${SHARK_VERSION_MINOR}.${SHARK_VERSION_PATCH}
+- SOVERSION ${SHARK_VERSION_MAJOR}.${SHARK_VERSION_MINOR}.${SHARK_VERSION_PATCH})
++ SOVERSION 0)
+
+ install(TARGETS shark
+ EXPORT SharkTargets
diff --git a/debian/patches/Use-GNUInstallDirs.patch b/debian/patches/Use-GNUInstallDirs.patch
new file mode 100644
index 0000000..9d4fd8c
--- /dev/null
+++ b/debian/patches/Use-GNUInstallDirs.patch
@@ -0,0 +1,55 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Mon, 23 Nov 2015 18:11:24 +0000
+Subject: Use GNUInstallDirs.
+
+---
+ CMakeLists.txt | 13 ++++++++-----
+ src/CMakeLists.txt | 8 ++++----
+ 2 files changed, 12 insertions(+), 9 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e5ab6fc..7e54b6d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -90,12 +90,15 @@ set( CPACK_DEBIAN_PACKAGE_MAINTAINER "Christian Igel <c.igel at ieee.org>" )
+ # Adjust include, lib, example and doc paths for installation
+ #####################################################################
+ if( UNIX )
+- set( SHARK_INSTALL_INCLUDE_DIR include/ )
+- set( SHARK_INSTALL_LIB_DIR lib/ )
+- set( SHARK_INSTALL_CONTRIB_DIR share/shark/contrib/ )
+- set( SHARK_INSTALL_EXAMPLE_DIR share/shark/examples/ )
+- set( SHARK_INSTALL_DOC_DIR share/shark/doc/ )
++ include(GNUInstallDirs)
++ set( SHARK_INSTALL_BIN_DIR ${CMAKE_INSTALL_BINDIR} CACHE STRING "" )
++ set( SHARK_INSTALL_INCLUDE_DIR ${CMAKE_INSTALL_INCLUDEDIR} CACHE STRING "" )
++ set( SHARK_INSTALL_LIB_DIR ${CMAKE_INSTALL_LIBDIR} CACHE STRING "" )
++ set( SHARK_INSTALL_CONTRIB_DIR ${CMAKE_INSTALL_DATADIR}/shark/contrib CACHE STRING "" )
++ set( SHARK_INSTALL_EXAMPLE_DIR ${CMAKE_INSTALL_DATADIR}/shark/examples CACHE STRING "" )
++ set( SHARK_INSTALL_DOC_DIR ${CMAKE_INSTALL_DATADIR}/shark/doc CACHE STRING "" )
+ else()
++ set( SHARK_INSTALL_BIN_DIR bin )
+ set( SHARK_INSTALL_INCLUDE_DIR include/shark/ )
+ set( SHARK_INSTALL_LIB_DIR lib/ )
+ set( SHARK_INSTALL_CONTRIB_DIR contrib/ )
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 206e3d2..3c3c63e 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -49,12 +49,12 @@ set_target_properties( shark PROPERTIES
+
+ install(TARGETS shark
+ EXPORT SharkTargets
+- RUNTIME DESTINATION bin
+- LIBRARY DESTINATION lib
+- ARCHIVE DESTINATION lib)
++ RUNTIME DESTINATION ${SHARK_INSTALL_BIN_DIR}
++ LIBRARY DESTINATION ${SHARK_INSTALL_LIB_DIR}
++ ARCHIVE DESTINATION ${SHARK_INSTALL_LIB_DIR})
+
+ install(TARGETS SharkVersion
+ EXPORT SharkTargets
+- RUNTIME DESTINATION bin)
++ RUNTIME DESTINATION ${SHARK_INSTALL_BIN_DIR})
+
+
diff --git a/debian/patches/Use-system-MathJax.patch b/debian/patches/Use-system-MathJax.patch
new file mode 100644
index 0000000..9836510
--- /dev/null
+++ b/debian/patches/Use-system-MathJax.patch
@@ -0,0 +1,54 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Mon, 23 Nov 2015 23:10:03 +0000
+Subject: Use system MathJax.
+
+---
+ doc/Shark.dox.in | 2 +-
+ doc/doxygen_pages/templates/header.html | 4 ++--
+ doc/sphinx_pages/conf.py.in | 3 +--
+ 3 files changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/doc/Shark.dox.in b/doc/Shark.dox.in
+index c08f5e5..d754567 100644
+--- a/doc/Shark.dox.in
++++ b/doc/Shark.dox.in
+@@ -1194,7 +1194,7 @@ USE_MATHJAX = YES
+ # However, it is strongly recommended to install a local
+ # copy of MathJax from http://www.mathjax.org before deployment.
+
+-MATHJAX_RELPATH = http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML
++MATHJAX_RELPATH = /usr/share/javascript/mathjax
+
+ # The MATHJAX_EXTENSIONS tag can be used to specify one or MathJax extension
+ # names that should be enabled during MathJax rendering.
+diff --git a/doc/doxygen_pages/templates/header.html b/doc/doxygen_pages/templates/header.html
+index 68c0704..fa7b510 100644
+--- a/doc/doxygen_pages/templates/header.html
++++ b/doc/doxygen_pages/templates/header.html
+@@ -12,10 +12,10 @@
+ <!-- ( nicked from https://groups.google.com/forum/#!msg/mathjax-users/HKA2lNqv-OQ/_Yv72L7MtjYJ ) -->
+ </script>
+ <script type="text/javascript"
+- src="http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML&delayStartupUntilConfig">
++ src="/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML&delayStartupUntilConfig">
+ </script>
+ <script type="text/javascript">
+- window.MathJax || document.write('<script src="../../../contrib/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML&delayStartupUntilConfig"><\/script>');
++ window.MathJax || document.write('<script src="/usr/share/javascript/mathjax/MathJax.js?config=TeX-AMS-MML_HTMLorMML&delayStartupUntilConfig"><\/script>');
+ <!--delay nicked from https://groups.google.com/forum/#!msg/mathjax-users/J-36V22-G9Q/AW3ncCbJzS8J -->
+ </script>
+ <script src="../../mlstyle.js"></script>
+diff --git a/doc/sphinx_pages/conf.py.in b/doc/sphinx_pages/conf.py.in
+index fd86bf9..f5c0721 100644
+--- a/doc/sphinx_pages/conf.py.in
++++ b/doc/sphinx_pages/conf.py.in
+@@ -9,8 +9,7 @@ import sys, os, glob
+ # Add any Sphinx extension module names here, as strings. They can be extensions
+ # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
+ extensions = ['sphinx.ext.mathjax', 'sphinx.ext.todo', 'sphinxcontrib.doxylink'] #using mathjax
+-mathjax_path = 'http://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML&delayStartupUntilConfig'
+-#delay nicked from https://groups.google.com/forum/#!msg/mathjax-users/J-36V22-G9Q/AW3ncCbJzS8J
++mathjax_path = 'MathJax.js'
+
+ todo_include_todos = True
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..50485a3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,11 @@
+Use-GNUInstallDirs.patch
+Fix-CMake-package-creation.patch
+Disable-override-of-CMAKE_BUILD_TYPE.patch
+Fix-typo-in-tutorials.patch
+Use-system-MathJax.patch
+Disable-HTML-timestamps.patch
+Disable-doxylink.patch
+Fix-documentation-install-target.patch
+Fix-examples-install-target.patch
+Set-soversion-to-zero.patch
+Fix-library-install-target.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/shark.git
More information about the debian-science-commits
mailing list