diff -u redhat-cluster-3.0.12/debian/changelog redhat-cluster-3.0.12/debian/changelog
--- redhat-cluster-3.0.12/debian/changelog
+++ redhat-cluster-3.0.12/debian/changelog
@@ -1,13 +1,8 @@
-redhat-cluster (3.0.12-3.2) unstable; urgency=low
+redhat-cluster (3.0.12-3.2+rpi1) wheezy; urgency=low
 
-  * Non-maintainer upload.
-  * Add 0006-Fix-FTBFS-due-to-moved-header-files.patch patch.
-    Fix FTBFS due to moved header files. (Closes: #669446)
-  * Add 0007-Add-remote_fs-to-Required-Start-and-Required-Stop.patch patch.
-    Add $remote_fs to Required-Start and Required-Stop to fix lintian error
-    E: init.d-script-missing-dependency-on-remote_fs.
+  * add 0006-moved-pacemaker-header-files.patch from bug 669446 to fix FTBFS
 
- -- Salvatore Bonaccorso <carnil@debian.org>  Sat, 07 Jul 2012 05:07:20 +0200
+ -- Peter Michael Green <plugwash@p10link.net>  Fri, 25 May 2012 23:36:25 +0000
 
 redhat-cluster (3.0.12-3.1) unstable; urgency=low
 
diff -u redhat-cluster-3.0.12/debian/patches/series redhat-cluster-3.0.12/debian/patches/series
--- redhat-cluster-3.0.12/debian/patches/series
+++ redhat-cluster-3.0.12/debian/patches/series
@@ -6,2 +6 @@
-0006-Fix-FTBFS-due-to-moved-header-files.patch
-0007-Add-remote_fs-to-Required-Start-and-Required-Stop.patch
+0006-moved-pacemaker-header-files.patch
reverted:
--- redhat-cluster-3.0.12/debian/patches/0007-Add-remote_fs-to-Required-Start-and-Required-Stop.patch
+++ redhat-cluster-3.0.12.orig/debian/patches/0007-Add-remote_fs-to-Required-Start-and-Required-Stop.patch
@@ -1,32 +0,0 @@
-Description: Add $remote_fs to Required-Start and Required-Stop
-Origin: vendor
-Forwarded: no
-Author: Salvatore Bonaccorso <carnil@debian.org>
-Last-Update: 2012-07-07
-
---- a/gfs/init.d/gfs.in
-+++ b/gfs/init.d/gfs.in
-@@ -7,8 +7,8 @@
- 
- ### BEGIN INIT INFO
- # Provides:		gfs
--# Required-Start:	$network cman
--# Required-Stop:	$network cman
-+# Required-Start:	$network cman $remote_fs
-+# Required-Stop:	$network cman $remote_fs
- # Default-Start:	S
- # Default-Stop: 	0 6
- # Short-Description:	mount/unmount gfs filesystems configured in /etc/fstab
---- a/gfs2/init.d/gfs2.in
-+++ b/gfs2/init.d/gfs2.in
-@@ -7,8 +7,8 @@
- 
- ### BEGIN INIT INFO
- # Provides:		gfs2
--# Required-Start:	$network cman
--# Required-Stop:	$network cman
-+# Required-Start:	$network cman $remote_fs
-+# Required-Stop:	$network cman $remote_fs
- # Default-Start:	S
- # Default-Stop: 	0 6
- # Short-Description:	mount/unmount gfs2 filesystems configured in /etc/fstab
reverted:
--- redhat-cluster-3.0.12/debian/patches/0006-Fix-FTBFS-due-to-moved-header-files.patch
+++ redhat-cluster-3.0.12.orig/debian/patches/0006-Fix-FTBFS-due-to-moved-header-files.patch
@@ -1,36 +0,0 @@
-From: Salvatore Bonaccorso <carnil@debian.org>
-Date: Fri, 6 Jul 2012 02:10:20 +0200
-Subject: Fix FTBFS due to moved header files
-
-Closes: #669446
----
- group/dlm_controld/pacemaker.c   |    2 +-
- group/gfs_controld/member_pcmk.c |    2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/group/dlm_controld/pacemaker.c b/group/dlm_controld/pacemaker.c
-index 93c1841..8df6da3 100644
---- a/group/dlm_controld/pacemaker.c
-+++ b/group/dlm_controld/pacemaker.c
-@@ -16,7 +16,7 @@
- #undef SUPPORT_HEARTBEAT 
- #define SUPPORT_HEARTBEAT 0
- #include <pacemaker/crm/common/cluster.h>
--#include <pacemaker/crm/common/stack.h>
-+#include <pacemaker/crm/cluster/stack.h>
- #include <pacemaker/crm/common/ipc.h>
- #include <pacemaker/crm/msg_xml.h>
- #include <pacemaker/crm/cib.h>
-diff --git a/group/gfs_controld/member_pcmk.c b/group/gfs_controld/member_pcmk.c
-index 4a99b50..d0bcbac 100644
---- a/group/gfs_controld/member_pcmk.c
-+++ b/group/gfs_controld/member_pcmk.c
-@@ -14,7 +14,7 @@
- #undef SUPPORT_HEARTBEAT 
- #define SUPPORT_HEARTBEAT 0
- #include <pacemaker/crm/common/cluster.h>
--#include <pacemaker/crm/common/stack.h>
-+#include <pacemaker/crm/cluster/stack.h>
- #include <pacemaker/crm/common/ipc.h>
- #include <pacemaker/crm/msg_xml.h>
- #include <pacemaker/crm/ais.h>
only in patch2:
unchanged:
--- redhat-cluster-3.0.12.orig/debian/patches/0006-moved-pacemaker-header-files.patch
+++ redhat-cluster-3.0.12/debian/patches/0006-moved-pacemaker-header-files.patch
@@ -0,0 +1,28 @@
+Description: Fix FTBFS due to moved header files
+Origin: vendor
+Bug-Debian: http://bugs.debian.org/669446
+Author: Salvatore Bonaccorso <carnil@debian.org>
+Last-Update: 2012-05-05
+
+--- a/group/dlm_controld/pacemaker.c
++++ b/group/dlm_controld/pacemaker.c
+@@ -16,7 +16,7 @@
+ #undef SUPPORT_HEARTBEAT 
+ #define SUPPORT_HEARTBEAT 0
+ #include <pacemaker/crm/common/cluster.h>
+-#include <pacemaker/crm/common/stack.h>
++#include <pacemaker/crm/cluster/stack.h>
+ #include <pacemaker/crm/common/ipc.h>
+ #include <pacemaker/crm/msg_xml.h>
+ #include <pacemaker/crm/cib.h>
+--- a/group/gfs_controld/member_pcmk.c
++++ b/group/gfs_controld/member_pcmk.c
+@@ -14,7 +14,7 @@
+ #undef SUPPORT_HEARTBEAT 
+ #define SUPPORT_HEARTBEAT 0
+ #include <pacemaker/crm/common/cluster.h>
+-#include <pacemaker/crm/common/stack.h>
++#include <pacemaker/crm/cluster/stack.h>
+ #include <pacemaker/crm/common/ipc.h>
+ #include <pacemaker/crm/msg_xml.h>
+ #include <pacemaker/crm/ais.h>