[getdp] 13/60: update to 2.1.0

Matteo F. Vescovi mfv at moszumanska.debian.org
Thu Feb 11 10:12:33 UTC 2016


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

mfv pushed a commit to branch master
in repository getdp.

commit a97419246c7e0c2b565d7013b7e276c3865a7dde
Author: Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>
Date:   Mon Oct 25 11:34:59 2010 +0000

    update to 2.1.0
---
 debian/changelog                     | 11 ++++++++
 debian/control                       | 18 +++++++++++-
 debian/copyright                     |  4 +--
 debian/getdp-sparskit.1              | 54 ++++++++++++++++++++++++++++++++++++
 debian/getdp-sparskit.install        |  2 ++
 debian/getdp.install                 |  4 +++
 debian/patches/petsc-solverfile.diff | 10 ++++---
 debian/patches/series                |  2 +-
 debian/rules                         | 51 +++++++++++++++++++++++++++-------
 9 files changed, 138 insertions(+), 18 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 1937f2b..2c18cee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+getdp (2.1.0-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/control : 
+      Add getdp-sparkit package
+      Add libpsparskit-dev to Build-Depends
+  * debian/rules :
+      Remove Arpack, Sparskit from orig tarball
+
+ -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>  Mon, 25 Oct 2010 09:41:45 +0200
+
 getdp (2.1.0~svn2026-1) unstable; urgency=low
 
   * Update to svn rev 2026
diff --git a/debian/control b/debian/control
index d2d410a..d549e71 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ 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, mpi-default-dev,
- libarpack2-dev, libgsl0-dev, libscotchmetis-dev, libpetsc3.1-dev, libhdf5-openmpi-dev (>= 1.8.4), gmsh
+ libarpack2-dev, libgsl0-dev, libscotchmetis-dev, libpetsc3.1-dev, libslepc3.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/
@@ -23,3 +23,19 @@ Description: general environment for the treatment of discrete problems
  .
  See GetDP's reference manual for a more thorough overview of GetDP's
  capabilities: http://www.geuz.org/getdp
+
+Package: getdp-sparskit
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: general environment for the treatment of discrete problems
+ GetDP is a general finite element solver using mixed elements to
+ discretize de Rham-type complexes in one, two and three dimensions.
+ .
+ The main feature of GetDP is the closeness between the input data
+ defining discrete problems (written by the user in ASCII data files)
+ and the symbolic mathematical expressions of these problems.
+ .
+ See GetDP's reference manual for a more thorough overview of GetDP's
+ capabilities: http://www.geuz.org/getdp
+ .
+ Getdp is compiled with SPARSKIT support
diff --git a/debian/copyright b/debian/copyright
index fb85efb..4877bb8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,8 +5,8 @@ It was downloaded from http://www.geuz.org/getdp
 
 Upstream Authors:
 
-    Patrick Dular patrick.dular at ulg.ac.be
-    Christophe Geuzaine christophe.geuzaine at ulg.ac.be
+    Patrick Dular <patrick.dular at ulg.ac.be>
+    Christophe Geuzaine <christophe.geuzaine at ulg.ac.be>
 
 Copyright:
 
diff --git a/debian/getdp-sparskit.1 b/debian/getdp-sparskit.1
new file mode 100644
index 0000000..235d656
--- /dev/null
+++ b/debian/getdp-sparskit.1
@@ -0,0 +1,54 @@
+.\" $Id: getdp.1,v 1.33 2008-07-10 10:21:48 geuzaine Exp $
+.TH GetDP 1 "July 10 2008" "GetDP 2" "GetDP Manual Pages"
+.UC 4
+.\" ********************************************************************
+.SH NAME
+GetDP \- a General environment for the treatment of Discrete Problems
+.\" ********************************************************************
+.SH SYNOPSIS
+.B getdp-sparskit [file] [options]
+.\" ********************************************************************
+.SH DESCRIPTION
+\fIGetDP\fP is a general finite element solver using mixed elements to
+discretize de Rham-type complexes in one, two and three
+dimensions. The main feature of \fIGetDP\fP is the closeness between
+the input data defining discrete problems (written by the user in
+ASCII data files) and the symbolic mathematical expressions of these
+problems.
+.PP
+\fIGetDP\fP is a command-line program. See \fIGmsh\fP for a graphical
+front-end.
+.PP
+\fIgetdp-sparskit\fP is \fIGetDP\fP version compiled with sparskit support.
+.\" ********************************************************************
+.SH WARNING
+This man page does not describe the syntax of the input files: you
+should refer to the info documentation for this (e.g. with \fBinfo
+getdp\fP). Up-to-date versions of the manual in various formats are
+available at \fIhttp://www.geuz.org/getdp/\fP.
+.\" ********************************************************************
+.\" ********************************************************************
+.SH AUTHORS
+Patrick Dular (patrick.dular at ulg.ac.be) and Christophe Geuzaine
+(cgeuzaine at ulg.ac.be). See the documentation for a comprehensive
+list of contributors.
+.\" ********************************************************************
+.SH SEE ALSO
+.BR getdp (1),
+.BR
+.BR gmsh (1),
+.BR
+GetDP examples (\fI/usr/share/doc/getdp-*/\fR),
+.BR
+GetDP homepage (\fIhttp://www.geuz.org/getdp/\fR).
+.PP
+The full documentation for GetDP is maintained as a Texinfo manual.
+If the
+.B info
+and
+.B getdp
+programs are properly installed at your site, the command
+.IP
+.B info getdp
+.PP
+should give you access to the complete manual.
diff --git a/debian/getdp-sparskit.install b/debian/getdp-sparskit.install
new file mode 100644
index 0000000..ff47e48
--- /dev/null
+++ b/debian/getdp-sparskit.install
@@ -0,0 +1,2 @@
+usr/bin/getdp-sparskit
+usr/share/man/man1/getdp-sparskit.1
diff --git a/debian/getdp.install b/debian/getdp.install
new file mode 100644
index 0000000..2c64b84
--- /dev/null
+++ b/debian/getdp.install
@@ -0,0 +1,4 @@
+usr/bin/getdp
+usr/share/man/man1/getdp.1
+usr/share/doc/getdp/getdp.html
+usr/share/doc/getdp/demos
diff --git a/debian/patches/petsc-solverfile.diff b/debian/patches/petsc-solverfile.diff
index 458afc2..48adcc2 100644
--- a/debian/patches/petsc-solverfile.diff
+++ b/debian/patches/petsc-solverfile.diff
@@ -1,17 +1,19 @@
 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 @@
+--- getdp-2.1.0~svn2026.orig/Legacy/LinAlg_PETSC.cpp	2010-10-18 10:44:08.000000000 +0200
++++ getdp-2.1.0~svn2026/Legacy/LinAlg_PETSC.cpp	2010-10-18 10:46:48.000000000 +0200
+@@ -25,6 +25,10 @@
  #include <slepc.h>
  #endif
  
 +extern char *Name_Path;
++static const char *Name_SolverFile = NULL, *Name_DefaultSolverFile = "solver.par" ;
++static char *SolverOptions[100];
 +
  // Johan, we curse you for a thousand generations!
  #include "ProData.h"
  #include "DofData.h"
-@@ -96,6 +98,33 @@
+@@ -96,6 +100,33 @@
  
  void LinAlg_CreateSolver(gSolver *Solver, const char *SolverDataFileName)
  {
diff --git a/debian/patches/series b/debian/patches/series
index 8eb99bf..bfcc5e3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
 Makefile.diff
 configure.diff
 #petsc3.1.diff
-petsc-solverfile.diff
+#petsc-solverfile.diff
diff --git a/debian/rules b/debian/rules
index 4406d1f..e146e09 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,6 +14,7 @@ include /usr/share/cdbs/1/rules/patchsys-quilt.mk
 # PETSC_DIR is the location of PETSc.
 export PETSC_DIR=/usr/lib/petscdir/3.1
 export PETSC_ARCH=linux-gnu-c-opt
+export SLEPC_DIR=/usr/lib/slepcdir/3.1
 
 #DEB_MAKE_ENVVARS               := -j2
 
@@ -22,9 +23,40 @@ DEB_CONFIGURE_SCRIPT_ENV        += F77="gfortran"
 
 DEB_STRIPPED_UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -n -e 's/\.dfsg.*$$//p')
 
+build/getdp::
+	cd doc/texinfo && $(MAKE) pdf html info LC_ALL=C
+
+install/getdp::
+	mkdir -p debian/tmp/usr/share/doc/getdp
+	install -m 644 doc/getdp.html debian/tmp/usr/share/doc/getdp
+	mkdir -p debian/tmp/usr/share/doc/getdp/demos
+	install -m 644 demos/* debian/tmp/usr/share/doc/getdp/demos
+	rm debian/tmp/usr/share/doc/getdp/demos/Makefile
+
+install/getdp-sparskit::
+	# unset PETSC var
+	export PETSC_DIR=''
+	export PETSC_ARCH=''
+	export SLEPC_DIR=''
+	
+	# remove config cache
+	rm -rf autom4te.cache
+	
+	# rebuild getdp with sparskit support
+	make clean
+	$(DEB_CONFIGURE_INVOKE) $(cdbs_configure_flags) $(DEB_CONFIGURE_EXTRA_FLAGS) $(DEB_CONFIGURE_USER_FLAGS) --enable-sparskit
+	$(MAKE)
+	
+	# install getdp with sparskit
+	mv bin/getdp bin/getdp-sparskit
+	mkdir -p debian/tmp/usr/bin
+	install bin/getdp-sparskit debian/tmp/usr/bin
+	mkdir -p debian/tmp/usr/share/man/man1
+	install -m 644 debian/getdp-sparskit.1 debian/tmp/usr/share/man/man1
+
 clean::
 	find . \( -name "*.o" -o -name "*.a" \) -delete
-	rm -rf bin/getdp
+	rm -rf bin/getdp bin/getdp-sparskit
 	rm -rf Common/GetDPVersion.h
 	rm -rf Common/GetDPConfig.h
 	rm -rf variables configure
@@ -32,13 +64,12 @@ clean::
 
 .PHONY: get-orig-source
 get-orig-source:
-        set -ex ; \
-        TMPDIR=`mktemp -d $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig` ; \
-        uscan --force-download --symlink --check-dirname-level 0 --destdir "$$TMPDIR" ; \
-        tar -C "$$TMPDIR" --strip-components 1 -xzf "$$TMPDIR"/$(DEB_SOURCE_PACKAGE)_$(DEB_STRIPPED_UPSTREAM_VERSION).orig.tar.gz ; \
-        rm -f "$$TMPDIR"/$(DEB_SOURCE_PACKAGE)*.tar.gz ; \
-        rm -rf "$$TMPDIR"/Arpack ; \
-        GZIP=-9 tar -czf \
+	set -ex ; \
+        mkdir -p tmp ; \
+        uscan --force-download --symlink --check-dirname-level 0 --destdir tmp ; \
+        tar -C tmp -xzf tmp/$(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION)-source.tgz ; \
+        rm -rf tmp/getdp-$(DEB_UPSTREAM_VERSION)/contrib/Arpack ; \
+        GZIP=-9 tar -C tmp -czf \
             $(CURDIR)/$(DEB_SOURCE_PACKAGE)_$(DEB_UPSTREAM_VERSION).orig.tar.gz \
-            $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION).orig ; \
-        rm -rf "$$TMPDIR"
+            $(DEB_SOURCE_PACKAGE)-$(DEB_UPSTREAM_VERSION) ; \
+        rm -rf tmp

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



More information about the debian-science-commits mailing list