[forge] 03/14: Initialize git-dpm

[Ghislain Vaillant]

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

ghisvail-guest pushed a commit to branch master
in repository forge.

commit 9cb75e5f601ee96b238b3ae857dffe5e3557206d
Merge: 62ee5f7 623f75e
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Wed Dec 21 17:38:54 2016 +0000

    Initialize git-dpm

 debian/.git-dpm                                                   | 8 ++++++++
 .../{Use-system-MathJax.patch => 0001-Use-system-MathJax.patch}   | 1 +
 ...ch => 0002-Fix-build-of-examples-with-the-system-cl2hpp.patch} | 1 +
 debian/patches/series                                             | 4 ++--
 docs/doxygen.mk                                                   | 2 +-
 examples/CMakeLists.txt                                           | 8 ++++++--
 6 files changed, 19 insertions(+), 5 deletions(-)

diff --cc debian/.git-dpm
index 0000000,0000000..08f9b8f
new file mode 100644
--- /dev/null
+++ b/debian/.git-dpm
@@@ -1,0 -1,0 +1,8 @@@
++# see git-dpm(1) from git-dpm package
++623f75eea36c34d4092f8f34242cc1431e09536c
++623f75eea36c34d4092f8f34242cc1431e09536c
++5a0b1e32150fb3501b34f23323007a30943f78d6
++5a0b1e32150fb3501b34f23323007a30943f78d6
++forge_0.9.0.orig.tar.gz
++c9739204a55e92aeab7dd53dea56007e07d388d7
++798695
diff --cc debian/patches/0001-Use-system-MathJax.patch
index 7676148,0000000..1c3ca14
mode 100644,000000..100644
--- a/debian/patches/0001-Use-system-MathJax.patch
+++ b/debian/patches/0001-Use-system-MathJax.patch
@@@ -1,21 -1,0 +1,22 @@@
++From 881c8d72bec681e5f9f9c62c3b06cd4a36f0d85b Mon Sep 17 00:00:00 2001
 +From: Ghislain Antony Vaillant <ghisvail at gmail.com>
 +Date: Wed, 24 Aug 2016 11:23:13 +0100
 +Subject: Use system MathJax.
 +
 +---
 + docs/doxygen.mk | 2 +-
 + 1 file changed, 1 insertion(+), 1 deletion(-)
 +
 +diff --git a/docs/doxygen.mk b/docs/doxygen.mk
 +index 44a5e8a..4f2ddf0 100644
 +--- a/docs/doxygen.mk
 ++++ b/docs/doxygen.mk
 +@@ -1452,7 +1452,7 @@ MATHJAX_FORMAT         = HTML-CSS
 + # The default value is: http://cdn.mathjax.org/mathjax/latest.
 + # This tag requires that the tag USE_MATHJAX is set to YES.
 + 
 +-MATHJAX_RELPATH        = http://cdn.mathjax.org/mathjax/latest
 ++MATHJAX_RELPATH        = /usr/share/javascript/mathjax
 + 
 + # The MATHJAX_EXTENSIONS tag can be used to specify one or more MathJax
 + # extension names that should be enabled during MathJax rendering. For example
diff --cc debian/patches/0002-Fix-build-of-examples-with-the-system-cl2hpp.patch
index 0d4ebaa,0000000..4529189
mode 100644,000000..100644
--- a/debian/patches/0002-Fix-build-of-examples-with-the-system-cl2hpp.patch
+++ b/debian/patches/0002-Fix-build-of-examples-with-the-system-cl2hpp.patch
@@@ -1,34 -1,0 +1,35 @@@
++From 623f75eea36c34d4092f8f34242cc1431e09536c Mon Sep 17 00:00:00 2001
 +From: Ghislain Antony Vaillant <ghisvail at gmail.com>
 +Date: Tue, 6 Dec 2016 18:47:56 +0000
 +Subject: Fix build of examples with the system cl2hpp.
 +
 +---
 + examples/CMakeLists.txt | 8 ++++++--
 + 1 file changed, 6 insertions(+), 2 deletions(-)
 +
 +diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
 +index fc94a13..51cad0d 100644
 +--- a/examples/CMakeLists.txt
 ++++ b/examples/CMakeLists.txt
 +@@ -7,7 +7,9 @@ OPTION(BUILD_EXAMPLES_CUDA "Turn off/on building cuda examples" ON)
 + OPTION(BUILD_EXAMPLES_OPENCL "Turn off/on building opencl examples" ON)
 + OPTION(USE_SYSTEM_CL2HPP "Use cl2.hpp header installed on the system" OFF)
 + 
 +-INCLUDE(build_cl2hpp)
 ++IF(NOT USE_SYSTEM_CL2HPP)
 ++    INCLUDE(build_cl2hpp)
 ++ENDIF()
 + 
 + MACRO(BUILD_EXAMPLE EX_NAME EX_SRC COMPUTE_NAME FG_LIBS COMPUTE_LIBS)
 +     IF(${COMPUTE_NAME} STREQUAL "cuda")
 +@@ -22,7 +24,9 @@ MACRO(BUILD_EXAMPLE EX_NAME EX_SRC COMPUTE_NAME FG_LIBS COMPUTE_LIBS)
 +         RUNTIME_OUTPUT_DIRECTORY ${DIR_NAME}
 +         FOLDER "Examples/${COMPUTE_NAME}")
 +     IF(${COMPUTE_NAME} STREQUAL "opencl")
 +-        ADD_DEPENDENCIES(example_${EX_NAME}_${COMPUTE_NAME} cl2hpp)
 ++        IF(NOT USE_SYSTEM_CL2HPP)
 ++            ADD_DEPENDENCIES(example_${EX_NAME}_${COMPUTE_NAME} cl2hpp)
 ++        ENDIF()
 +     ENDIF()
 + ENDMACRO()
 + 
diff --cc debian/patches/series
index d4e15b3,0000000..147eef7
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,2 -1,0 +1,2 @@@
- Use-system-MathJax.patch
- Fix-build-of-examples-with-the-system-cl2hpp.patch
++0001-Use-system-MathJax.patch
++0002-Fix-build-of-examples-with-the-system-cl2hpp.patch

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