[petsc] 05/07: drop patch install_python_RDict_upstream_5a4fee...

[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 40d4647425568fba0427f7a8d615fd8f9486d74f
Author: Drew Parsons <dparsons at debian.org>
Date:   Tue May 3 19:34:43 2016 +0800

    drop patch install_python_RDict_upstream_5a4fee...
    
    already applied in 3.6.4
---
 debian/changelog                                    |  2 ++
 ...pstream_5a4feeed41cb1af9234d439bb06ea004d3cfa5c6 | 21 ---------------------
 debian/patches/series                               |  1 -
 3 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 93c1de2..0de4ddb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 petsc (3.6.4.dfsg1-1) UNRELEASED; urgency=medium
 
   * New upstream version.
+    - drop patch install_python_RDict_upstream_5a4fee... 
+      (already applied in 3.6.4)
   * Standards-Version: 3.9.8
 
  -- Drew Parsons <dparsons at debian.org>  Tue, 03 May 2016 18:32:29 +0800
diff --git a/debian/patches/install_python_RDict_upstream_5a4feeed41cb1af9234d439bb06ea004d3cfa5c6 b/debian/patches/install_python_RDict_upstream_5a4feeed41cb1af9234d439bb06ea004d3cfa5c6
deleted file mode 100644
index c98c45c..0000000
--- a/debian/patches/install_python_RDict_upstream_5a4feeed41cb1af9234d439bb06ea004d3cfa5c6
+++ /dev/null
@@ -1,21 +0,0 @@
-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 83ae0e9..d6b1be9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -13,6 +13,5 @@ nocleanup.patch
 g++-4.8.patch
 python_header
 soname_extension
-install_python_RDict_upstream_5a4feeed41cb1af9234d439bb06ea004d3cfa5c6
 hurd.patch
 test_mpi_conditional_bug816101

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