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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 1624f38e916618510eb9b8f0a6a90ce5ca49b1f6
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Fri Mar 10 08:42:39 2006 +1100

    Debian snapshot packages were not correctly versioned
    
    darcs-hash:20060309214239-d4795-54284ebc6c626ca9f2f39400114fd8fce85cb051.gz

diff --git a/configure.in b/configure.in
index da823aa..a8e764c 100644
--- a/configure.in
+++ b/configure.in
@@ -13,7 +13,7 @@ dnl are available for $ac_help expansion (don't we all *love* autoconf?)
 #
 GFS_MAJOR_VERSION=0
 GFS_MINOR_VERSION=9
-GFS_MICRO_VERSION=1
+GFS_MICRO_VERSION=2
 GFS_INTERFACE_AGE=0
 GFS_BINARY_AGE=0
 GFS_VERSION=$GFS_MAJOR_VERSION.$GFS_MINOR_VERSION.$GFS_MICRO_VERSION
diff --git a/debian/changelog b/debian/changelog
deleted file mode 100644
index b2109eb..0000000
--- a/debian/changelog
+++ /dev/null
@@ -1,5 +0,0 @@
-gerris-snapshot (0.8.1) testing; urgency=low
-
-  * gerris-snapshot release (based on Marcelo's official debian)
-
- -- Stephane Popinet <popinet at users.sf.net>  Mon,  5 Dec 2005 10:37:20 +1300
diff --git a/debian/control.sh b/debian/control.sh
index c300bd5..29dd89a 100644
--- a/debian/control.sh
+++ b/debian/control.sh
@@ -1,4 +1,5 @@
 GTS_VERSION=`pkg-config gts --modversion`
+GERRIS_VERSION=`pkg-config gerris2D --modversion`
 
 cat <<EOF > debian/control
 Source: gerris-snapshot
@@ -32,3 +33,13 @@ Description: Gerris Flow Solver (development snapshot)
  .
  See http://gfs.sf.net for more information and documentation.
 EOF
+
+version=`date +%y%m%d`
+date=`date +"%a, %e %b %Y %T %z"`
+cat <<EOF > debian/changelog
+gerris-snapshot ($GERRIS_VERSION-$version) testing; urgency=low
+
+  * gerris-snapshot release (based on Marcelo's official debian)
+
+ -- Stephane Popinet <popinet at users.sf.net>  $date
+EOF

-- 
Gerris Flow Solver