This is an automated email from the git hooks/post-receive script. nschloe-guest pushed a commit to branch split-c-f-cxx in repository netcdf.
commit b181e6707960e0ca8a49c1ee5f4dd91c204a48ac Author: Nico Schlömer <nico.schloe...@gmail.com> Date: Wed May 21 15:20:28 2014 +0200 documentation fixes --- debian/patches/doc.patch | 71 ++++++++++++++++++++++++++++++++++++ debian/patches/series | 2 +- debian/patches/set-soname-to-7.patch | 31 ---------------- debian/rules | 2 +- 4 files changed, 73 insertions(+), 33 deletions(-) diff --git a/debian/patches/doc.patch b/debian/patches/doc.patch new file mode 100644 index 0000000..cfae752 --- /dev/null +++ b/debian/patches/doc.patch @@ -0,0 +1,71 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 17ef1e1..6731a10 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -615,7 +615,7 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) + FIND_PACKAGE(HDF5 COMPONENTS C HL REQUIRED) + ENDIF() + ENDIF() +- ++ + IF(NOT MSVC) + # Depending on the install, either HDF5_hdf_library or + # HDF5_C_LIBRARY may be defined. We must check for either. +@@ -824,7 +824,7 @@ IF(ENABLE_FSYNC) + SET(USE_FSYNC ON) + ENDIF() + +-# Temporary ++# Temporary + OPTION (ENABLE_JNA "Enable jna bug fix code." OFF) + IF(ENABLE_JNA) + SET(JNA ON) +@@ -1157,11 +1157,6 @@ IF(MSVC) + INSTALL(DIRECTORY ${CMAKE_PREFIX_PATH} DESTINATION "deps" COMPONENT dependencies) + ENDIF() + +- +-IF(ENABLE_DOXYGEN) +- INSTALL(DIRECTORY man4 DESTINATION "." COMPONENT documentation) +-ENDIF() +- + # Subdirectory CMakeLists.txt files should specify their own + # 'install' files. + # Including 'CPack' kicks everything off. +diff --git a/man4/CMakeLists.txt b/man4/CMakeLists.txt +index 205ac99..48e8527 100644 +--- a/man4/CMakeLists.txt ++++ b/man4/CMakeLists.txt +@@ -11,10 +11,10 @@ IF(BUILD_DOCS) + IF(DOXYGEN_FOUND) + FILE(GLOB COPY_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.html ${CMAKE_CURRENT_SOURCE_DIR}/images ${CMAKE_CURRENT_SOURCE_DIR}/*.doc ${CMAKE_CURRENT_SOURCE_DIR}/*.xml ${CMAKE_CURRENT_SOURCE_DIR}/*.m4 ${CMAKE_CURRENT_SOURCE_DIR}/*.texi) + FILE(COPY ${COPY_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/) +- # Copy the image files used by markdown documentation ++ # Copy the image files used by markdown documentation + # manually. + FILE(GLOB IMG_FILES ${CMAKE_CURRENT_BINARY_DIR}/images/*.jpg ${CMAKE_CURRENT_BINARY_DIR}/images/*.png) +- ++ + # Set abs_top_srcdir to work with the autotools + # doxyfile template. + SET(abs_top_srcdir ${CMAKE_SOURCE_DIR}) +@@ -61,10 +61,16 @@ IF(BUILD_DOCS) + COMMENT "Generating Tutorial Tags" VERBATIM + ) + +- FILE(COPY ${IMG_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/html) ++ FILE(COPY ${IMG_FILES} DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/html) ++ ++ INSTALL( ++ DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/html/ ++ DESTINATION ${CMAKE_INSTALL_DOCDIR} ++ COMPONENT documentation ++ ) + ENDIF() + ENDIF() + + SET(CUR_EXTRA_DIST ${CUR_EXTRA_DIST} CMakeLists.txt Makefile.am netcdf.m4 DoxygenLayout.xml Doxyfile.in Doxyfile.guide.in footer.html mainpage.dox tutorial.dox install.dox dispatch.dox guide.dox types.dox notes.dox cdl.dox architecture.dox internal.dox install-fortran.dox Doxyfile.in.cmake windows-binaries.md building-with-cmake.md) + +-ADD_EXTRA_DIST("${CUR_EXTRA_DIST}") +\ No newline at end of file ++ADD_EXTRA_DIST("${CUR_EXTRA_DIST}") diff --git a/debian/patches/series b/debian/patches/series index 0082a22..6489ec4 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -set-soname-to-7.patch +doc.patch diff --git a/debian/patches/set-soname-to-7.patch b/debian/patches/set-soname-to-7.patch deleted file mode 100644 index 88b5c7f..0000000 --- a/debian/patches/set-soname-to-7.patch +++ /dev/null @@ -1,31 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index fc17c1b..b768092 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -18,7 +18,7 @@ SET(netCDF_VERSION_PATCH 2) - SET(netCDF_VERSION_NOTE "") - SET(netCDF_VERSION ${netCDF_VERSION_MAJOR}.${netCDF_VERSION_MINOR}.${netCDF_VERSION_PATCH}${netCDF_VERSION_NOTE}) - SET(VERSION ${netCDF_VERSION}) --SET(netCDF_SO_VERSION 7.2.0) -+SET(netCDF_SO_VERSION 7) - SET(PACKAGE_VERSION ${VERSION}) - - # Get system configuration, Use it to determine osname, os release, cpu. These -@@ -642,7 +642,7 @@ IF(USE_HDF5 OR ENABLE_NETCDF_4) - OUTPUT_VARIABLE HDF5_VERSION - ERROR_QUIET - ) -- -+ - # It cannot be assumed that libhdf5.settings exists. If it doesn't, - # the call to h5cc will have failed. At this point we will have to - # trust the user that they have configured their system properly. -@@ -812,7 +812,7 @@ IF(ENABLE_FSYNC) - SET(USE_FSYNC ON) - ENDIF() - --# Temporary -+# Temporary - OPTION (ENABLE_JNA "Enable jna bug fix code." OFF) - IF(ENABLE_JNA) - SET(JNA ON) diff --git a/debian/rules b/debian/rules index 3b9bdc8..c604353 100755 --- a/debian/rules +++ b/debian/rules @@ -10,7 +10,7 @@ override_dh_auto_configure: -DENABLE_DAP_REMOTE_TESTS:BOOL=OFF \ -DENABLE_PARALLEL_TESTS:BOOL=OFF \ -DENABLE_TESTS:BOOL=OFF \ - -DBUILD_DOCS:BOOL=ON + -DENABLE_DOXYGEN:BOOL=ON # -DCMAKE_C_COMPILER=mpicc \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/netcdf.git _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel