diff -u corosync-1.2.0/debian/corosync.init corosync-1.2.0/debian/corosync.init
--- corosync-1.2.0/debian/corosync.init
+++ corosync-1.2.0/debian/corosync.init
@@ -64,8 +64,8 @@
 	#   1 if daemon was already stopped
 	#   2 if daemon could not be stopped
 	#   other if a failure occurred
-	start-stop-daemon --stop --quiet --signal=QUIT --retry=5 --pidfile $PIDFILE
-	RETVAL="$?"
+        start-stop-daemon --stop --quiet --retry=QUIT/5/QUIT/15 --pidfile $PIDFILE
+        RETVAL="$?"
 	[ "$RETVAL" = 2 ] && return 2
 	# Many daemons don't delete their pidfiles when they exit.
 	rm -f $PIDFILE
diff -u corosync-1.2.0/debian/changelog corosync-1.2.0/debian/changelog
--- corosync-1.2.0/debian/changelog
+++ corosync-1.2.0/debian/changelog
@@ -1,8 +1,27 @@
-corosync (1.2.0-1) unstable; urgency=low
+corosync (1.2.0-0ubuntu0ppa2) lucid; urgency=low
 
-  * [0538e91] Imported Upstream version 1.2.0
+  * Raised consensus time out to 5000ms
 
- -- Guido Günther <agx@sigxcpu.org>  Thu, 14 Jan 2010 13:11:26 +0100
+ -- Ante Karamatic <ivoks@ubuntu.com>  Sat, 30 Jan 2010 08:22:33 +0000
+
+corosync (1.2.0-0ubuntu0ppa1) lucid; urgency=low
+
+  * New upstream release
+
+ -- Ante Karamatic <ivoks@ubuntu.com>  Fri, 29 Jan 2010 13:47:58 +0000
+
+corosync (1.1.2-1ubuntu1ppa1) lucid; urgency=low
+
+  * Drop workaround for a shutdown bug in pacemaker
+
+ -- Ante Karamatic <ivoks@ubuntu.com>  Tue, 12 Jan 2010 06:14:14 +0000
+
+corosync (1.1.2-1ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing.
+  * Removed 0003-corosync-keygen.patch
+
+ -- Ante Karamatic <ivoks@ubuntu.com>  Sun, 03 Jan 2010 10:27:28 +0100
 
 corosync (1.1.2-1) unstable; urgency=low
 
@@ -42,6 +61,21 @@
 
  -- Guido Günther <agx@sigxcpu.org>  Sat, 03 Oct 2009 19:10:31 +0200
 
+corosync (1.0.0-5ubuntu1) karmic; urgency=low
+
+  * debian/corosync.init:
+    - workaround for a shutdown bug in pacemaker
+  * debian/patches/0003-corosync-keygen.patch:
+    - wait for entrophy, don't just die with insane output
+
+ -- Ante Karamatic <ivoks@ubuntu.com>  Thu, 15 Oct 2009 00:56:38 +0200
+
+corosync (1.0.0-5build1) karmic; urgency=low
+
+  * Fakesync (different orig.tar.gz). (LP: #426652)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 10 Sep 2009 09:33:10 +0200
+
 corosync (1.0.0-5) experimental; urgency=low
 
   [ Ante Karamatić ]
diff -u corosync-1.2.0/debian/corosync.example-config corosync-1.2.0/debian/corosync.example-config
--- corosync-1.2.0/debian/corosync.example-config
+++ corosync-1.2.0/debian/corosync.example-config
@@ -13,7 +13,7 @@
 	join: 60
 
 	# How long to wait for consensus to be achieved before starting a new round of membership configuration (ms)
-	consensus: 1500
+	consensus: 5000
 
 	# Turn off the virtual synchrony filter
 	vsftype: none
