r44380 - in /packages/getdp/trunk/debian: ./ patches/

trophime-guest at users.alioth.debian.org trophime-guest at users.alioth.debian.org
Wed Jan 18 09:46:57 UTC 2012 

Author: trophime-guest
Date: Wed Jan 18 09:46:57 2012
New Revision: 44380

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=44380
Log:
update to svn rev 2227

Removed:
    packages/getdp/trunk/debian/patches/TS_type_undef.diff
    packages/getdp/trunk/debian/patches/gmsh-2.1.diff
    packages/getdp/trunk/debian/patches/petsc-solverfile.diff
    packages/getdp/trunk/debian/patches/petsc3.1.diff
Modified:
    packages/getdp/trunk/debian/   (props changed)
    packages/getdp/trunk/debian/README.Debian
    packages/getdp/trunk/debian/changelog
    packages/getdp/trunk/debian/control
    packages/getdp/trunk/debian/getdp-sparskit.install
    packages/getdp/trunk/debian/getdp.install
    packages/getdp/trunk/debian/patches/Makefile.diff
    packages/getdp/trunk/debian/patches/configure.diff
    packages/getdp/trunk/debian/patches/series
    packages/getdp/trunk/debian/rules

Propchange: packages/getdp/trunk/debian/
------------------------------------------------------------------------------
    mergeWithUpstream = 1

Modified: packages/getdp/trunk/debian/README.Debian
URL: http://svn.debian.org/wsvn/debian-science/packages/getdp/trunk/debian/README.Debian?rev=44380&op=diff
==============================================================================
--- packages/getdp/trunk/debian/README.Debian (original)
+++ packages/getdp/trunk/debian/README.Debian Wed Jan 18 09:46:57 2012
@@ -1,6 +1,31 @@
 getdp for Debian
 ----------------
 
-initial build for debian lenny
+ Options for PETSc can be provided on the command line, or in the file
+ ~/.petscrc. 
+
+ By default we try to use the MUMPS or UMFPACK direct solver (if
+ available, with PETSc 3). Otherwise we use a GMRES iterative solver
+ preconditionned with an ILU(6).
+
+ All these options can be changed at runtime. For example you could
+ use
+
+   -pc_type ilu
+   -pc_factor_levels 0
+   -ksp_rtol 1.e-6
+   -ksp_gmres_restart 500
+   -ksp_monitor
+
+ for GMRES with ILU(0), with a restart of 500 and a stopping
+ criterion of 1e-6. Or you could set
+
+   -pc_type lu
+   -pc_factor_mat_solver_package mumps
+   -ksp_type gmres
+
+ to use the MUMPS direct solver as a preconditioner to GMRES (useful
+ e.g if the matrix changed a bit, but you want to keep the same
+ factorization using "SolveAgain").
 
  -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>  Thu, 27 Aug 2009 13:09:50 +0200

Modified: packages/getdp/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/getdp/trunk/debian/changelog?rev=44380&op=diff
==============================================================================
--- packages/getdp/trunk/debian/changelog (original)
+++ packages/getdp/trunk/debian/changelog Wed Jan 18 09:46:57 2012
@@ -1,3 +1,13 @@
+getdp (2.1.1~svn2227-1) unstable; urgency=low
+
+  * Update to svn rev 2227
+  * Remove unneeded patches
+  * debian/rules:
+       - rewrite rules for getdp-sparskit (add --disable-gmsh)
+       - simplify rules
+
+ -- Christophe Trophime <christophe.trophime at lncmi.cnrs.fr>  Tue, 17 Jan 2012 09:45:45 +0100
+
 getdp (2.1.1-1) unstable; urgency=low
 
   * New upstream release

Modified: packages/getdp/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/getdp/trunk/debian/control?rev=44380&op=diff
==============================================================================
--- packages/getdp/trunk/debian/control (original)
+++ packages/getdp/trunk/debian/control Wed Jan 18 09:46:57 2012
@@ -2,11 +2,10 @@
 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>
+Uploaders: Christophe Trophime <christophe.trophime at lncmi.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, libslepc3.1-dev, libhdf5-openmpi-dev (>= 1.8.4), gmsh,
- texlive, texlive-generic-recommended, texinfo, install-info
-Standards-Version: 3.9.1
+ libarpack2-dev, libgsl0-dev, libscotchmetis-dev, libpetsc3.1-dev, libslepc3.1-dev, libhdf5-openmpi-dev (>= 1.8.4), gmsh
+Standards-Version: 3.9.2
 Homepage: http://www.geuz.org/getdp
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/getdp/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/getdp/trunk/

Modified: packages/getdp/trunk/debian/getdp-sparskit.install
URL: http://svn.debian.org/wsvn/debian-science/packages/getdp/trunk/debian/getdp-sparskit.install?rev=44380&op=diff
==============================================================================
--- packages/getdp/trunk/debian/getdp-sparskit.install (original)
+++ packages/getdp/trunk/debian/getdp-sparskit.install Wed Jan 18 09:46:57 2012
@@ -1,2 +1,2 @@
-usr/bin/getdp-sparskit
-usr/share/man/man1/getdp-sparskit.1
+debian/getdp-sparskit.1 usr/share/man/man1
+bin/getdp-sparskit usr/bin

Modified: packages/getdp/trunk/debian/getdp.install
URL: http://svn.debian.org/wsvn/debian-science/packages/getdp/trunk/debian/getdp.install?rev=44380&op=diff
==============================================================================
--- packages/getdp/trunk/debian/getdp.install (original)
+++ packages/getdp/trunk/debian/getdp.install Wed Jan 18 09:46:57 2012
@@ -1,5 +1,7 @@
-usr/bin/getdp
-usr/share/man/man1/getdp.1
-usr/share/doc/getdp/getdp.html
-usr/share/doc/getdp/demos
-usr/share/info/getdp*
+debian/tmp/usr/bin/getdp
+debian/tmp/usr/share/man/man1/getdp.1
+debian/tmp/usr/share/info/getdp*
+
+doc/getdp.html usr/share/doc/getdp
+demos usr/share/doc/getdp
+

Modified: packages/getdp/trunk/debian/patches/Makefile.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/getdp/trunk/debian/patches/Makefile.diff?rev=44380&op=diff
==============================================================================
--- packages/getdp/trunk/debian/patches/Makefile.diff (original)
+++ packages/getdp/trunk/debian/patches/Makefile.diff Wed Jan 18 09:46:57 2012
@@ -1,8 +1,8 @@
-Index: getdp-2.1.0/Makefile
+Index: getdp-2.1.1~svn2227/Makefile
 ===================================================================
---- getdp-2.1.0.orig/Makefile	2010-10-25 13:09:49.000000000 +0200
-+++ getdp-2.1.0/Makefile	2010-10-25 13:09:49.000000000 +0200
-@@ -37,11 +37,11 @@
+--- getdp-2.1.1~svn2227.orig/Makefile	2012-01-03 09:34:51.000000000 +0100
++++ getdp-2.1.1~svn2227/Makefile	2012-01-17 16:30:54.465820750 +0100
+@@ -27,11 +27,11 @@
  	@for i in ${GETDP_DIRS}; do (cd $$i && ${MAKE}); done
  
  install: variables
@@ -19,7 +19,7 @@
  
  variables: configure
  	@echo "********************************************************************"
-@@ -62,6 +62,7 @@
+@@ -52,6 +52,7 @@
  clean:
  	for i in doc lib demos ${GETDP_DIRS}; do (cd $$i && ${MAKE} clean); done
  	rm -f ${GETDP_VERSION_FILE}
@@ -27,10 +27,10 @@
  
  depend: initialtag
  	mv -f Common/GetDPConfig.h .
-Index: getdp-2.1.0/doc/texinfo/Makefile
+Index: getdp-2.1.1~svn2227/doc/texinfo/Makefile
 ===================================================================
---- getdp-2.1.0.orig/doc/texinfo/Makefile	2010-10-26 09:04:01.000000000 +0200
-+++ getdp-2.1.0/doc/texinfo/Makefile	2010-10-26 09:05:58.000000000 +0200
+--- getdp-2.1.1~svn2227.orig/doc/texinfo/Makefile	2012-01-03 09:34:51.000000000 +0100
++++ getdp-2.1.1~svn2227/doc/texinfo/Makefile	2012-01-17 16:30:54.465820750 +0100
 @@ -13,8 +13,9 @@
  	makeinfo --split-size 1000000 getdp.texi
  

Modified: packages/getdp/trunk/debian/patches/configure.diff
URL: http://svn.debian.org/wsvn/debian-science/packages/getdp/trunk/debian/patches/configure.diff?rev=44380&op=diff
==============================================================================
--- packages/getdp/trunk/debian/patches/configure.diff (original)
+++ packages/getdp/trunk/debian/patches/configure.diff Wed Jan 18 09:46:57 2012
@@ -1,34 +1,41 @@
-Index: getdp-2.0.0/configure.in
+Index: getdp-2.1.1~svn2227/configure.in
 ===================================================================
---- getdp-2.0.0.orig/configure.in	2010-03-18 10:21:13.000000000 +0100
-+++ getdp-2.0.0/configure.in	2010-03-18 10:26:27.000000000 +0100
-@@ -6,6 +6,7 @@
- dnl Process this file with autoconf to produce the configure script.
- 
- dnl Check that this is the getdp source tree
-+AC_PREREQ(2.50)
- AC_INIT(Interface/ProParser.y)
- 
- dnl Parse '--with' command-line options
-@@ -189,12 +190,9 @@
- dnl Check for Arpack, then link with blas and lapack if necessary
+--- getdp-2.1.1~svn2227.orig/configure.in	2012-01-17 15:30:29.861973181 +0100
++++ getdp-2.1.1~svn2227/configure.in	2012-01-17 15:45:59.837934072 +0100
+@@ -55,7 +55,7 @@
+                              [use SLEPc eigensolvers (default=yes)]))
+ AC_ARG_ENABLE(sparskit,
+               AC_HELP_STRING([--enable-sparskit],
+-                             [use Sperskit linear solvers (default=no)]))
++                             [use Sparskit linear solvers (default=no)]))
+ AC_ARG_ENABLE(zitsol,
+               AC_HELP_STRING([--enable-zitsol],
+                              [enable support for ZITSOL (default=no)]))
+@@ -222,12 +222,21 @@
+ dnl Check for Arpack
  if test "x$enable_fortran" != "xno"; then
    if test "x$enable_arpack" != "xno" -a "x${LAPACK}" = "xyes"; then
 -    AC_CHECK_FILE(./contrib/Arpack/znaupd.f, ARPACK="yes", ARPACK="no")
 -    if test "x${ARPACK}" = "xyes"; then
-       AC_DEFINE(HAVE_ARPACK)
-       BO="${BO} Arpack"
+-      AC_DEFINE(HAVE_ARPACK)
+-      BO="${BO} Arpack"
 -      GETDP_DIRS="${GETDP_DIRS} contrib/Arpack"
 -      GETDP_LIBS="${GETDP_LIBS} -lGetDPArpack"
-+      GETDP_LIBS="${GETDP_LIBS} -larpack"
-       if test "x${SPARSKIT}" = "xyes"; then
-         if test "x${BLAS_LAPACK_PREFIX}" != "x"; then
-           GETDP_LIBS="${GETDP_LIBS} -L${BLAS_LAPACK_PREFIX} -llapack -lblas"
-@@ -202,7 +200,6 @@
-           GETDP_LIBS="${GETDP_LIBS} -llapack -lblas"
-         fi
-       fi
--    fi
++    AC_LANG_PUSH(Fortran)
++    AC_CHECK_LIB(arpack,znaupd,ARPACK="yes",ARPACK="no")
++    AC_LANG_POP()
++    if test "x${ARPACK}" = "xno"; then
++       AC_CHECK_FILE(./contrib/Arpack/znaupd.f, ARPACK="yes", ARPACK="no")
++       if test "x${ARPACK}" = "xyes"; then
++	 AC_DEFINE(HAVE_ARPACK)
++	 BO="${BO} Arpack"
++	 GETDP_DIRS="${GETDP_DIRS} contrib/Arpack"
++	 GETDP_LIBS="${GETDP_LIBS} -lGetDPArpack"
++       fi
++    else
++	 GETDP_LIBS="${GETDP_LIBS} -larpack"
++         AC_DEFINE(HAVE_ARPACK)
++	 BO="${BO} Arpack"
+     fi
    fi
  fi
- 

Modified: packages/getdp/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/debian-science/packages/getdp/trunk/debian/patches/series?rev=44380&op=diff
==============================================================================
--- packages/getdp/trunk/debian/patches/series (original)
+++ packages/getdp/trunk/debian/patches/series Wed Jan 18 09:46:57 2012
@@ -1,4 +1,2 @@
 Makefile.diff
 configure.diff
-#petsc3.1.diff
-#petsc-solverfile.diff

Modified: packages/getdp/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/getdp/trunk/debian/rules?rev=44380&op=diff
==============================================================================
--- packages/getdp/trunk/debian/rules (original)
+++ packages/getdp/trunk/debian/rules Wed Jan 18 09:46:57 2012
@@ -18,45 +18,29 @@
 
 #DEB_MAKE_ENVVARS               := -j2
 
-DEB_CONFIGURE_EXTRA_FLAGS := --enable-metis
-DEB_CONFIGURE_SCRIPT_ENV        += F77="gfortran"
+#DEB_CONFIGURE_EXTRA_FLAGS := --enable-metis
+DEB_CONFIGURE_EXTRA_FLAGS := 
+DEB_CONFIGURE_SCRIPT_ENV  += F77="gfortran"
 
 DEB_STRIPPED_UPSTREAM_VERSION = $(shell echo $(DEB_UPSTREAM_VERSION) | sed -n -e 's/\.dfsg.*$$//p')
 
-build/getdp::
+install/getdp::
+	echo "installing getdp"
+	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	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 doc
-	cd doc/texinfo && $(MAKE) install-info LC_ALL=C DESTDIR=$(CURDIR)/debian/tmp
+	cd doc/texinfo && $(MAKE) install-info DESTDIR=$(CURDIR)/debian/tmp
 
 install/getdp-sparskit::
-	# unset PETSC var
-	export PETSC_DIR=''
-	export PETSC_ARCH=''
-	export SLEPC_DIR=''
+	echo "installing getdp-sparskit"
+	make clean
+	rm -rf Common/GetDPVersion.h
+	rm -rf Common/GetDPConfig.h
+	$(DEB_CONFIGURE_INVOKE) $(cdbs_configure_flags) $(DEB_CONFIGURE_EXTRA_FLAGS) $(DEB_CONFIGURE_USER_FLAGS) --enable-sparskit --disable-gmsh
+	$(MAKE) 
+
+	mv bin/getdp bin/getdp-sparskit
+
 	
-	# 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 bin/getdp-sparskit

More information about the debian-science-commits mailing list