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

[Stephane Popinet]

The following commit has been merged in the upstream branch:
commit dd4f4bbc58859f18abc03be2cf9586afcf860a7c
Author: Stephane Popinet <popinet at users.sf.net>
Date:   Fri May 1 21:21:12 2009 +1000

    daily script properly signs debian repositories
    
    darcs-hash:20090501112112-d4795-376d0ea261e939c886a1504b7645321c0b668180.gz

diff --git a/tools/daily b/tools/daily
index d9825b7..a37e6a2 100755
--- a/tools/daily
+++ b/tools/daily
@@ -17,6 +17,8 @@ gtsweb=popinet,gts at web.sourceforge.net:/home/groups/g/gt/gts/htdocs
 gerrisweb=popinet,gfs at web.sourceforge.net:/home/groups/g/gf/gfs/htdocs
 localgerrisweb=/var/www/gerris
 
+archive_key=$HOME/.gnupg/popinet_key.asc
+
 export PATH=$wdir/local/bin:$PATH:/usr/local/bin
 export LD_LIBRARY_PATH=$wdir/local/lib:$LD_LIBRARY_PATH:/usr/local/lib
 export PKG_CONFIG_PATH=$wdir/local/lib/pkgconfig:$PKG_CONFIG_PATH
@@ -77,6 +79,28 @@ darcs_upgrade()
     fi
 }
 
+# Creates signed Packages and Release files in a debian repository
+debian_release()
+{
+    cat <<EOF > Release
+Archive: stable
+Component: contrib
+Origin: Stephane Popinet
+Label: stable
+Architecture: i386
+EOF
+    if ( rm -f Release.gpg Packages.gz Packages && \
+	apt-ftparchive packages . > Packages && \
+	gzip -9c < Packages > Packages.gz && \
+	apt-ftparchive release . | awk '{if ($3 != "Release") print $0;}' >> Release && \
+	gpg -abs -o Release.gpg Release && \
+	cp -f $archive_key . ) ; then
+	return 0;
+    else
+	return 1;
+    fi
+}
+
 build_gts=false
 if ( cd $wdir/$gts && make -k clean && \
     ( darcs pull -a $darcs_gts/gts-mainline | grep "No remote changes to pull in" ) ) > /dev/null 2>&1 ; then
@@ -177,6 +201,7 @@ if ( $build_gerris || $build_gfsview ) ; then
 	   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/ ) \
                > $wdir/snapshot 2>&1 ; then :
 	       else
@@ -241,7 +266,7 @@ if ( $build_gerris || $build_gfsview ) ; then
            if $gts_snapshot && $gerris_debian && $gfsview_debian && \
 	       ( $gts_changed || $gerris_changed || $gfsview_changed ) ; then
 	       if ( cd $HOME/local/debian && \
-                    dpkg-scanpackages . /dev/null | gzip -9c > Packages.gz && \
+                    debian_release && \
 		    rsync -az --delete --rsh=ssh $HOME/local/debian/ $gerrisweb/debian/ ) \
                > $wdir/debian 2>&1 ; then :
 	       else

-- 
Gerris Flow Solver