[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 6f9431598465d147992c280c98de201172afc4d7
Author: Michael Wild <themiwi at users.sourceforge.net>
Date:   Sun Jul 29 14:51:21 2012 +0200

    Fix installation dirs for template files
    
    Closes: #683175
    Signed-off-by: Michael Wild <themiwi at users.sourceforge.net>

diff --git a/debian/patches/fix-installation-dirs-for-template-files.diff b/debian/patches/fix-installation-dirs-for-template-files.diff
new file mode 100644
index 0000000..fd853d4
--- /dev/null
+++ b/debian/patches/fix-installation-dirs-for-template-files.diff
@@ -0,0 +1,52 @@
+From 97511926f09c0fe720ed61bb1ced5acfd38c73bb Mon Sep 17 00:00:00 2001
+From: Michael Wild <themiwi at users.sourceforge.net>
+Date: Tue, 17 Jul 2012 11:14:51 +0200
+Subject: Fix installation dirs for template files
+Origin: http://repo.or.cz/w/freefoam.git?a=commit;h=97511926f09c0fe720ed61bb1ced5acfd38c73bb
+Bug-Debian: #683175
+
+Removed hunks not related to #683175.
+
+Signed-off-by: Michael Wild <themiwi at users.sourceforge.net>
+---
+ data/CMakeLists.txt          |   13 +++++++++++--
+ 1 files changed, 11 insertions(+), 2 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)
+-- 
+1.7.9.5
+
diff --git a/debian/patches/series b/debian/patches/series
index 79e31ad..f77fa2e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ fix-api-doc-location.diff
 handle-truncated-logs-in-freefoam-log.diff
 correct-output-directory-for-freefoam-log.diff
 escape-meta-chars-for-doxygen-filter.diff
+fix-installation-dirs-for-template-files.diff
diff --git a/debian/rules b/debian/rules
index 079d0b2..91e2da6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -85,7 +85,7 @@ install/libfreefoam1::
 install/libfreefoam-dev::
 	install -d $(CURDIR)/debian/libfreefoam-dev/usr/include/$(FF_SUBDIR)
 	install -d $(CURDIR)/debian/libfreefoam-dev/usr/share/$(FF_SUBDIR)
-	rm $(CURDIR)/debian/tmp/usr/share/$(FF_SUBDIR)/data/templates/foamScript
+	rm $(CURDIR)/debian/tmp/usr/share/$(FF_SUBDIR)/templates/foamScript
 
 install/freefoam::
 	install -d $(CURDIR)/debian/freefoam/usr/bin

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