[clfft] 09/12: d/p: break doxygen patch down to more specific set of patches
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Tue Aug 4 11:06:00 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 clfft.
commit fc49e4fbeda1dae0752024b82243c0cbbe664c02
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Tue Aug 4 09:47:44 2015 +0100
d/p: break doxygen patch down to more specific set of patches
---
debian/changelog | 4 +
debian/patches/fix-client-name.patch | 18 ---
debian/patches/fix-cmake-config-install.patch | 126 ---------------------
...utput-directory.patch => fix-docs-output.patch} | 2 +
debian/patches/fix-doxygen-settings.patch | 34 ------
debian/patches/fix-libdl-linkage.patch | 34 ------
debian/patches/reproducible-build.patch | 17 +++
debian/patches/series | 8 +-
debian/patches/use-system-mathjax.patch | 16 +++
9 files changed, 42 insertions(+), 217 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c229c46..fd4d5ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,10 @@
clfft (2.6-1) UNRELEASED; urgency=medium
* New upstream release.
+ * Break fix-doxygen-settings.patch down to more specific patches:
+ - fix-docs-output.patch,
+ - use-system-mathjax.patch,
+ - reproducible-build.patch.
-- Ghislain Antony Vaillant <ghisvail at gmail.com> Thu, 30 Jul 2015 19:09:24 +0100
diff --git a/debian/patches/fix-client-name.patch b/debian/patches/fix-client-name.patch
deleted file mode 100644
index af80d0a..0000000
--- a/debian/patches/fix-client-name.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: fix client executable name
-Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Forwarded: not-needed
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/client/CMakeLists.txt
-+++ b/src/client/CMakeLists.txt
-@@ -47,8 +47,8 @@
-
- target_link_libraries( Client clFFT ${Boost_LIBRARIES} ${OPENCL_LIBRARIES} ${DL_LIB} )
-
--set_target_properties( Client PROPERTIES VERSION ${CLFFT_VERSION} )
--set_target_properties( Client PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" )
-+#set_target_properties( Client PROPERTIES VERSION ${CLFFT_VERSION} )
-+set_target_properties( Client PROPERTIES RUNTIME_OUTPUT_DIRECTORY "${PROJECT_BINARY_DIR}/staging" OUTPUT_NAME clFFT-client)
-
- # CPack configuration; include the executable into the package
- install( TARGETS Client
diff --git a/debian/patches/fix-cmake-config-install.patch b/debian/patches/fix-cmake-config-install.patch
deleted file mode 100644
index aff8290..0000000
--- a/debian/patches/fix-cmake-config-install.patch
+++ /dev/null
@@ -1,126 +0,0 @@
-Description: install missing cmake config module
-Author: <kent.knox at amd>
-Origin: upstream
-Forwarded: not-needed
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -283,6 +283,29 @@ else( )
- message( "GoogleTest unit tests will NOT be built" )
- endif( )
-
-+if( BUILD_EXAMPLES )
-+ add_subdirectory( examples )
-+endif()
-+
-+if(WIN32)
-+ set(destdir CMake)
-+else()
-+ set(destdir share/clFFT)
-+endif()
-+string(REGEX REPLACE "[^/]+" ".." reldir "${destdir}")
-+configure_file(
-+ ${CMAKE_CURRENT_SOURCE_DIR}/clFFTConfigVersion.cmake.in
-+ ${CMAKE_CURRENT_BINARY_DIR}/clFFTConfigVersion.cmake
-+ @ONLY)
-+configure_file(
-+ ${CMAKE_CURRENT_SOURCE_DIR}/clFFTConfig.cmake.in
-+ ${CMAKE_CURRENT_BINARY_DIR}/clFFTConfig.cmake
-+ @ONLY)
-+install(EXPORT Library DESTINATION ${destdir} FILE clFFTTargets.cmake)
-+install(FILES ${CMAKE_CURRENT_BINARY_DIR}/clFFTConfigVersion.cmake
-+ ${CMAKE_CURRENT_BINARY_DIR}/clFFTConfig.cmake
-+ DESTINATION ${destdir})
-+
- # The following code is setting variables to control the behavior of CPack to generate our
- if( WIN32 )
- set( CPACK_SOURCE_GENERATOR "ZIP" )
-diff --git a/src/clFFTConfig.cmake.in b/src/clFFTConfig.cmake.in
-new file mode 100644
-index 0000000..5b58c35
---- /dev/null
-+++ b/src/clFFTConfig.cmake.in
-@@ -0,0 +1,3 @@
-+include(${CMAKE_CURRENT_LIST_DIR}/clFFTTargets.cmake)
-+get_filename_component(CLFFT_INCLUDE_DIRS ${CMAKE_CURRENT_LIST_DIR}/@reldir@/include ABSOLUTE)
-+set(CLFFT_LIBRARIES clFFT)
-diff --git a/src/clFFTConfigVersion.cmake.in b/src/clFFTConfigVersion.cmake.in
-new file mode 100644
-index 0000000..e358473
---- /dev/null
-+++ b/src/clFFTConfigVersion.cmake.in
-@@ -0,0 +1,46 @@
-+# This is a basic version file for the Config-mode of find_package().
-+# It is used by write_basic_package_version_file() as input file for configure_file()
-+# to create a version-file which can be installed along a config.cmake file.
-+#
-+# The created file sets PACKAGE_VERSION_EXACT if the current version string and
-+# the requested version string are exactly the same and it sets
-+# PACKAGE_VERSION_COMPATIBLE if the current version is >= requested version,
-+# but only if the requested major version is the same as the current one.
-+# The variable CLFFT_VERSION must be set before calling configure_file().
-+
-+
-+set(PACKAGE_VERSION "@CLFFT_VERSION@")
-+
-+if("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}" )
-+ set(PACKAGE_VERSION_COMPATIBLE FALSE)
-+else()
-+
-+ if("@CLFFT_VERSION@" MATCHES "^([0-9]+)\\.")
-+ set(CLFFT_VERSION_MAJOR "${CMAKE_MATCH_1}")
-+ else()
-+ set(CLFFT_VERSION_MAJOR "@CLFFT_VERSION@")
-+ endif()
-+
-+ if("${PACKAGE_FIND_VERSION_MAJOR}" STREQUAL "${CLFFT_VERSION_MAJOR}")
-+ set(PACKAGE_VERSION_COMPATIBLE TRUE)
-+ else()
-+ set(PACKAGE_VERSION_COMPATIBLE FALSE)
-+ endif()
-+
-+ if( "${PACKAGE_FIND_VERSION}" STREQUAL "${PACKAGE_VERSION}")
-+ set(PACKAGE_VERSION_EXACT TRUE)
-+ endif()
-+endif()
-+
-+
-+# if the installed or the using project don't have CMAKE_SIZEOF_VOID_P set, ignore it:
-+if("${CMAKE_SIZEOF_VOID_P}" STREQUAL "" OR "@CMAKE_SIZEOF_VOID_P@" STREQUAL "")
-+ return()
-+endif()
-+
-+# check that the installed version has the same 32/64bit-ness as the one which is currently searching:
-+if(NOT "${CMAKE_SIZEOF_VOID_P}" STREQUAL "@CMAKE_SIZEOF_VOID_P@")
-+ math(EXPR installedBits "@CMAKE_SIZEOF_VOID_P@ * 8")
-+ set(PACKAGE_VERSION "${PACKAGE_VERSION} (${installedBits}bit)")
-+ set(PACKAGE_VERSION_UNSUITABLE TRUE)
-+endif()
-diff --git a/src/library/CMakeLists.txt b/src/library/CMakeLists.txt
-index 63ac0f9..0d400d8 100644
---- a/src/library/CMakeLists.txt
-+++ b/src/library/CMakeLists.txt
-@@ -95,6 +95,7 @@ endif( )
-
- # CPack configuration; include the executable into the package
- install( TARGETS clFFT
-+ EXPORT Library
- RUNTIME DESTINATION bin${SUFFIX_BIN}
- LIBRARY DESTINATION lib${SUFFIX_LIB}
- ARCHIVE DESTINATION lib${SUFFIX_LIB}/import
-diff --git a/src/statTimer/CMakeLists.txt b/src/statTimer/CMakeLists.txt
-index a635bf1..3dc026f 100644
---- a/src/statTimer/CMakeLists.txt
-+++ b/src/statTimer/CMakeLists.txt
-@@ -80,6 +80,7 @@ endif( )
-
- # CPack configuration; include the executable into the package
- install( TARGETS StatTimer
-+ EXPORT Library
- RUNTIME DESTINATION bin${SUFFIX_BIN}
- LIBRARY DESTINATION lib${SUFFIX_LIB}
- ARCHIVE DESTINATION lib${SUFFIX_LIB}/import
---
-2.1.4
-
diff --git a/debian/patches/fix-docs-output-directory.patch b/debian/patches/fix-docs-output.patch
similarity index 85%
rename from debian/patches/fix-docs-output-directory.patch
rename to debian/patches/fix-docs-output.patch
index 26e30bc..5875eff 100644
--- a/debian/patches/fix-docs-output-directory.patch
+++ b/debian/patches/fix-docs-output.patch
@@ -1,4 +1,6 @@
Description: fix output directory for documentation
+ Use default doxygen directory, i.e. under docs/html, rather than the
+ inappropriate path set by upstream.
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Forwarded: no
---
diff --git a/debian/patches/fix-doxygen-settings.patch b/debian/patches/fix-doxygen-settings.patch
deleted file mode 100644
index 6b269f7..0000000
--- a/debian/patches/fix-doxygen-settings.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: fix Doxygen documentation settings for Debian
-Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Forwarded: not-needed
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/doc/clFFT.doxy
-+++ b/doc/clFFT.doxy
-@@ -52,7 +52,7 @@
- # If a relative path is entered, it will be relative to the location
- # where doxygen was started. If left blank the current directory will be used.
-
--OUTPUT_DIRECTORY = ../../bin/clFFT.doxy
-+OUTPUT_DIRECTORY =
-
- # If the CREATE_SUBDIRS tag is set to YES, then doxygen will create
- # 4096 sub-directories (in 2 levels) under the output directory of each output
-@@ -966,7 +966,7 @@
- # 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
-@@ -1215,7 +1215,7 @@
- # installing MathJax. However, it is strongly recommended to install a local
- # copy of MathJax from http://www.mathjax.org before deployment.
-
--MATHJAX_RELPATH = http://www.mathjax.org/mathjax
-+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/debian/patches/fix-libdl-linkage.patch b/debian/patches/fix-libdl-linkage.patch
deleted file mode 100644
index f955726..0000000
--- a/debian/patches/fix-libdl-linkage.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: fix missing linkage with libdl.
- Add missing linkage with libdl in libclfft.
-Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
-Forwarded: no
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/src/library/CMakeLists.txt
-+++ b/src/library/CMakeLists.txt
-@@ -46,6 +46,16 @@
-
- set( clFFT.Files ${clFFT.Source} ${clFFT.Headers} )
-
-+set( DL_LIB "" )
-+if( WIN32 )
-+ add_definitions( "/D_CONSOLE" )
-+elseif( APPLE )
-+ set( CMAKE_CXX_FLAGS "-std=c++11 -stdlib=libc++ ${CMAKE_CXX_FLAGS}" )
-+else( )
-+ # To use the dlopen() and dlclose() functions, we should link with libdl
-+ set( DL_LIB "-ldl" )
-+endif( )
-+
- # For a rainy day, add pre-compiled header support
- #if( MSVC )
- # if (USE_MSVC_PCH)
-@@ -79,7 +89,7 @@
- else()
- add_library( clFFT STATIC ${clFFT.Files} )
- endif()
--target_link_libraries( clFFT ${OPENCL_LIBRARIES} )
-+target_link_libraries( clFFT ${OPENCL_LIBRARIES} ${DL_LIB} )
-
- set_target_properties( clFFT PROPERTIES VERSION ${CLFFT_VERSION} )
- set_target_properties( clFFT PROPERTIES SOVERSION ${CLFFT_SOVERSION} )
diff --git a/debian/patches/reproducible-build.patch b/debian/patches/reproducible-build.patch
new file mode 100644
index 0000000..e40dc5f
--- /dev/null
+++ b/debian/patches/reproducible-build.patch
@@ -0,0 +1,17 @@
+Description: make package build reproducible
+ By disabling the HTML timestamp setting in Doxygen.
+Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Forwarded: not-needed
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/docs/clFFT.doxy
++++ b/docs/clFFT.doxy
+@@ -1154,7 +1154,7 @@
+ # The default value is: YES.
+ # This tag requires that the tag GENERATE_HTML is set to YES.
+
+-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/series b/debian/patches/series
index e79b1f8..002ffb9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,8 +1,6 @@
-#fix-cmake-config-install.patch
-#fix-doxygen-settings.patch
-#fix-client-name.patch
debian-enable-multiarch.patch
disable-multilib-cflags.patch
-#fix-libdl-linkage.patch
-fix-docs-output-directory.patch
fix-client-no-symlink.patch
+fix-docs-output.patch
+use-system-mathjax.patch
+reproducible-build.patch
diff --git a/debian/patches/use-system-mathjax.patch b/debian/patches/use-system-mathjax.patch
new file mode 100644
index 0000000..c8dd599
--- /dev/null
+++ b/debian/patches/use-system-mathjax.patch
@@ -0,0 +1,16 @@
+Description: use system mathjax instead of remote
+Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Forwarded: not-needed
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/docs/clFFT.doxy
++++ b/docs/clFFT.doxy
+@@ -1469,7 +1469,7 @@
+ # The default value is: http://cdn.mathjax.org/mathjax/latest.
+ # This tag requires that the tag USE_MATHJAX is set to YES.
+
+-MATHJAX_RELPATH = https://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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/clfft.git
More information about the debian-science-commits
mailing list