For Debian installs, prerm now supports failed-upgrade, which is

necessary as the 2.0.x prerm cannot survive new /usr/bin/disorder.

diff --git a/CHANGES b/CHANGES
index 2e986276e7700ca0a5872f6247a15314cdab65f0..f8e7ae714f8efbbb5cbc3d25398e8412ce3d6e23 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -1,3 +1,7 @@
+* Changes up to version 3.0.1
+
+Debian upgrades from 2.0.x should now work better.
+

 * Changes up to version 3.0
 
 Important!  See README.upgrades when upgrading.
 * Changes up to version 3.0
 
 Important!  See README.upgrades when upgrading.

diff --git a/debian/prerm.disorder-server b/debian/prerm.disorder-server
index 0e65ed61d83c9353ca4d0a1ab6bb4eebcc2ab1b0..394afcdb5367f90d467a6397eda2a67d3a85af9e 100755 (executable)
--- a/debian/prerm.disorder-server
+++ b/debian/prerm.disorder-server
@@ -1,7 +1,7 @@
 #! /bin/sh
 #
 # This file is part of DisOrder
 #! /bin/sh
 #
 # This file is part of DisOrder

-# Copyright (C) 2004 Richard Kettlewell
+# Copyright (C) 2008 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
 #
 # 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


@@ -18,5 +18,16 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 #
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
 # USA
 #

-set -e
-/etc/init.d/disorder stop
+set -
+case "$1" in
+upgrade )
+  /etc/init.d/disorder stop
+  ;;
+failed-upgrade )
+  # Upgrading from 2.0 to 3.0.x can provoke this problem.  The 2.0
+  # init script attempts to run disorder(1) but that isn't ready to go
+  # get as users.db has not been created.  Therefore old-prerm upgrade
+  # fails and dpkg tries new-prerm failed-upgrade instead.
+  start-stop-daemon -K -q -n disorderd
+  ;;
+esac