[SCM] Freefoam packaging. Programs and libraries for Computational Fluid Dynamics (CFD) branch, master, updated. debian/0.1.0+dfsg-1

[Michael Wild]

The following commit has been merged in the master branch:
commit 7f41940c0aaa0afb87f37126fe23206c55117074
Author: Michael Wild <themiwi at users.sourceforge.net>
Date:   Fri Jul 27 10:22:18 2012 +0200

    Fix /usr/share/freefoam/DoxyDocIndex installation, fix name mangling
    
    - Install it into freefoam-dev-doc package instead of libfreefoam-dev
    - Add debian/patches/doxygen-generated-file-names-breakage.diff to fix the name
      mangling issue
    - Add debian/patches/fix-api-doc-location.diff to fix the API documentation
      location in DoxyDocIndex.
    
    Closes: #682934
    Signed-off-by: Michael Wild <themiwi at users.sourceforge.net>

diff --git a/debian/libfreefoam-dev.install b/debian/libfreefoam-dev.install
index 22f26bb..7c8ce46 100644
--- a/debian/libfreefoam-dev.install
+++ b/debian/libfreefoam-dev.install
@@ -1,2 +1,2 @@
 debian/tmp/usr/include/* /usr/include
-debian/tmp/usr/share/freefoam/* /usr/share/freefoam/
+debian/tmp/usr/share/freefoam/utilities debian/tmp/usr/share/freefoam/asciidoc debian/tmp/usr/share/freefoam/templates debian/tmp/usr/share/freefoam/CMake /usr/share/freefoam
diff --git a/debian/patches/doxygen-generated-file-names-breakage.diff b/debian/patches/doxygen-generated-file-names-breakage.diff
new file mode 100644
index 0000000..c1af6ab
--- /dev/null
+++ b/debian/patches/doxygen-generated-file-names-breakage.diff
@@ -0,0 +1,67 @@
+From 71a4abe02b972e10e8e232e85836b2e2252ee064 Mon Sep 17 00:00:00 2001
+From: Michael Wild <themiwi at users.sourceforge.net>
+Date: Sat, 21 Jul 2012 19:13:25 +0200
+Subject: FIX: Doxygen generated file names breakage
+Origin: http://repo.or.cz/w/freefoam.git?a=commit;h=71a4abe02b972e10e8e232e85836b2e2252ee064
+Applied-Upstream: 0.1.2
+Bug-Debian: #682934
+
+Doxygen versions newer than 1.5.7 have a new source file documentation naming
+scheme. Instead of using the suffix "-source.html" they use now "_source.html".
+
+Signed-off-by: Michael Wild <themiwi at users.sourceforge.net>
+---
+ CMake/FOAMUse.cmake.in    |    3 +++
+ CMake/FOAMUtilities.cmake |    5 ++++-
+ CMakeLists.txt            |    5 +++++
+ 3 files changed, 12 insertions(+), 1 deletion(-)
+
+diff --git a/CMake/FOAMUse.cmake.in b/CMake/FOAMUse.cmake.in
+index 8976b90..c54865b 100644
+--- a/CMake/FOAMUse.cmake.in
++++ b/CMake/FOAMUse.cmake.in
+@@ -259,6 +259,9 @@
+ # DO NOT call this function after you called FOAM_WRITE_DOC_INDEX(), it won't
+ # have any effect!
+ #
++# If the Doxygen version is older than 1.5.8, you should set DOXYGEN_SOURCE_SEP
++# to "-", otherwise the output file names are guessed incorrectly.
++#
+ #  FOAM_WRITE_DOC_INDEX()
+ #
+ # Create the documentation index file. Call this function after all calls to
+diff --git a/CMake/FOAMUtilities.cmake b/CMake/FOAMUtilities.cmake
+index ba6cc0b..26eb41b 100644
+--- a/CMake/FOAMUtilities.cmake
++++ b/CMake/FOAMUtilities.cmake
+@@ -582,7 +582,10 @@ unset(__FOAM_ADD_EXECUTABLE_TO_DOC_INDEX_targets CACHE)
+ 
+ function(foam_add_executable_to_doc_index target source)
+   get_filename_component(f ${source} NAME_WE)
+-  set(files "\"${f}_8C.html\" \"${f}_8C-source.html\"")
++  if(NOT DEFINED DOXYGEN_SOURCE_SEP)
++    set(DOXYGEN_SOURCE_SEP _)
++  endif()
++  set(files "\"${f}_8C.html\" \"${f}_8C${DOXYGEN_SOURCE_SEP}source.html\"")
+   set(__FOAM_ADD_EXECUTABLE_TO_DOC_INDEX_targets
+     ${__FOAM_ADD_EXECUTABLE_TO_DOC_INDEX_targets} "${target} (${files})"
+     CACHE INTERNAL "Files to include in the documentation index"
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 88551db..e821cdb 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -252,6 +252,11 @@ if(FOAM_ENABLE_DOXYGEN_DOCS)
+       "Versions newer than 1.6.3 and older than 1.7.2-20101106 "
+       "usually crash when processing the ${PROJECT_NAME} documentation.")
+   endif()
++  if(${DOXYGEN_VERSION_OUTPUT} VERSION_LESS 1.5.8)
++    set(DOXYGEN_SOURCE_SEP "-")
++  else()
++    set(DOXYGEN_SOURCE_SEP "_")
++  endif()
+   # ask user whether she prefers local or www docs
+   foam_option(FOAM_USE_LOCAL_DOXYGEN_DOCS "Use local API docs"
+     "Use the local API documentation instead of http://freefoam.sf.net/doc/API"
+-- 
+1.7.9.5
+
diff --git a/debian/patches/fix-api-doc-location.diff b/debian/patches/fix-api-doc-location.diff
new file mode 100644
index 0000000..f71a8b7
--- /dev/null
+++ b/debian/patches/fix-api-doc-location.diff
@@ -0,0 +1,27 @@
+From ece8577b5ff2fbb4a923b9262a4120772eba6ce5 Mon Sep 17 00:00:00 2001
+From: Michael Wild <themiwi at users.sourceforge.net>
+Date: Fri, 27 Jul 2012 10:23:14 +0200
+Subject: Change the API documentation location in the generated DoxyDocIndex file
+Bug-Debian: #682934
+
+Signed-off-by: Michael Wild <themiwi at users.sourceforge.net>
+---
+ CMake/FOAMUtilities.cmake |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/CMake/FOAMUtilities.cmake b/CMake/FOAMUtilities.cmake
+index ba6cc0b..de1a812 100644
+--- a/CMake/FOAMUtilities.cmake
++++ b/CMake/FOAMUtilities.cmake
+@@ -622,7 +622,7 @@ object      docIndex;
+ }
+ // * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * //
+ 
+-docDir \"@FOAM_DOC_DIR@/API\";
++docDir \"/usr/share/doc/freefoam-dev-doc/api\";
+ 
+ docFiles {
+ ${tmp};
+-- 
+1.7.9.5
+
diff --git a/debian/patches/series b/debian/patches/series
index 21f8ddf..3fc6fae 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@ spelling.diff
 remove-dfsg-deleted-directories-from-build-system.diff
 update-for-removed-apps.diff
 missing-qualifications-of-template-dependent-names.diff
+doxygen-generated-file-names-breakage.diff
+fix-api-doc-location.diff

-- 
Freefoam packaging. Programs and libraries for Computational Fluid Dynamics (CFD)