Oldstabe version gets a ~-based version number.

diff --git a/scripts/dist b/scripts/dist
index 79c79a133d5b980b3a430c035a6c49c797adeb26..e899cc089646b77ecb8fece72e98fda9faac2a99 100755 (executable)
--- a/scripts/dist
+++ b/scripts/dist
@@ -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/.
@@ -51,13 +57,13 @@ build() {
 # Build various debs
 
 # Ubuntu dapper; binaries suit Debian etch too
-build dekabrach etch
+build dekabrach etch etch oldstable
 
 # 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

diff --git a/scripts/setversion b/scripts/setversion
index 142f7da250be3172ab544daf0ca7d866b7a91dc8..c3f0a374e6136ae555d34adebb344e07e4c59d4c 100755 (executable)
--- a/scripts/setversion
+++ b/scripts/setversion
@@ -1,6 +1,6 @@
 #! /usr/bin/perl -w
 #
-# scripts/setversion VERSION
+# scripts/setversion VERSION [DESCRIPTION [DISTRIBUTION]]
 #
 # Sets a new version number, including a debian/changelog entry (albeit
 # a rather terse and informal one).
@@ -9,6 +9,18 @@ use strict;
 use POSIX qw(strftime uname);
 
 my $version = shift;
+my $description;
+my $distribution;
+if(@ARGV > 0) {
+    $description = shift;
+} else {
+    $description = "DisOrder $version";
+}
+if(@ARGV > 0) {
+    $distribution = shift;
+} else {
+    $distribution = "unstable";
+}
 
 my $hostname = (uname)[1];
 $hostname = (gethostbyname($hostname))[0];
@@ -16,6 +28,9 @@ my $logname = (getpwuid($<))[0];
 my $name = (getpwuid($<))[6];
 $name =~ s/,.*//;
 my $email = "$logname\@$hostname";
+if(exists $ENV{"EMAIL"}) {
+    $email = $ENV{"EMAIL"};
+}
 my $date = strftime("%a, %d %b %Y %H:%M:%S %z", localtime);
 
 sub input {
@@ -48,9 +63,9 @@ output("configure.ac", \@c);
 
 @c = input("debian/changelog");
 unshift(@c,
-       "disorder ($version) unstable; urgency=low\n",
+       "disorder ($version) $distribution; urgency=low\n",
        "\n",
-       "  * Disorder $version\n",
+       "  * $description\n",
        "\n",
        " -- $name <$email>  $date\n",
        "\n");