diff -ruN corosync-1.3.0/debian/changelog corosync-1.4.2/debian/changelog
--- corosync-1.3.0/debian/changelog	2011-05-26 19:02:54.000000000 +0000
+++ corosync-1.4.2/debian/changelog	2011-10-19 14:32:23.000000000 +0000
@@ -1,10 +1,21 @@
-corosync (1.3.0-3ubuntu1) oneiric; urgency=low
+corosync (1.4.2-1) unstable; urgency=low
 
-  * Resync from debian unstable (LP: #787062).
-  * debian/corosync.init: Ensure that '/var/run/resource-agents' is created;
-    otherwise cluster operations will fail as RA's expect it (LP: #751344).
+  * Changed my email address in debian/control
+  * Add corosync-blackbox to the corosync package
+  * Imported Upstream version 1.4.2
 
- -- Andres Rodriguez <andreserl@ubuntu.com>  Thu, 26 May 2011 21:02:54 +0200
+ -- Martin Loschwitz <madkiss@debian.org>  Wed, 19 Oct 2011 14:32:18 +0000
+
+corosync (1.4.1-1) unstable; urgency=low
+
+  [ Andres Rodriguez ]
+  * [ec94d30] Ensure that '/var/run/resource-agents' is created.
+    (Closes: #627685) (LP: #787062)
+
+  [ Guido Günther ]
+  * [9f10a99] New upstream version 1.4.1
+
+ -- Guido Günther <agx@sigxcpu.org>  Wed, 24 Aug 2011 09:27:33 +0200
 
 corosync (1.3.0-3) unstable; urgency=low
 
diff -ruN corosync-1.3.0/debian/control corosync-1.4.2/debian/control
--- corosync-1.3.0/debian/control	2011-05-26 19:02:53.000000000 +0000
+++ corosync-1.4.2/debian/control	2011-10-19 14:29:28.000000000 +0000
@@ -1,9 +1,8 @@
 Source: corosync
 Section: admin
 Priority: optional
-Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
-XSBC-Original-Maintainer: Debian HA Maintainers <debian-ha-maintainers@lists.alioth.debian.org>
-Uploaders: Martin Gerhard Loschwitz <martin.loschwitz@linbit.com>, Guido Günther <agx@sigxcpu.org>
+Maintainer: Debian HA Maintainers <debian-ha-maintainers@lists.alioth.debian.org>
+Uploaders: Martin Loschwitz <madkiss@debian.org>, Guido Günther <agx@sigxcpu.org>
 Standards-Version: 3.9.1
 Build-Depends: debhelper (>> 5), libnss3-dev, pkg-config, groff
 Vcs-Git: git://git.debian.org/debian-ha/corosync.git
diff -ruN corosync-1.3.0/debian/corosync.install corosync-1.4.2/debian/corosync.install
--- corosync-1.3.0/debian/corosync.install	2010-07-02 11:53:32.000000000 +0000
+++ corosync-1.4.2/debian/corosync.install	2011-10-19 14:30:04.000000000 +0000
@@ -1,4 +1,5 @@
 usr/sbin
+usr/bin/corosync-blackbox
 usr/share/man/man5
 usr/share/man/man8
 usr/lib/lcrso