r36989 - in /packages/parms/trunk/debian: changelog control patches/sharedlibs.patch rules

[trophime-guest at users.alioth.debian.org]

Author: trophime-guest
Date: Wed Nov  3 16:42:22 2010
New Revision: 36989

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=36989
Log:
add petsc examples

Modified:
    packages/parms/trunk/debian/changelog
    packages/parms/trunk/debian/control
    packages/parms/trunk/debian/patches/sharedlibs.patch
    packages/parms/trunk/debian/rules

Modified: packages/parms/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/parms/trunk/debian/changelog?rev=36989&op=diff
==============================================================================
--- packages/parms/trunk/debian/changelog (original)
+++ packages/parms/trunk/debian/changelog Wed Nov  3 16:42:22 2010
@@ -1,5 +1,6 @@
-parms (3.dfsg-1) unstable; urgency=low
+parms (3-1) unstable; urgency=low
 
   * Initial release (Closes: #600162)
+   * Remove pdf from tarball
 
  -- Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>  Tue, 12 Oct 2010 13:01:21 +0200

Modified: packages/parms/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/parms/trunk/debian/control?rev=36989&op=diff
==============================================================================
--- packages/parms/trunk/debian/control (original)
+++ packages/parms/trunk/debian/control Wed Nov  3 16:42:22 2010
@@ -4,7 +4,7 @@
 Maintainer: Christophe Trophime <christophe.trophime at grenoble.cnrs.fr>
 Build-Depends: cdbs, debhelper (>= 7.0.50~), quilt, texlive-latex-base,
  libblas-dev | libblas-3gf.so, liblapack-dev | liblapack-3gf.so, libitsol-dev, libpetsc3.1-dev,
- mpi-default-dev
+ mpi-default-dev, texlive
 Standards-Version: 3.9.1
 Homepage: http://www-users.cs.umn.edu/~saad/software/pARMS/
 #Vcs-Git: git://git.debian.org/collab-maint/parms.git

Modified: packages/parms/trunk/debian/patches/sharedlibs.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/parms/trunk/debian/patches/sharedlibs.patch?rev=36989&op=diff
==============================================================================
--- packages/parms/trunk/debian/patches/sharedlibs.patch (original)
+++ packages/parms/trunk/debian/patches/sharedlibs.patch Wed Nov  3 16:42:22 2010
@@ -1,6 +1,6 @@
-Index: parms-3.dfsg/src/parms_pc_schurras.c
+Index: parms-3/src/parms_pc_schurras.c
 ===================================================================
---- parms-3.dfsg.orig/src/parms_pc_schurras.c	2010-10-14 10:41:55.000000000 +0200
+--- parms-3.orig/src/parms_pc_schurras.c	2010-11-03 17:34:51.000000000 +0100
 +++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,463 +0,0 @@
 -#include "parms_pc_impl.h"
@@ -466,10 +466,10 @@
 -  self->ops->getratio = pc_schur_getratio;
 -  return 0;
 -}
-Index: parms-3.dfsg/makefile
+Index: parms-3/makefile
 ===================================================================
---- parms-3.dfsg.orig/makefile	2010-10-14 10:41:55.000000000 +0200
-+++ parms-3.dfsg/makefile	2010-10-14 10:47:31.000000000 +0200
+--- parms-3.orig/makefile	2010-11-03 17:34:54.000000000 +0100
++++ parms-3/makefile	2010-11-03 17:34:54.000000000 +0100
 @@ -15,6 +15,7 @@
  
  # library path and directory declaration
@@ -513,10 +513,10 @@
  tests:  $(LIB)
  	(cd examples/grid;make dd-grid.ex ) 
  	(cd examples/general;make dd-HB-dse.ex)
-Index: parms-3.dfsg/examples/general/makefile
+Index: parms-3/examples/general/makefile
 ===================================================================
---- parms-3.dfsg.orig/examples/general/makefile	2010-10-14 10:41:55.000000000 +0200
-+++ parms-3.dfsg/examples/general/makefile	2010-10-14 10:41:55.000000000 +0200
+--- parms-3.orig/examples/general/makefile	2010-11-03 17:34:54.000000000 +0100
++++ parms-3/examples/general/makefile	2010-11-03 17:34:54.000000000 +0100
 @@ -27,7 +27,7 @@
  	${LINKER} ${CLINKFLAGS} -o $@ dd-HB-dse.o aux.o skit.o \
  	${SHFLAGS} ${LIBFLAGS} ${PARMS_LIBS} \
@@ -535,3 +535,26 @@
  
  #fdd-HB-metis.ex: fdd-HB-metis.o aux.o skit.o
  #	${LINKER} ${LINKFLAGS} -o $@ fdd-HB-metis.o aux.o skit.o \
+Index: parms-3/examples/petsc/makefile.in
+===================================================================
+--- parms-3.orig/examples/petsc/makefile.in	2010-11-03 17:34:51.000000000 +0100
++++ parms-3/examples/petsc/makefile.in	2010-11-03 17:38:00.000000000 +0100
+@@ -1,7 +1,8 @@
+ SHELL			=	/bin/sh
+ 
+ 
+-include ${PETSC_DIR}/conf/base
++include ${PETSC_DIR}/conf/variables
++include ${PETSC_DIR}/conf/rules
+ 
+ # path of the header files of pARMS
+ ICFLAGS			=	-I../../include ${PETSC_INCLUDE}
+@@ -46,7 +47,7 @@
+ 
+ # LAPACK, BLAS library
+ LAPACK_BLAS_LIB_DIR	=
+-LAPACK_BLAS_LIB		=	-llapack -lblas-3
++LAPACK_BLAS_LIB		=	-llapack -lblas
+ 
+ # general math libary
+ MATH_LIB_DIR		=     

Modified: packages/parms/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/parms/trunk/debian/rules?rev=36989&op=diff
==============================================================================
--- packages/parms/trunk/debian/rules (original)
+++ packages/parms/trunk/debian/rules Wed Nov  3 16:42:22 2010
@@ -12,8 +12,7 @@
 
 
 # no check for this software
-DEB_MAKE_CHECK_TARGET := tests
-#DEB_MAKE_CHECK_TARGET := tests petsc
+DEB_MAKE_CHECK_TARGET := tests petsc
 
 # PETSC_DIR is the location of PETSc.
 export PETSC_DIR=/usr/lib/petscdir/3.1