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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 115a1ab64c6242d0065b6e430a37b999f8bd907b
Author: Stephane Popinet <s.popinet at niwa.co.nz>
Date:   Mon Dec 5 09:45:18 2005 +1100

    Updated debian packaging and docs
    
    darcs-hash:20051204224518-fbd8f-2ce8e62b17455a9dca2a92ff3ff22dcb14e39ef0.gz

diff --git a/Makefile.am b/Makefile.am
index 3ed37af..89d47eb 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,7 +12,6 @@ ChangeLog:
 	darcs changes > ChangeLog
 
 debian-snapshot:
-	sh debian/changelog.sh
 	sh debian/control.sh
 	dpkg-buildpackage -rfakeroot -b -d
 	rm -f debian/repo/*
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..b2109eb
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,5 @@
+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/changelog.sh b/debian/changelog.sh
deleted file mode 100644
index 9aca384..0000000
--- a/debian/changelog.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-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/doc/tutorial/tutorial.tex b/doc/tutorial/tutorial.tex
index f3da2b6..668d92b 100644
--- a/doc/tutorial/tutorial.tex
+++ b/doc/tutorial/tutorial.tex
@@ -90,6 +90,27 @@ compile Gerris from source) type:
 \end{verbatim}
 In all cases, this will also install the required version of Glib.
 
+If you don't want to wait for an updated version of the official
+Debian package for Gerris, you can follow the development version of
+Gerris by using the unofficial Debian packages which are built every
+night automatically (see next section for more info). To do this just
+add the following lines to your {\tt apt-get} repository list (usually
+{\tt /etc/apt/sources.list}):
+\begin{verbatim}
+# GTS
+deb http://gts.sourceforge.net/debian/ ./
+# Gerris
+deb http://gfs.sourceforge.net/debian/ ./
+\end{verbatim}
+then do:
+\begin{verbatim}
+% apt-get update
+% apt-get install gts-snapshot gerris-snapshot gfsview-snapshot
+\end{verbatim}
+this will install all the required libraries. When a new development
+version becomes available, doing an {\tt apt-get upgrade} will
+automatically upgrade your versions of GTS, Gerris and GfsView.
+
 \subsubsection{Which sources?}
 
 When installing from source, you will need to decide which version of

-- 
Gerris Flow Solver