[petsc] 05/07: add patch to fix installation during package build

[Drew Parsons]

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

dparsons pushed a commit to branch master
in repository petsc.

commit 284a226d3b78937fd1e27c2cac3cf7c05bd3ebfd
Author: Drew Parsons <dparsons at debian.org>
Date:   Sat Mar 12 00:38:28 2016 +0800

    add patch to fix installation during package build
    
    Quilt patch install_python_RDict_upstream_5a4fee... fixes RDict error
    during install (during package build).
    
    Patch from upstream git commit 5a4feee,
    https://bitbucket.org/petsc/petsc/commits/5a4feeed41cb1af9234d439bb06ea004d3cfa5c6
---
 debian/changelog                                    |  2 ++
 ...pstream_5a4feeed41cb1af9234d439bb06ea004d3cfa5c6 | 21 +++++++++++++++++++++
 debian/patches/series                               |  1 +
 3 files changed, 24 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 8e6fa63..a2ffae1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -5,6 +5,8 @@ petsc (3.6.3.dfsg1-1) UNRELEASED; urgency=medium
     Closes: #811257. 
   * Build doc package from files installed for the debug package.
     Closes: #817165.
+  * Patch install_python_RDict_upstream_5a4fee... fixes installation
+    during package build (patch from upstream git commit 5a4feee).
 
  -- Drew Parsons <dparsons at debian.org>  Fri, 11 Mar 2016 22:16:50 +0800
 
diff --git a/debian/patches/install_python_RDict_upstream_5a4feeed41cb1af9234d439bb06ea004d3cfa5c6 b/debian/patches/install_python_RDict_upstream_5a4feeed41cb1af9234d439bb06ea004d3cfa5c6
new file mode 100644
index 0000000..c98c45c
--- /dev/null
+++ b/debian/patches/install_python_RDict_upstream_5a4feeed41cb1af9234d439bb06ea004d3cfa5c6
@@ -0,0 +1,21 @@
+Index: petsc/config/PETSc/Configure.py
+===================================================================
+--- petsc.orig/config/PETSc/Configure.py
++++ petsc/config/PETSc/Configure.py
+@@ -620,6 +620,8 @@ prepend-path PATH %s
+     import sys
+     self.cmakeboot_success = False
+     if sys.version_info >= (2,4) and hasattr(self.cmake,'cmake'):
++      oldRead = self.argDB.readonly
++      self.argDB.readonly = True
+       try:
+         import cmakeboot
+         self.cmakeboot_success = cmakeboot.main(petscdir=self.petscdir.dir,petscarch=self.arch.arch,argDB=self.argDB,framework=self.framework,log=self.framework.log)
+@@ -627,6 +629,7 @@ prepend-path PATH %s
+         self.framework.logPrint('Booting CMake in PETSC_ARCH failed:\n' + str(e))
+       except (ImportError, KeyError), e:
+         self.framework.logPrint('Importing cmakeboot failed:\n' + str(e))
++      self.argDB.readonly = oldRead
+       if self.cmakeboot_success:
+         if hasattr(self.compilers, 'FC') and self.compilers.fortranIsF90 and not self.setCompilers.fortranModuleOutputFlag:
+           self.framework.logPrint('CMake configured successfully, but could not be used by default because of missing fortranModuleOutputFlag\n')
diff --git a/debian/patches/series b/debian/patches/series
index b7b37ab..bf89d3d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,3 +13,4 @@ nocleanup.patch
 g++-4.8.patch
 python_header
 soname_extension
+install_python_RDict_upstream_5a4feeed41cb1af9234d439bb06ea004d3cfa5c6

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