[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 f35bb9cc2d23137b8e431becdeea12f47ba79a27
Author: Michael Wild <themiwi at users.sourceforge.net>
Date:   Fri Jul 27 10:35:09 2012 +0200

    Fix freefoam-log to create logs/ directory in the case directory, not $PWD
    
    - Added debian/patches/correct-output-directory-for-freefoam-log.diff
    
    Closes: #682932
    Signed-off-by: Michael Wild <themiwi at users.sourceforge.net>

diff --git a/debian/patches/correct-output-directory-for-freefoam-log.diff b/debian/patches/correct-output-directory-for-freefoam-log.diff
new file mode 100644
index 0000000..d7e67ac
--- /dev/null
+++ b/debian/patches/correct-output-directory-for-freefoam-log.diff
@@ -0,0 +1,43 @@
+From aad97ace1c6144f64f751642c44ce60cef9066d6 Mon Sep 17 00:00:00 2001
+From: Michael Wild <themiwi at users.sourceforge.net>
+Date: Tue, 3 Jul 2012 13:52:39 +0200
+Subject: FIX: Correct output directory for freefoam-log
+Origin: http://repo.or.cz/w/freefoam.git?a=commit;h=aad97ace1c6144f64f751642c44ce60cef9066d6
+Applied-Upstream: 0.1.1
+Bug-Debian: #682932
+
+Signed-off-by: Michael Wild <themiwi at users.sourceforge.net>
+---
+ bin/freefoam-log.py.in |    7 ++++---
+ 1 file changed, 4 insertions(+), 3 deletions(-)
+
+diff --git a/bin/freefoam-log.py.in b/bin/freefoam-log.py.in
+index 9476d98..21c54d4 100755
+--- a/bin/freefoam-log.py.in
++++ b/bin/freefoam-log.py.in
+@@ -282,18 +282,19 @@ if listOnly:
+    echo('\n'.join(vars))
+    sys.exit(0)
+ 
++logsDir = os.path.join(caseDir, 'logs')
++
+ plog('Using:')
+ plog('  log      : %s'%logName)
+ plog('  database : %s'%dbName)
+-plog('  files to : %s/logs/'%caseDir)
++plog('  files to : %s'%logsDir)
+ plog('')
+ 
+-logsDir = os.path.join(caseDir, 'logs')
+ if not os.path.isdir(logsDir):
+    if os.path.exists(logsDir):
+       sys.stderr.write('Error: `%s` exists but is not a directory\n'%logsDir)
+       sys.exit(1)
+-   os.mkdir('logs')
++   os.mkdir(logsDir)
+ 
+ # loop over lines, extract data
+ splitRegex = re.compile(r'\s*Time\s*=\s*(?P<time>\S+)')
+-- 
+1.7.9.5
+
diff --git a/debian/patches/series b/debian/patches/series
index 3ac6443..83f23f7 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,3 +5,4 @@ missing-qualifications-of-template-dependent-names.diff
 doxygen-generated-file-names-breakage.diff
 fix-api-doc-location.diff
 handle-truncated-logs-in-freefoam-log.diff
+correct-output-directory-for-freefoam-log.diff

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