=== modified file 'debian/changelog'
--- old/debian/changelog	2010-09-27 22:47:12 +0000
+++ new/debian/changelog	2010-09-28 18:47:04 +0000
@@ -1,3 +1,11 @@
+eucalyptus (2.0+bzr1241-0ubuntu4) maverick; urgency=low
+
+  * debian/eucalyptus-java-common.postinst: On upgrades from Lucid/10.04,
+    ensure eucalyptus is stopped before attempting to upgrade the database
+    schema. (LP: #649799)
+
+ -- Dave Walker (Daviey) <DaveWalker@ubuntu.com>  Tue, 28 Sep 2010 19:42:41 +0100
+
 eucalyptus (2.0+bzr1241-0ubuntu3) maverick; urgency=low
 
   * debian/eucalyptus-java-common.{pre|postinst}: Backup /usr/share/eucalytpus

=== modified file 'debian/eucalyptus-java-common.postinst'
--- old/debian/eucalyptus-java-common.postinst	2010-09-10 11:20:06 +0000
+++ new/debian/eucalyptus-java-common.postinst	2010-09-28 18:47:04 +0000
@@ -3,11 +3,16 @@
 if [ "$1" = "configure" ]; then
 	if dpkg --compare-versions "$2" lt-nl 2.0-0ubuntu1; then
 		# Handled upgrades from Lucid; backup dir was prepared in eucalyptus-java-common.preinst
+		# Ensure eucalyptus is stopped for this process
+		stop eucalyptus || true
+		LANG=C status eucalyptus | grep "stop/waiting"
 		# Do the upgrade
 		mkdir -p -m 700 /var/lib/eucalyptus/db
 		chown eucalyptus:eucalyptus /var/lib/eucalyptus/db
 		/usr/lib/eucalyptus/euca_upgrade --db --new / --old /var/backups/eucalyptus/UPGRADE_IN_PROGRESS.eucalyptus-java-common
 		rm -f /var/backups/eucalyptus/UPGRADE_IN_PROGRESS.eucalyptus-java-common
+		# Start eucalyptus again.
+		start eucalyptus || true
 	fi
 fi