Cope with missing mtab better.

[disorder] / scripts / dist

diff --git a/scripts/dist b/scripts/dist
index 79c79a133d5b980b3a430c035a6c49c797adeb26..f428eef1977f7851aea03e81c97baf8a0dac0b1d 100755 (executable)
--- a/scripts/dist
+++ b/scripts/dist
@@ -1,7 +1,7 @@
 #! /bin/bash
 #
 # This file is part of DisOrder
-# Copyright (C) 2005-2008 Richard Kettlewell
+# Copyright (C) 2005-2009 Richard Kettlewell
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -23,6 +23,7 @@ web=$HOME/public_html/web/disorder
 make
 make distcheck
 make dist-bzip2
+v=$(make echo-version)
 d=$(make echo-distdir)
 src=$d.tar.bz2
 
@@ -38,11 +39,16 @@ remote() {
 build() {
   local h=$1                   # build host
   local f=$2
+  local vs=$3
+  local dist=$4
 
   remote $h "mkdir -p _builds"
   remote $h "rm -rf _builds/*.deb _builds/$d"
   scp $src $h:_builds
   remote $h "cd _builds && tar xfj $src"
+  if [ "$vs" != "" ]; then
+    remote $h "cd _builds/$d && scripts/setversion $v~$vs 'Backport to $vs' $dist"
+  fi
   remote $h "cd _builds/$d && fakeroot debian/rules binary"
   mkdir -p $web/$f
   scp $h:_builds/*.deb $web/$f/.
@@ -50,14 +56,11 @@ build() {
 
 # Build various debs
 
-# Ubuntu dapper; binaries suit Debian etch too
-build dekabrach etch
-
 # Debian lenny (32-bit)
-build leucomorph lenny
+build leucomorph lenny "" stable
 
 # Debian lenny (64-bit)
-build araminta lenny  
+build araminta lenny "" stable
 
 # Update the web
 cp $src $web