Package: libfreefoam-dev Version: 0.1.0-1 Severity: normal Tags: upstream patch
Dear Maintainer, The source template files in /usr/share/freefoam/data/templates/* should actually be installed into /usr/share/freefoam/templates, where /usr/share/freefoam/utilities/foamNew expects them to be. This is a problem in the build system and is fixed by the upstream commit http://repo.or.cz/w/freefoam.git?a=commit;h=97511926f09c0fe720ed61bb1ced5acfd38c73bb -- System Information: Debian Release: wheezy/sid APT prefers unstable APT policy: (500, 'unstable') Architecture: amd64 (x86_64) Kernel: Linux 3.2.0-27-generic (SMP w/4 CPU cores) Locale: LANG=C, LC_CTYPE=en_US.UTF-8 (charmap=ANSI_X3.4-1968) (ignored: LC_ALL set to C) Shell: /bin/sh linked to /bin/dash Versions of packages libfreefoam-dev depends on: ii libfreefoam 0.1.0-1 ii python 2.7.3-1 libfreefoam-dev recommends no packages. libfreefoam-dev suggests no packages. -- no debconf information
>From 97511926f09c0fe720ed61bb1ced5acfd38c73bb Mon Sep 17 00:00:00 2001 From: Michael Wild <them...@users.sourceforge.net> Date: Tue, 17 Jul 2012 11:14:51 +0200 Subject: FIX: Installation dirs for AsciiDoc, XHTML-UserGuide and template files Origin: http://repo.or.cz/w/freefoam.git?a=commit;h=97511926f09c0fe720ed61bb1ced5acfd38c73bb Signed-off-by: Michael Wild <them...@users.sourceforge.net> --- data/CMakeLists.txt | 13 +++++++++++-- data/asciidoc/CMakeLists.txt | 29 +++++++++++++++++++++++------ doc/UserGuide/CMakeLists.txt | 2 +- 3 files changed, 35 insertions(+), 9 deletions(-) diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 9d65235..8e8ba53 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -32,7 +32,11 @@ foam_configure_files(installDataFiles DESTDIR data COPYONLY - foamLog.db + foamLog.db) + +foam_configure_files(installTemplateFiles + DESTDIR data + COPYONLY templates/foamAppTemplate.C templates/foamCommentStyles templates/foamScript @@ -47,11 +51,16 @@ foam_configure_files(installDataFiles ) # install the data files -foam_install_configured_files(FILES +install(FILES ${installDataFiles} DESTINATION ${FOAM_INSTALL_DATA_PATH} COMPONENT data ) +install(FILES + ${installTemplateFiles} + DESTINATION ${FOAM_INSTALL_DATA_PATH}/templates + COMPONENT data + ) add_subdirectory(asciidoc) add_subdirectory(utilities) diff --git a/data/asciidoc/CMakeLists.txt b/data/asciidoc/CMakeLists.txt index 113725b..f850d20 100644 --- a/data/asciidoc/CMakeLists.txt +++ b/data/asciidoc/CMakeLists.txt @@ -29,7 +29,7 @@ #------------------------------------------------------------------------------- # configure the utility data files for build tree and the install tree -foam_configure_files(installDataFiles +foam_configure_files(installAsciiDocFiles DESTDIR data/asciidoc COPYONLY chunked.conf @@ -37,11 +37,19 @@ foam_configure_files(installDataFiles manpage.conf pdf.conf common.conf - docbook.conf + docbook.conf) + +foam_configure_files(installDocBookFiles + DESTDIR data/asciidoc + COPYONLY docbook-xsl/chunked.xsl docbook-xsl/common.xsl docbook-xsl/custom.xsl - docbook-xsl/xhtml.xsl + docbook-xsl/xhtml.xsl) + +foam_configure_files(installDBLaTeXFiles + DESTDIR data/asciidoc + COPYONLY dblatex/asciidoc-dblatex.sty dblatex/foam-macros.sty dblatex/asciidoc-dblatex.xsl @@ -49,9 +57,18 @@ foam_configure_files(installDataFiles # install the data files install(FILES - ${installDataFiles} + ${installAsciiDocFiles} DESTINATION ${FOAM_INSTALL_DATA_PATH}/asciidoc - COMPONENT dev - ) + COMPONENT dev) + +install(FILES + ${installDocBookFiles} + DESTINATION ${FOAM_INSTALL_DATA_PATH}/asciidoc/docbook-xsl + COMPONENT dev) + +install(FILES + ${installDBLaTeXFiles} + DESTINATION ${FOAM_INSTALL_DATA_PATH}/asciidoc/dblatex + COMPONENT dev) # ------------------------- vim: set sw=2 sts=2 et: --------------- end-of-file diff --git a/doc/UserGuide/CMakeLists.txt b/doc/UserGuide/CMakeLists.txt index 8cd6f8b..ee194c1 100644 --- a/doc/UserGuide/CMakeLists.txt +++ b/doc/UserGuide/CMakeLists.txt @@ -324,7 +324,7 @@ if(FOAM_ENABLE_XHTML_GUIDES) add_dependencies(UserGuide-xhtml version_check) endif() install(DIRECTORY ${XSLTPROC_xhtml_DESTDIR} - DESTINATION ${FOAM_INSTALL_DOC_PATH}/UserGuide COMPONENT doc + DESTINATION ${FOAM_INSTALL_DOC_PATH} COMPONENT doc ) endif() -- 1.7.9.5
