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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit 703af7bc28864a413f838f81bd6977e46caa0472
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Mon Jul 13 15:30:59 2009 +1000

    daily script only generates launchpad snapshots
    
    darcs-hash:20090713053059-d4795-056bac7d30a61121384a3c602e1098a63afb39ca.gz

diff --git a/Makefile.am b/Makefile.am
index a328c86..07a1add 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,6 @@ changelog:
 
 debian-snapshot: $(DARCS_CHANGELOG) config.h src/version.h
 	sh debian/changelog.sh
-	sh debian/control.sh
 	dpkg-buildpackage -rfakeroot -b
 	rm -f debian/repo/*
 	mv -f ../*.changes ../*.deb debian/repo
diff --git a/tools/daily b/tools/daily
index 2cf97d5..12faae0 100755
--- a/tools/daily
+++ b/tools/daily
@@ -200,9 +200,7 @@ if ( $build_gerris || $build_gfsview ) ; then
 	   gts_snapshot=true
 	   if $gts_changed ; then
 	       if ( darcs2dist gts $darcs_gts/$gts $gtsweb && \
-                    cd $wdir/$gts && make ChangeLog debian-snapshot && \
-		    cd debian/repo && debian_release && \
-		    rsync -rz --delete --rsh=ssh $wdir/$gts/debian/repo/ $gtsweb/debian/ ) \
+                    cd $wdir/$gts && make ChangeLog launchpad-snapshot ) \
                > $wdir/snapshot 2>&1 ; then :
 	       else
 		   echo
@@ -226,9 +224,7 @@ if ( $build_gerris || $build_gfsview ) ; then
 	   fi
 	   gerris_debian=true
            if $gts_snapshot && ( $gts_changed || $gerris_changed ) ; then
-	       if ( cd $wdir/$gerris && make ChangeLog debian-snapshot && \
-	 	    rm -f $HOME/local/debian/gerris-snapshot_*.deb && \
-		    mv -f $wdir/$gerris/debian/repo/*.deb $HOME/local/debian ) \
+	       if ( cd $wdir/$gerris && make ChangeLog launchpad-snapshot ) \
 		   > $wdir/debian 2>&1 ; then :
 	       else
 		   echo
@@ -251,9 +247,7 @@ if ( $build_gerris || $build_gfsview ) ; then
 	   gfsview_debian=true
 	   if $gts_snapshot && $gerris_debian && \
               ( $gts_changed || $gerris_changed || $gfsview_changed ) ; then
-	       if ( cd $wdir/$gfsview && make ChangeLog debian-snapshot && \
-		    rm -f $HOME/local/debian/gfsview-snapshot_*.deb && \
-		    mv -f $wdir/$gfsview/debian/repo/*.deb $HOME/local/debian ) \
+	       if ( cd $wdir/$gfsview && make ChangeLog launchpad-snapshot ) \
                > $wdir/debian 2>&1 ; then :
 	       else
 		   echo
@@ -263,19 +257,6 @@ if ( $build_gerris || $build_gfsview ) ; then
 		   gfsview_debian=false
 	       fi
 	   fi
-           if $gts_snapshot && $gerris_debian && $gfsview_debian && \
-	       ( $gts_changed || $gerris_changed || $gfsview_changed ) ; then
-	       if ( cd $HOME/local/debian && \
-                    debian_release && \
-		    rsync -az --delete --rsh=ssh $HOME/local/debian/ $gerrisweb/debian/ ) \
-               > $wdir/debian 2>&1 ; then :
-	       else
-		   echo
-		   echo ============ $wdir: Gerris/GfsView debian failed ============
-		   echo
-		   cat $wdir/debian
-	       fi
-           fi
        else
 	   echo
 	   echo ============ $wdir: darcs push failed ============

-- 
Gerris Flow Solver