[openfoam] 01/06: Update patch.

[Anton Gladky]

This is an automated email from the git hooks/post-receive script.

gladk pushed a commit to branch master
in repository openfoam.

commit 9d267265a24830e591ac022768ec45aa28e3f5e0
Author: Anton Gladky <gladk at debian.org>
Date:   Fri Sep 23 22:25:35 2016 +0200

    Update patch.
---
 debian/patches/10_fix_etc_path.patch | 17 +++++++++++++----
 debian/rules                         |  4 ++--
 2 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/debian/patches/10_fix_etc_path.patch b/debian/patches/10_fix_etc_path.patch
index 7125024..9dd7ebc 100644
--- a/debian/patches/10_fix_etc_path.patch
+++ b/debian/patches/10_fix_etc_path.patch
@@ -24,16 +24,25 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
 Reviewed-By: <name and email of someone who approved the patch>
 Last-Update: <YYYY-MM-DD>
 
-Index: OpenFOAM-dev-version-4.0/src/OpenFOAM/global/etcFiles/etcFiles.C
+Index: openfoam-4.0+dfsg1/src/OpenFOAM/global/etcFiles/etcFiles.C
 ===================================================================
---- OpenFOAM-dev-version-4.0.orig/src/OpenFOAM/global/etcFiles/etcFiles.C
-+++ OpenFOAM-dev-version-4.0/src/OpenFOAM/global/etcFiles/etcFiles.C
+--- openfoam-4.0+dfsg1.orig/src/OpenFOAM/global/etcFiles/etcFiles.C
++++ openfoam-4.0+dfsg1/src/OpenFOAM/global/etcFiles/etcFiles.C
 @@ -57,7 +57,7 @@ Foam::fileNameList Foam::findEtcDirs(con
      // * $WM_PROJECT_SITE/VERSION
      // * $WM_PROJECT_SITE
      //
 -    searchDir = getEnv("WM_PROJECT_SITE");
-+    searchDir = "/usr/share/openfoam/";
++    searchDir = "/usr/share/openfoam/etc/";
      if (searchDir.size())
      {
          if (isDir(searchDir))
+@@ -128,7 +128,7 @@ Foam::fileNameList Foam::findEtcFiles
+     // * ~/.OpenFOAM/VERSION
+     // * ~/.OpenFOAM
+     //
+-    fileName searchDir = home()/".OpenFOAM";
++    fileName searchDir = "/usr/share/openfoam/etc";
+     if (isDir(searchDir))
+     {
+         fileName fullName = searchDir/FOAMversion/name;
diff --git a/debian/rules b/debian/rules
index af2261f..ef7c52b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #!/usr/bin/make -f
 %:
-	dh $@
+	dh $@ --parallel
 
 export FOAM_INST_DIR=/usr
 export FOAM_APP=$(CURDIR)/applications
@@ -65,4 +65,4 @@ export LD_LIBRARY_PATH:=$(CURDIR)/platforms/linux64Gcc51/lib/openmpi-system:/usr
 #export WM_PROJECT_USER_DIR=$(CURDIR)
 
 override_dh_auto_build:
-	PATH=$(PATH):$(CURDIR)/wmake/:$(CURDIR)/src ./Allwmake
+	PATH=$(PATH):$(CURDIR)/wmake/ ./Allwmake

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/openfoam.git