--- interchange-5.2.0.orig/debian/interchange-cat-foundation.prerm
+++ interchange-5.2.0/debian/interchange-cat-foundation.prerm
@@ -1,6 +1,6 @@
 #! /bin/sh -e
 #
-# Copyright 2001 by Stefan Hornburg (Racke) <racke@linuxia.de>
+# Copyright 2001,2004 by Stefan Hornburg (Racke) <racke@linuxia.de>
 #
 # 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
@@ -25,8 +25,8 @@
 db_get interchange-cat-foundation/install
 if [ "$RET" = "true" ]; then
 	if [ ! -f /var/run/interchange-install ]; then
-		# remove catalog from running server
-		/usr/sbin/interchange --remove=foundation
+		# remove catalog from running server, don't care if it fails
+		/usr/sbin/interchange --remove=foundation || true
 	fi
 fi
 
--- interchange-5.2.0.orig/debian/changelog
+++ interchange-5.2.0/debian/changelog
@@ -1,3 +1,11 @@
+interchange (5.2.0-2) unstable; urgency=high
+
+  * applied upstream fix to avoid termination of script, let catalog
+    removal succeed always (Closes: #256093, thanks to Russ Allbery
+    <rra@stanford.edu> for bug analysis and patch)
+
+ -- Stefan Hornburg (Racke) <racke@linuxia.de>  Sun, 26 Sep 2004 15:53:00 +0200
+
 interchange (5.2.0-1) unstable; urgency=low
 
   * new upstream release
--- interchange-5.2.0.orig/lib/Vend/Control.pm
+++ interchange-5.2.0/lib/Vend/Control.pm
@@ -111,7 +111,8 @@
 The previous Interchange server was not running and probably
 terminated with an error.
 EOF
-		return if $restart;
+		exit 1 unless $restart;
+		return;
 	}
 	if(! $sig) {
 		$sig = $mode ne 'kill' ? 'TERM' : 'KILL';