[Pkg-scicomp-devel] xmds/trunk/debian

[Rafael Laboissiere]

SVN commit 1373 by rafael:

Debian release xmds_1.5.3-5

 M  +5 -13     xmds/trunk/debian/README.Debian  
 M  +14 -0     xmds/trunk/debian/changelog  
 M  +3 -3      xmds/trunk/debian/control  
 M  +2 -2      xmds/trunk/debian/examples  
 D             xmds/trunk/debian/patches/50-either-fftw-or-fftw3.patch  
 M  +7 -10     xmds/trunk/debian/rules  


--- xmds/trunk/debian/README.Debian #1372:1373
@@ -1,18 +1,11 @@
 xmds for Debian
 ---------------
 
-  This version of XMDS has been compiled against the fftw3 library, instead
-  of the default fftw2.  This means that the simulations will only work if
-  the following XML code is present in the *.xmds file:
+  All examples shiped in the upstream distribution tarball are
+  included in the Debian package in the directory
+  /usr/share/doc/xmds/examples.  To run one of them and visualize the
+  results, you can do, e.g.:
 
-      <fftw_version>3</fftw_version>
-
-  inside the <simulation> target.
-
-  All examples included in the Debian package in directory
-  /usr/share/doc/xmds/examples have been changed accordingly.  To run one of
-  them and visualize the results, you can do, e.g.:
-
       xmds /usr/share/doc/xmds/examples/nlse.xmds
       ./nlse
       xsil2graphics nlse.xsil
@@ -24,9 +17,8 @@
   octave2.9) and the gv package installed in your system in order to run
   the code above.
 
-  The following examples do not work, because they depend on MPI:
+  The following examples do not work yet:
 
-      gaugeatomlaser.xmds
       highdim.xmds
       kubo.xmds
 
--- xmds/trunk/debian/changelog #1372:1373
@@ -1,3 +1,17 @@
+xmds (1.5.3-5) experimental; urgency=low
+
+  * debian/rules:
+    - Enable the use of MPI
+    - Do not path the examples for fftw3, since they work with fftw2
+  * debian/README.Debian: Updated according to the above
+  * debian/control:
+    - Build-depends on fftw-dev and libmpich1.0-dev
+    - Depends on fftw-dev, fft3-dev, and libmpich1.0-dev, otherwise the
+      xmds program won't work, since it needs the header files of those
+      packages
+
+ -- Rafael Laboissiere <rafael at debian.org>  Thu, 30 Nov 2006 03:54:42 +0100
+
 xmds (1.5.3-4) experimental; urgency=low
 
   * debian/rules: Avoid the double invocation of build/xmds rule
--- xmds/trunk/debian/control #1372:1373
@@ -4,13 +4,13 @@
 Maintainer: Debian Scientific Computing Team <pkg-scicomp-devel at lists.alioth.debian.org>
 Uploaders: Christian T. Steigies <cts at debian.org>,
  Rafael Laboissiere <rafael at debian.org>
-Build-Depends: cdbs, debhelper (>= 5), autotools-dev, fftw3-dev,
- octave2.1-headers, octave2.9-headers, autoconf
+Build-Depends: cdbs, debhelper (>= 5), autotools-dev, fftw-dev, fftw3-dev,
+ libmpich1.0-dev, octave2.1-headers, octave2.9-headers, autoconf
 Standards-Version: 3.7.2
 
 Package: xmds
 Architecture: any
-Depends: ${shlibs:Depends}, fftw3
+Depends: ${shlibs:Depends}, fftw-dev, fftw3-dev, libmpich1.0-dev
 Suggests: ${octave-2-9:Depends} | ${octave-2-1:Depends}
 Description: eXtensible multi-dimensional Simulator
  XMDS is a code generator that integrates equations, from Ordinary
--- xmds/trunk/debian/examples #1372:1373
@@ -1,2 +1,2 @@
-examples-fftw3/*.xmds
-examples-fftw3/*.dat
+examples/*.xmds
+examples/*.dat
--- xmds/trunk/debian/rules #1372:1373
@@ -10,20 +10,18 @@
 expdir  = $(shrdir)/doc/xmds/examples
 mdir    = $(shrdir)/octave/site/m
 
-DEB_CONFIGURE_EXTRA_FLAGS = --enable-fftw3
+DEB_CONFIGURE_EXTRA_FLAGS =		\
+	--enable-fftw3			\
+	--enable-mpi			\
+	--with-mpi-path=/usr/lib/mpich
+
 DEB_COMPRESS_EXCLUDE = .xmds
 DEB_AUTO_UPDATE_AUTOCONF = 1
 
 build/xmds:: make-examples-stamp
 make-examples-stamp:	
-	# Add the appropriate fftw version to the *.xmds examples
-	test -d examples-fftw3 || mkdir examples-fftw3
-	cp examples/*.xmds examples/*dat examples-fftw3
-	perl -pi -e \
-	  '$$_.="\n  <fftw_version>3</fftw_version>\n" if /^<simulation>/' \
-	  examples-fftw3/*.xmds
 	# Run test
-	cp examples-fftw3/lorenz* source
+	cp examples/lorenz* source
 	( cd source ;						\
 	  $(MAKE) XMDS=./xmds XSIL2GRAPHICS=./xsil2graphics	\
 		-f ../debian/Makefile-examples lorenz.m ;	\
@@ -43,5 +41,4 @@
 	cp debian/Makefile-examples $(expdir)/Makefile
 
 clean::
-	rm -rf config.log examples-fftw3 source/lorenz.* \
-		make-examples-stamp
+	rm -rf config.log source/lorenz.* make-examples-stamp