[SCM] Gerris Flow Solver branch, upstream, updated. b3aa46814a06c9cb2912790b23916ffb44f1f203

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 33f295ee2007ceda98c3d6d5bc7d55323e5fa87b
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date:   Fri Dec 2 14:22:30 2005 +1100

    Debian package snapshots
    
    darcs-hash:20051202032230-fbd8f-689940e0f8ed0c74a5bfc9ff1f734574bc1a4582.gz

diff --git a/Makefile.am b/Makefile.am
index 86cc337..3ed37af 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -10,3 +10,11 @@ dist-hook:
 
 ChangeLog:
 	darcs changes > ChangeLog
+
+debian-snapshot:
+	sh debian/changelog.sh
+	sh debian/control.sh
+	dpkg-buildpackage -rfakeroot -b -d
+	rm -f debian/repo/*
+	mv -f ../*.changes ../*.deb debian/repo
+	cd debian/repo && dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz
diff --git a/configure.in b/configure.in
index f9cf3c5..0c1ea08 100644
--- a/configure.in
+++ b/configure.in
@@ -13,9 +13,9 @@ dnl are available for $ac_help expansion (don't we all *love* autoconf?)
 #
 GFS_MAJOR_VERSION=0
 GFS_MINOR_VERSION=8
-GFS_MICRO_VERSION=0
-GFS_INTERFACE_AGE=0
-GFS_BINARY_AGE=0
+GFS_MICRO_VERSION=1
+GFS_INTERFACE_AGE=1
+GFS_BINARY_AGE=1
 GFS_VERSION=$GFS_MAJOR_VERSION.$GFS_MINOR_VERSION.$GFS_MICRO_VERSION
 GFS_COMPILATION_FLAGS=$CFLAGS
 dnl
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index 8f6577b..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-gerris (0.8.0) unstable; urgency=low
-
-  * Initial Release.
-
- -- Stephane Popinet <popinet at users.sf.net>  Wed, 30 Nov 2005 21:00:12 +1200
diff --git a/debian/changelog.sh b/debian/changelog.sh
new file mode 100644
index 0000000..9aca384
--- /dev/null
+++ b/debian/changelog.sh
@@ -0,0 +1,10 @@
+version=`awk '{if ($1 == "Version:") print $2;}' < src/gerris2D.pc`
+date=`date "+%a, %e %b %Y %T %z"`
+
+cat <<EOF > debian/changelog
+gerris-snapshot ($version) testing; urgency=low
+
+  * gerris-snapshot release (based on Marcelo's official debian)
+
+ -- Stephane Popinet <popinet at users.sf.net>  $date
+EOF
diff --git a/debian/control b/debian/control
deleted file mode 100644
index 32e7d0c..0000000
--- a/debian/control
+++ /dev/null
@@ -1,25 +0,0 @@
-Source: gerris
-Section: math
-Priority: optional
-Maintainer: Stephane Popinet <popinet at users.sf.net>
-Build-Depends: debhelper (>> 4), libgts-dev (>> 0.7.4), libglib2.0-dev, autotools-dev
-Standards-Version: 3.6.1
-
-Package: gerris
-Section: math
-Architecture: any
-Depends: ${shlibs:Depends}
-Description: Gerris Flow Solver
- Gerris is a system for the solution of the partial differential
- equations describing fluid flow.
- .
- A brief summary of its main (current) features:
- .
-    * Quadtree-based (Octree in 3D) spatial discretisation with
-      automatic (and possibly dynamic) local refinement.
-    * Multigrid Poisson solver.
-    * Second-order Godunov type advection scheme.
-    * Solves the time-dependent incompressible Euler equations.
-    * Support for complex solid boundaries (automatic locally-refined
-      mesh generation).
-    * Flexible object-oriented specification of boundary conditions.
diff --git a/debian/control.sh b/debian/control.sh
new file mode 100644
index 0000000..4634674
--- /dev/null
+++ b/debian/control.sh
@@ -0,0 +1,33 @@
+GTS_VERSION=`pkg-config gts --modversion`
+
+cat <<EOF > debian/control
+Source: gerris-snapshot
+Section: math
+Priority: extra
+Maintainer: Stephane Popinet <popinet at users.sf.net>
+Build-Depends: debhelper (>> 4), libgts-snapshot-dev (>= $GTS_VERSION), libglib2.0-dev, autotools-dev
+
+Package: gerris-snapshot
+Section: math
+Priority: extra
+Architecture: any
+Depends: \${shlibs:Depends}, libgts-snapshot (>= $GTS_VERSION)
+Conflicts: gerris
+Replaces: gerris
+Description: Gerris Flow Solver (development snapshot)
+ Gerris is a system for the solution of the partial differential
+ equations describing fluid flow.
+ .
+ A brief summary of its main (current) features:
+ .
+    * Quadtree-based (Octree in 3D) spatial discretisation with
+      automatic and dynamic refinement.
+    * Multigrid Poisson solver.
+    * Second-order Godunov type advection scheme.
+    * Solves the time-dependent incompressible Euler, Stokes ans Navier-Stokes
+      equations.
+    * Support for complex solid boundaries (automatic locally-refined
+      mesh generation).
+ .
+ See http://gfs.sf.net for more information and documentation.
+EOF
diff --git a/debian/gerris.install b/debian/gerris-snapshot.install
similarity index 61%
rename from debian/gerris.install
rename to debian/gerris-snapshot.install
index 7363834..6bdb20c 100644
--- a/debian/gerris.install
+++ b/debian/gerris-snapshot.install
@@ -8,6 +8,6 @@ usr/lib/gerris/*.so
 usr/lib/gerris/*.so.*
 usr/lib/gerris/*.a
 usr/lib/gerris/*.la
+usr/lib/gerris/*.mdf
+usr/lib/gerris/*.py
 usr/lib/pkgconfig/*.pc
-../../doc/tutorial/tutorial.pdf usr/share/doc/gerris
-../../doc/tutorial/half-cylinder.gts usr/share/doc/gerris
diff --git a/debian/gerris.doc-base b/debian/gerris.doc-base
deleted file mode 100644
index f78dc44..0000000
--- a/debian/gerris.doc-base
+++ /dev/null
@@ -1,12 +0,0 @@
-Document: gerris
-Title: Gerris tutorial
-Author: Stephane Popinet
-Abstract: This tutorial is a step-by-step introduction to the different
- concepts necessary to use Gerris.  It is specifically designed for a end-user
- and is not a technical description of the numerical techniques used within
- Gerris.  If you are interested by that, you should consult the bibliography
- section on the Gerris web site (http://gfs.sf.net/).
-Section: math
-
-Format: PDF
-Files: /usr/share/doc/gerris/tutorial.pdf

-- 
Gerris Flow Solver