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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit ed3e1e9334f8f28f3d3afad8b1bebf036cb0836b
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Sun Oct 5 10:49:42 2008 +1100

    Fix for incorrect versioning of debian packages
    
    darcs-hash:20081004234942-d4795-d25e12bdd76a317a52221a8329c671c3cdc4f25c.gz

diff --git a/Makefile.am b/Makefile.am
index 12316c1..34740f9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -15,7 +15,7 @@ ChangeLog: $(DARCS_CHANGELOG)
 changelog:
 	darcs changes > ChangeLog
 
-debian-snapshot: $(DARCS_CHANGELOG)
+debian-snapshot: $(DARCS_CHANGELOG) config.h src/version.h
 	sh debian/control.sh
 	dpkg-buildpackage -rfakeroot -b -d
 	rm -f debian/repo/*
diff --git a/debian/control.sh b/debian/control.sh
index c748b86..82ec306 100644
--- a/debian/control.sh
+++ b/debian/control.sh
@@ -1,5 +1,4 @@
 GTS_VERSION=`pkg-config gts --modversion`
-GERRIS_VERSION=`pkg-config gerris2D --modversion`
 
 cat <<EOF > debian/control
 Source: gerris-snapshot
@@ -35,7 +34,8 @@ Description: Gerris Flow Solver (development snapshot)
  See http://gfs.sf.net for more information and documentation.
 EOF
 
-version=`date +%y%m%d`
+GERRIS_VERSION=`grep GFS_VERSION config.h | awk 'BEGIN{FS=" |\""}{print $4}'`
+version=`grep GFS_BUILD_VERSION src/version.h | awk 'BEGIN{FS=" |\"|-"}{print $4}'`
 date=`date +"%a, %e %b %Y %T %z"`
 cat <<EOF > debian/changelog
 gerris-snapshot ($GERRIS_VERSION-$version) testing; urgency=low
diff --git a/tools/daily b/tools/daily
index c56a7cf..a0cb236 100755
--- a/tools/daily
+++ b/tools/daily
@@ -238,7 +238,7 @@ if ( $build_gerris || $build_gfsview ) ; then
 	       ( $gts_changed || $gerris_changed || $gfsview_changed ) ; then
 	       if ( cd $HOME/local/debian && \
                     dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz && \
-		    rsync -az --delete --rsh=ssh $HOME/local/debian $gerrisweb/debian ) \
+		    rsync -az --delete --rsh=ssh $HOME/local/debian/ $gerrisweb/debian/ ) \
                > $wdir/debian 2>&1 ; then :
 	       else
 		   echo

-- 
Gerris Flow Solver