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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 20a6147bef1a7f1185b2f4b2bb68fb39feda2a9a
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Mon Jun 22 10:16:41 2009 +1000

    Fixed Debian version numbering
    
    darcs-hash:20090622001641-d4795-9923fe04a645a1ed86069286ed9efe99096f9391.gz

diff --git a/Makefile.am b/Makefile.am
index 8d6ed4a..a328c86 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,5 +43,5 @@ launchpad-snapshot: $(DARCS_CHANGELOG) config.h src/version.h dist
 	cd gerris-?.?.? && ./configure && sh debian/changelog.sh $(LOG) && dpkg-buildpackage -rfakeroot -k$(KEY) -S -sa
 	rm -f gerris-?.?.?.tar.gz
 	rm -r -f gerris-?.?.?
-	$(DPUT) $(PPA) gerris-snapshot_?.?.?-*_source.changes
-	rm -f gerris-snapshot_?.?.?-*
+	$(DPUT) $(PPA) gerris-snapshot_*_source.changes
+	rm -f gerris-snapshot_*
diff --git a/debian/changelog.sh b/debian/changelog.sh
index 243498d..3c3ac14 100644
--- a/debian/changelog.sh
+++ b/debian/changelog.sh
@@ -1,25 +1,23 @@
-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}')
+version=20$(grep GFS_BUILD_VERSION src/version.h | awk 'BEGIN{FS=" |\"|-"}{print $4}')
 date=$(date +"%a, %e %b %Y %T %z")
 
-if test -z $1; then
-    cat <<EOF > debian/changelog
-gerris-snapshot ($GERRIS_VERSION-$version) hardy; urgency=low
+cat <<EOF > debian/changelog
+gerris-snapshot ($version) hardy; urgency=low
+
+EOF
 
+if test -z $1; then
+    cat <<EOF >> debian/changelog
   * gerris-snapshot release (based on Drew Parsons's official debian)
 
- -- Stephane Popinet <popinet at users.sf.net>  $date
 EOF
 else
-    cat <<EOF > debian/changelog
-gerris-snapshot ($GERRIS_VERSION-$version) hardy; urgency=low
-
-EOF
     if html2text < $1 | grep -v "^[0-9]\{4\}-[0-9]\{2\}-[0-9]\{2\} " >> debian/changelog; then :
     else
 	exit 1
     fi
+fi
+
 cat <<EOF >> debian/changelog
  -- Stephane Popinet <popinet at users.sf.net>  $date
 EOF
-fi

-- 
Gerris Flow Solver