diff -Nru postgresql-common-129/debian/changelog postgresql-common-129ubuntu1/debian/changelog
--- postgresql-common-129/debian/changelog	2012-03-06 11:00:13.000000000 +0000
+++ postgresql-common-129ubuntu1/debian/changelog	2012-09-06 13:01:02.000000000 +0000
@@ -1,3 +1,15 @@
+postgresql-common (129ubuntu1) precise-proposed; urgency=low
+
+  * pg_ctlcluster: Do not remove the PID file after SIGKILLing the
+    postmaster in the "last-ditch effort to shut down" in --force mode. This
+    is a potentially dangerous thing to do when trying to start a second
+    postmaster in parallel while the first one is still being shut down.
+    (see http://archives.postgresql.org/pgsql-general/2012-07/msg00475.php)
+    Backported from trunk r1181. (LP: #1042556)
+  * debian/control: Update Vcs-* for new precise branch.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Thu, 06 Sep 2012 15:01:02 +0200
+
 postgresql-common (129) unstable; urgency=low
 
   * pg_ctlcluster: Fix wrong configuration file name in documentation, thanks
diff -Nru postgresql-common-129/debian/control postgresql-common-129ubuntu1/debian/control
--- postgresql-common-129/debian/control	2012-03-06 10:58:55.000000000 +0000
+++ postgresql-common-129ubuntu1/debian/control	2012-09-06 13:00:33.000000000 +0000
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Martin Pitt <mpitt@debian.org>
 Standards-Version: 3.9.3
-Vcs-Bzr: https://code.launchpad.net/~pitti/postgresql/common/
-Vcs-Browser: http://bazaar.launchpad.net/~pitti/postgresql/common/changes
+Vcs-Bzr: https://code.launchpad.net/~ubuntu-core-dev/postgresql/common-precise
+Vcs-Browser: http://bazaar.launchpad.net/~ubuntu-core-dev/postgresql/common-precise
 Build-Depends: debhelper (>= 7.0.50~)
 
 Package: postgresql-common
diff -Nru postgresql-common-129/pg_ctlcluster postgresql-common-129ubuntu1/pg_ctlcluster
--- postgresql-common-129/pg_ctlcluster	2012-01-18 06:07:00.000000000 +0000
+++ postgresql-common-129ubuntu1/pg_ctlcluster	2012-09-06 12:54:56.000000000 +0000
@@ -260,7 +260,6 @@
             print "(does not shutdown, killing the process)";
             $pid = get_running_pid $info{'pgdata'}.'/postmaster.pid';
             kill (9, $pid) if $pid;
-            unlink $info{'pgdata'}.'/postmaster.pid';
 	    $result = 0;
         }
     } else {