[getdp] 11/60: update to 2.1.0 rev 2026

[Matteo F. Vescovi]

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

mfv pushed a commit to branch master
in repository getdp.

commit 7b660e5b6a43667f40d789f40db86c572972da6c
Author: Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>
Date:   Mon Oct 18 08:38:15 2010 +0000

    update to 2.1.0 rev 2026
---
 debian/changelog                     |  6 +++++
 debian/control                       |  3 ++-
 debian/patches/Makefile.patch        | 29 ----------------------
 debian/patches/petsc-solverfile.diff | 47 ++++++++++++++++++++++++++++++++++++
 debian/patches/series                |  3 ++-
 debian/source/format                 |  1 +
 6 files changed, 58 insertions(+), 31 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index db00cd1..1937f2b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+getdp (2.1.0~svn2026-1) unstable; urgency=low
+
+  * Update to svn rev 2026
+
+ -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>  Mon, 18 Oct 2010 09:35:33 +0200
+
 getdp (2.0.0-1) unstable; urgency=low
 
   * Initial release (Closes: #502615)
diff --git a/debian/control b/debian/control
index 2611d0e..d2d410a 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: math
 Priority: extra
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>
-Build-Depends: quilt, cdbs, debhelper (>= 7), autotools-dev, automake, autoconf, gfortran, libarpack2-dev, libgsl0-dev, libscotchmetis-dev, libpetsc3.1-dev, libhdf5-openmpi-dev (>= 1.8.4)
+Build-Depends: quilt, cdbs, debhelper (>= 7), autotools-dev, automake, autoconf, gfortran, mpi-default-dev,
+ libarpack2-dev, libgsl0-dev, libscotchmetis-dev, libpetsc3.1-dev, libhdf5-openmpi-dev (>= 1.8.4), gmsh
 Standards-Version: 3.9.1
 Homepage: http://www.geuz.org/getdp
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/getdp/trunk/
diff --git a/debian/patches/Makefile.patch b/debian/patches/Makefile.patch
deleted file mode 100644
index 34f3229..0000000
--- a/debian/patches/Makefile.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Index: getdp-2.0.0-svn-20100125/Makefile
-===================================================================
---- getdp-2.0.0-svn-20100125.orig/Makefile	2010-01-28 11:54:05.000000000 +0100
-+++ getdp-2.0.0-svn-20100125/Makefile	2010-01-28 11:54:10.000000000 +0100
-@@ -37,11 +37,11 @@
- 	@for i in ${GETDP_DIRS}; do (cd $$i && ${MAKE}); done
- 
- install: variables
--	mkdir -p ${bindir}
--	cp -f bin/getdp${EXEEXT} ${bindir}
--	chmod 755 ${bindir}/getdp${EXEEXT}
--	mkdir -p ${mandir}/man1
--	cp -f doc/getdp.1 ${mandir}/man1
-+	mkdir -p $(DESTDIR)${bindir}
-+	cp -f bin/getdp${EXEEXT} $(DESTDIR)${bindir}
-+	chmod 755 $(DESTDIR)${bindir}/getdp${EXEEXT}
-+	mkdir -p $(DESTDIR)${mandir}/man1
-+	cp -f doc/getdp.1 $(DESTDIR)${mandir}/man1
- 
- variables: configure
- 	@echo "********************************************************************"
-@@ -62,6 +62,7 @@
- clean:
- 	for i in doc lib demos ${GETDP_DIRS}; do (cd $$i && ${MAKE} clean); done
- 	rm -f ${GETDP_VERSION_FILE}
-+	rm -f bin/getdp${EXEEXT}
- 
- depend: initialtag
- 	mv -f Common/GetDPConfig.h .
diff --git a/debian/patches/petsc-solverfile.diff b/debian/patches/petsc-solverfile.diff
new file mode 100644
index 0000000..458afc2
--- /dev/null
+++ b/debian/patches/petsc-solverfile.diff
@@ -0,0 +1,47 @@
+Index: getdp-2.1.0~svn2026/Legacy/LinAlg_PETSC.cpp
+===================================================================
+--- getdp-2.1.0~svn2026.orig/Legacy/LinAlg_PETSC.cpp	2010-10-18 10:23:51.000000000 +0200
++++ getdp-2.1.0~svn2026/Legacy/LinAlg_PETSC.cpp	2010-10-18 10:26:33.000000000 +0200
+@@ -25,6 +25,8 @@
+ #include <slepc.h>
+ #endif
+ 
++extern char *Name_Path;
++
+ // Johan, we curse you for a thousand generations!
+ #include "ProData.h"
+ #include "DofData.h"
+@@ -96,6 +98,33 @@
+ 
+ void LinAlg_CreateSolver(gSolver *Solver, const char *SolverDataFileName)
+ {
++  char FileName[256];
++
++  strcpy(FileName, Name_Path);
++
++  if(SolverDataFileName){
++    // name in .pro file
++    if(SolverDataFileName[0] == '/' || SolverDataFileName[0] == '\\'){
++      // -> absolute if it starts with / or \
++      strcpy(FileName, SolverDataFileName);
++    }
++    else{
++      // -> relative otherwise
++      strcat(FileName, SolverDataFileName);
++    }
++  }
++  else if (Name_SolverFile){
++    // name on command line -> always absolute
++    strcpy(FileName, Name_SolverFile);
++  }
++  else{
++    // default file name -> always relative
++    strcat(FileName, Name_DefaultSolverFile);
++  }
++
++  Msg::Info("Loading parameter file '%s'", FileName);
++  PetscOptionsInsertFile(PETSC_COMM_WORLD, FileName, PETSC_FALSE);
++
+   for(int i = 0; i < 10; i++) Solver->ksp[i] = NULL;
+ }
+ 
diff --git a/debian/patches/series b/debian/patches/series
index a8b4448..8eb99bf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 Makefile.diff
 configure.diff
-petsc3.1.diff
+#petsc3.1.diff
+petsc-solverfile.diff
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)

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