diff -Nru redhat-cluster-3.0.4/debian/changelog redhat-cluster-3.0.7/debian/changelog
--- redhat-cluster-3.0.4/debian/changelog	2010-02-08 16:56:18.000000000 +0000
+++ redhat-cluster-3.0.7/debian/changelog	2010-02-08 16:56:18.000000000 +0000
@@ -1,15 +1,106 @@
-redhat-cluster (3.0.4-2.1~bpo50+1) lenny-backports; urgency=low
+redhat-cluster (3.0.7-0ubuntu0ppa1) lucid; urgency=low
 
-  * Rebuild for lenny-backports.
+  * New upstream release
+  * Remove GFS packages
 
- -- Martin Loschwitz <madkiss@debian.org>  Tue, 03 Nov 2009 17:24:38 +0000
+ -- Ante Karamatic <ivoks@ubuntu.com>  Mon, 08 Feb 2010 03:10:28 +0000
 
-redhat-cluster (3.0.4-2.1) experimental; urgency=low
+redhat-cluster (3.0.6-5ubuntu0ppa1) lucid; urgency=low
 
-  * Non-maintainer upload.
-  * Enable pacemaker-related features in RHCS
+  [ Ante Karamatic ]
+  * Merge from Debian
+  * Added build deps:  pkg-config, libglib2.0-dev, libbz2-dev, cluster-glue-dev
+
+  [ Martin Loschwitz ]
+  * Enable pacemaker-related features in RHCS:
+    - debian/rules: --enable_pacemaker
+    - debian/control: add pacemaker-gfs and pacemaker-dlm
+    - debian/control: add pacemaker-dev to build deps
+    - debian/pacemaker*
+
+ -- Ante Karamatic <ivoks@ubuntu.com>  Wed, 03 Feb 2010 17:13:44 +0000
+
+redhat-cluster (3.0.6-5) unstable; urgency=low
+
+  * [ebda28c] Don't ship drbd resource script (Closes: #566095)
+
+ -- Guido Günther <agx@sigxcpu.org>  Fri, 22 Jan 2010 20:45:52 +0100
+
+redhat-cluster (3.0.6-4) unstable; urgency=low
+
+  * [9725a65] Only install schema (Closes: #565382)
+
+ -- Guido Günther <agx@sigxcpu.org>  Fri, 15 Jan 2010 16:39:40 +0100
+
+redhat-cluster (3.0.6-3) unstable; urgency=low
+
+  * Upload to unstable
+  * [19bd29c] Depend on cman (Closes: #563787)
+  * [2a019fa] Genereate proper depends for lcsos
+  * [e276e1d] Add schema
+
+ -- Guido Günther <agx@sigxcpu.org>  Mon, 11 Jan 2010 21:00:27 +0100
+
+redhat-cluster (3.0.6-2) experimental; urgency=low
+
+  * [e16890c] Update de.po (Closes: #562707) - thanks to Helge Kreutzmann
+  * [e1b336d] Update pt debconf translation (Closes: #563015) - thanks to
+    Américo Monteiro
+  * [e01aa76] Update ru debconf translation (Closes: #563345) - thanks to Yuri
+    Kozlov
+  * [f959fd1] Update sv debconf translation (Closes: #562928) - thanks to
+    Martin Bagge
+  * [bbb4b4a] Run debconf-updatepo
+
+ -- Guido Günther <agx@sigxcpu.org>  Sat, 02 Jan 2010 14:53:45 +0100
+
+redhat-cluster (3.0.6-1) experimental; urgency=low
+
+  * [b3b823a] Imported Upstream version 3.0.6
+  * [3e69621] run debconf-updatepo during clean
+  * [cb83708] build-depend on po-debconf
+  * [b8b59d7] remove one more trailing whitespace
+  * [ccd9a39] Depend on libxml2-utils for ccs_config_validate
+  * [ff09490] redo patches
+  * [08a23fa] Do nothing if cman_tool isn't there so we don't report an error
+    if the package was removed but not purged.
+  * [bbec984] Drop 0003-add-LD_LIBRARY_PATH-so-we-find-liblogthread.patch
+    - applied upstream.
+  * [0d930b4] Bump {build-,}dependencies on openais and corosync
+  * [c616ee4] de.po: Remove fuzziness
+
+ -- Guido Günther <agx@sigxcpu.org>  Sun, 27 Dec 2009 14:41:33 +0100
+
+redhat-cluster (3.0.4-3) unstable; urgency=low
+
+  * upload to unstable
+  * [6c11f54] Sanitize template an description wordings (Closes: #461839,
+    #551538) - thanks to Justin B Rye and Christian Perrier
+  * [6c96dd4] add Vcs-{Git,Browser}
+  * [e825aa0] adjust debconf note to cluster 3
+  * [6d723ef] Update documentation pointers
+  * [944f6d0] Add sv debconf translation (Closes: #554027)
+    thanks to Martin Ågren, Christian Perrier
+  * [1b8c2bb] Add finish debconf translation (Closes: #554477)
+    thanks to Esko Arajärvi
+  * [9fef8a5] Add pt debconf translation (Closes: #554288)
+    thanks to Miguel Figueiredo
+  * [da9a159] Add eu debconf translation (Closes: #554539)
+    thanks to dooteo
+  * [e9feac4] Add de debconf translation (Closes: #554813)
+    thanks to Helge Kreutzmann
+  * [9a5b0a6] Add cs debconf translation (Closes: #554958)
+    thanks to Michal Simunek
+  * [b0c4d0e] Add fr debconf translation (Closes: #555084)
+    thanks to Christian Perrier
+  * [e806240] Add es debconf translation (Closes: #556033)
+    thanks to Francisco Javier Cuadrado
+  * [8419b94] Add it debconf translation (Closes: #556041)
+    thanks to Vincenzo Campanella
+  * [8e80d85] Add ru debconf translation (Closes: #556190)
+    thanks to Yuri Kozlov
 
- -- Martin Loschwitz <madkiss@debian.org>  Tue, 03 Nov 2009 16:32:45 +0000
+ -- Guido Günther <agx@sigxcpu.org>  Mon, 16 Nov 2009 18:39:59 +0100
 
 redhat-cluster (3.0.4-2) experimental; urgency=low
 
@@ -35,11 +126,13 @@
 
  -- Guido Günther <agx@sigxcpu.org>  Sun, 25 Oct 2009 23:50:21 +0100
 
-redhat-cluster (3.0.2-5) UNRELEASED; urgency=low
+redhat-cluster (3.0.2-5) unstable; urgency=low
 
-  * [2deb213] add watch file
+  * [2deb213] Add watch file
+  * [a121c74] Fix dependency based boot based on a patch by Peter
+    Reinholdtsen Closes; #541980
 
- -- Guido Günther <agx@sigxcpu.org>  Sun, 25 Oct 2009 23:50:04 +0100
+ -- Guido Günther <agx@sigxcpu.org>  Tue, 13 Oct 2009 22:29:22 +0200
 
 redhat-cluster (3.0.2-4) unstable; urgency=low
 
@@ -60,6 +153,14 @@
 
  -- Guido Günther <agx@sigxcpu.org>  Mon, 05 Oct 2009 20:59:25 +0200
 
+redhat-cluster (3.0.2-2ubuntu1) karmic; urgency=low
+
+  * Remove unnecessary build dep on libvolume-id-dev
+
+ -- Ante Karamatic <ivoks@ubuntu.com>  Tue, 15 Sep 2009 07:15:43 +0200
+
+redhat-cluster (3.0.2-2) experimental; urgency=low
+
 redhat-cluster (3.0.2-2) experimental; urgency=low
 
   * [feeb1a2] don't .gitignore README.source
diff -Nru redhat-cluster-3.0.4/debian/cman.postinst redhat-cluster-3.0.7/debian/cman.postinst
--- redhat-cluster-3.0.4/debian/cman.postinst	1970-01-01 00:00:00.000000000 +0000
+++ redhat-cluster-3.0.7/debian/cman.postinst	2010-02-08 16:56:18.000000000 +0000
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+# Those using dependency based boot sequencing with sysv-rc and
+# installing cman before version 2.20081102-1.1 would have wrong
+# runlevel symlinks.  Recover from this.
+if [ "$1" = "configure" ] && dpkg --compare-versions "$2" le "3.0.2-5" \
+   && [ -f /etc/rc2.d/S[0-9][0-9]cman ] && [ ! -f /etc/rcS.d/S[0-9][0-9]cman ]
+then
+    update-rc.d -f cman remove
+fi
+
+#DEBHELPER#
diff -Nru redhat-cluster-3.0.4/debian/cman.preinst redhat-cluster-3.0.7/debian/cman.preinst
--- redhat-cluster-3.0.4/debian/cman.preinst	2010-02-08 16:56:18.000000000 +0000
+++ redhat-cluster-3.0.7/debian/cman.preinst	2010-02-08 16:56:18.000000000 +0000
@@ -6,7 +6,7 @@
 	upgrade)
 		. /usr/share/debconf/confmodule
 		db_version 2.0
-		if dpkg --compare-versions "$2" lt 2.0 ; then
+		if dpkg --compare-versions "$2" lt 3.0.0~ ; then
 			db_fset cman/upgrade-warning seen false
 			db_input critical cman/upgrade-warning || true
 			db_go
@@ -14,8 +14,6 @@
 			db_get cman/upgrade-warning
 			if [ "$RET" = "true" ] ; then
 				echo "Aborting cman installation."
-				echo " For upgrade instructions, please refer to" 
-				echo "http://wiki.debian.org/UpgradeRHCSV1toV2"
 				exit 1
 			fi
 		fi
diff -Nru redhat-cluster-3.0.4/debian/cman.templates redhat-cluster-3.0.7/debian/cman.templates
--- redhat-cluster-3.0.4/debian/cman.templates	2010-02-08 16:56:18.000000000 +0000
+++ redhat-cluster-3.0.7/debian/cman.templates	2010-02-08 16:56:18.000000000 +0000
@@ -12,6 +12,6 @@
 Default: false
 _Description: Do you want to abort the Red Hat Cluster Suite upgrade?
  The new version 3 of the Red Hat Cluster Suite is not compatible with
- the currently installed one. Upgrading these packages without stopping 
+ the currently installed one. Upgrading these packages without stopping
  the complete cluster can cause file system corruption on shared storage
  devices.
diff -Nru redhat-cluster-3.0.4/debian/control redhat-cluster-3.0.7/debian/control
--- redhat-cluster-3.0.4/debian/control	2010-02-08 16:56:18.000000000 +0000
+++ redhat-cluster-3.0.7/debian/control	2010-02-08 16:56:18.000000000 +0000
@@ -5,19 +5,26 @@
 Uploaders: Bastian Blank <waldi@debian.org>, Frederik Schüler <fs@debian.org>,
  Guido Günther <agx@sigxcpu.org> 
 Standards-Version: 3.8.3
+Vcs-Browser: http://git.debian.org/?p=debian-ha/redhat-cluster.git;a=summary
+Vcs-Git: git://git.debian.org/debian-ha/redhat-cluster.git
 Build-Depends: quilt, debhelper (>= 5), libxml2-dev, libncurses5-dev,
  linux-libc-dev, libvirt-dev (>= 0.3.0), libnss3-dev, libnspr4-dev, bzip2, libslang2-dev, libldap2-dev, perl-modules,
- libcorosync-dev (>= 1.1.0),
- libopenais-dev (>= 1.1.0),
+ libcorosync-dev (>= 1.1.2),
+ libopenais-dev (>= 1.1.1),
  xsltproc,
  python-pexpect,
- pacemaker-dev (>= 1.0.6)
+ po-debconf,
+ pacemaker-dev (>= 1.0.6),
+ pkg-config,
+ libglib2.0-dev,
+ libbz2-dev,
+ cluster-glue-dev
 
 Package: redhat-cluster-suite
 Section: admin
 Priority: optional
 Architecture: all
-Depends: ${misc:Depends}, cman, gfs-tools, gfs2-tools, rgmanager, clvm
+Depends: ${misc:Depends}, cman, gfs2-tools, rgmanager, clvm
 Description: Red Hat cluster suite - metapackage
  RHCS is a cluster management infrastructure, for building
  high-availability multi-node clusters with service and IP failover on
@@ -30,10 +37,10 @@
 Architecture: any
 Section: admin
 Pre-Depends: debconf | debconf-2.0
-Depends: ${misc:Depends}, ${shlibs:Depends}, corosync (>= 1.1.0),
- openais (>= 1.1.0), python, openipmi, sg3-utils, python-pexpect,
+Depends: ${misc:Depends}, ${shlibs:Depends}, corosync (>= 1.1.2),
+ openais (>= 1.1.1), python, openipmi, sg3-utils, python-pexpect,
  libnet-snmp-perl, libnet-telnet-perl, snmp, telnet, openssh-client,
- python-openssl
+ python-openssl, libxml2-utils
 Conflicts: libdlm-dev (<= 2.20090112-0ubuntu3)
 Description: Red Hat cluster suite - cluster manager
  This package is part of the Red Hat Cluster Suite, a complete
@@ -224,30 +231,9 @@
  This package contains the files needed for developing applications
  that need to request node fencing.
 
-Package: gfs-tools
-Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, gfs2-tools
-Recommends: redhat-cluster-modules
-Section: admin
-Description: Red Hat cluster suite - global file system tools
- This package is part of the Red Hat Cluster Suite, a complete
- high-availability solution.
- .
- The Global File System allows a cluster of machines to concurrently access
- shared storage hardware like SANs or iSCSI and network block devices. GFS
- can be deployed to build high-availability services without the single point
- of failure of a file server.
- .
- This package contains tools for creating and managing global file systems.
- GFS itself is a set of kernel modules.
- .
- Note: the package requires gfs2-tools installed; this is known to be
- reliable even though the GFS2 kernel modules themselves are highly
- experimental and *MUST NOT* be used in a production environment yet.
-
 Package: gfs2-tools
 Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, psmisc
+Depends: ${misc:Depends}, ${shlibs:Depends}, psmisc, cman
 Section: admin
 Description: Red Hat cluster suite - global file system 2 tools
  This package is part of the Red Hat Cluster Suite, a complete
diff -Nru redhat-cluster-3.0.4/debian/gfs2-tools.postinst redhat-cluster-3.0.7/debian/gfs2-tools.postinst
--- redhat-cluster-3.0.4/debian/gfs2-tools.postinst	1970-01-01 00:00:00.000000000 +0000
+++ redhat-cluster-3.0.7/debian/gfs2-tools.postinst	2010-02-08 16:56:18.000000000 +0000
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+# Those using dependency based boot sequencing with sysv-rc and
+# installing gfs2-tools before version 2.20081102-1.1 would have wrong
+# runlevel symlinks.  Recover from this.
+if [ "$1" = "configure" ] && dpkg --compare-versions "$2" le "3.0.2-5" \
+   && [ -f /etc/rc2.d/S[0-9][0-9]gfs2-tools ] && [ ! -f /etc/rcS.d/S[0-9][0-9]gfs2-tools ]
+then
+    update-rc.d -f gfs2-tools remove
+fi
+
+#DEBHELPER#
diff -Nru redhat-cluster-3.0.4/debian/gfs-tools.docs redhat-cluster-3.0.7/debian/gfs-tools.docs
--- redhat-cluster-3.0.4/debian/gfs-tools.docs	2010-02-08 16:56:18.000000000 +0000
+++ redhat-cluster-3.0.7/debian/gfs-tools.docs	1970-01-01 00:00:00.000000000 +0000
@@ -1 +0,0 @@
-doc/usage.txt
diff -Nru redhat-cluster-3.0.4/debian/gfs-tools.install redhat-cluster-3.0.7/debian/gfs-tools.install
--- redhat-cluster-3.0.4/debian/gfs-tools.install	2010-02-08 16:56:18.000000000 +0000
+++ redhat-cluster-3.0.7/debian/gfs-tools.install	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@
-sbin/fsck.gfs
-usr/sbin/gfs_debug
-usr/sbin/gfs_grow
-usr/sbin/gfs_jadd
-sbin/mkfs.gfs
-usr/sbin/gfs_quota
-usr/sbin/gfs_tool
-usr/share/man/man8/gfs.8
-usr/share/man/man8/fsck.gfs.8
-usr/share/man/man8/gfs_grow.8
-usr/share/man/man8/gfs_jadd.8
-usr/share/man/man8/mkfs.gfs.8
-usr/share/man/man8/mount.gfs.8
-usr/share/man/man8/gfs_quota.8
-usr/share/man/man8/gfs_tool.8
diff -Nru redhat-cluster-3.0.4/debian/gfs-tools.links redhat-cluster-3.0.7/debian/gfs-tools.links
--- redhat-cluster-3.0.4/debian/gfs-tools.links	2010-02-08 16:56:18.000000000 +0000
+++ redhat-cluster-3.0.7/debian/gfs-tools.links	1970-01-01 00:00:00.000000000 +0000
@@ -1,4 +0,0 @@
-usr/sbin/gfs2_edit usr/sbin/gfs_edit
-sbin/mount.gfs2 sbin/mount.gfs
-usr/share/man/man8/gfs2_edit.8.gz usr/share/man/man8/gfs_edit.8.gz
-usr/share/man/man8/mount.gfs2.8.gz usr/share/man/man8/mount.gfs.8.gz
diff -Nru redhat-cluster-3.0.4/debian/patches/0001-add-dlm-kernel-headers.patch redhat-cluster-3.0.7/debian/patches/0001-add-dlm-kernel-headers.patch
--- redhat-cluster-3.0.4/debian/patches/0001-add-dlm-kernel-headers.patch	2010-02-08 16:56:18.000000000 +0000
+++ redhat-cluster-3.0.7/debian/patches/0001-add-dlm-kernel-headers.patch	2010-02-08 16:56:18.000000000 +0000
@@ -3,10 +3,10 @@
 Subject: [PATCH] add dlm kernel headers
 
 ---
- dlm/include/linux/dlm.h          |  169 ++++++++++++++++++++++++++++++++++++++
- dlm/include/linux/dlm_device.h   |  112 +++++++++++++++++++++++++
+ dlm/include/linux/dlm.h          |  168 ++++++++++++++++++++++++++++++++++++++
+ dlm/include/linux/dlm_device.h   |  111 +++++++++++++++++++++++++
  dlm/include/linux/dlm_netlink.h  |   56 +++++++++++++
- dlm/include/linux/dlm_plock.h    |   50 +++++++++++
+ dlm/include/linux/dlm_plock.h    |   49 +++++++++++
  dlm/include/linux/dlmconstants.h |  163 ++++++++++++++++++++++++++++++++++++
  dlm/libdlm/Makefile              |    2 +-
  dlm/libdlmcontrol/Makefile       |    1 +
@@ -14,7 +14,7 @@
  group/dlm_controld/Makefile      |    1 +
  group/gfs_controld/Makefile      |    1 +
  group/tool/Makefile              |    1 +
- 11 files changed, 556 insertions(+), 1 deletions(-)
+ 11 files changed, 553 insertions(+), 1 deletions(-)
  create mode 100644 dlm/include/linux/dlm.h
  create mode 100644 dlm/include/linux/dlm_device.h
  create mode 100644 dlm/include/linux/dlm_netlink.h
@@ -23,10 +23,10 @@
 
 diff --git a/dlm/include/linux/dlm.h b/dlm/include/linux/dlm.h
 new file mode 100644
-index 0000000..203a025
+index 0000000..fbdfe89
 --- /dev/null
 +++ b/dlm/include/linux/dlm.h
-@@ -0,0 +1,169 @@
+@@ -0,0 +1,168 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -195,13 +195,12 @@
 +#endif				/* __KERNEL__ */
 +
 +#endif				/* __DLM_DOT_H__ */
-+
 diff --git a/dlm/include/linux/dlm_device.h b/dlm/include/linux/dlm_device.h
 new file mode 100644
-index 0000000..4361244
+index 0000000..7754932
 --- /dev/null
 +++ b/dlm/include/linux/dlm_device.h
-@@ -0,0 +1,112 @@
+@@ -0,0 +1,111 @@
 +/******************************************************************************
 +*******************************************************************************
 +**
@@ -313,7 +312,6 @@
 +#define DLM_USER_LSFLG_FORCEFREE  2
 +
 +#endif
-+
 diff --git a/dlm/include/linux/dlm_netlink.h b/dlm/include/linux/dlm_netlink.h
 new file mode 100644
 index 0000000..1927633
@@ -378,10 +376,10 @@
 +#endif /* _DLM_NETLINK_H */
 diff --git a/dlm/include/linux/dlm_plock.h b/dlm/include/linux/dlm_plock.h
 new file mode 100644
-index 0000000..18d5fdb
+index 0000000..f2eff75
 --- /dev/null
 +++ b/dlm/include/linux/dlm_plock.h
-@@ -0,0 +1,50 @@
+@@ -0,0 +1,49 @@
 +/*
 + * Copyright (C) 2005-2008 Red Hat, Inc.  All rights reserved.
 + *
@@ -431,7 +429,6 @@
 +#endif /* __KERNEL__ */
 +
 +#endif
-+
 diff --git a/dlm/include/linux/dlmconstants.h b/dlm/include/linux/dlmconstants.h
 new file mode 100644
 index 0000000..47bf08d
@@ -639,7 +636,7 @@
  CFLAGS += -I$(SRCDIR)/group/dlm_controld/
  CFLAGS += -I${incdir}
 diff --git a/group/dlm_controld/Makefile b/group/dlm_controld/Makefile
-index cd6c950..602ff67 100644
+index f9a2d05..5ee9171 100644
 --- a/group/dlm_controld/Makefile
 +++ b/group/dlm_controld/Makefile
 @@ -35,6 +35,7 @@ CFLAGS += -I${ccsincdir} -I${cmanincdir} -I${logtincdir}
diff -Nru redhat-cluster-3.0.4/debian/patches/0002-add-LD_LIBRARY_PATH-so-we-find-liblogthread.patch redhat-cluster-3.0.7/debian/patches/0002-add-LD_LIBRARY_PATH-so-we-find-liblogthread.patch
--- redhat-cluster-3.0.4/debian/patches/0002-add-LD_LIBRARY_PATH-so-we-find-liblogthread.patch	2010-02-08 16:56:18.000000000 +0000
+++ redhat-cluster-3.0.7/debian/patches/0002-add-LD_LIBRARY_PATH-so-we-find-liblogthread.patch	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@
-From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
-Date: Mon, 2 Nov 2009 19:44:09 +0100
-Subject: [PATCH] add LD_LIBRARY_PATH so we find liblogthread
-
----
- fence/agents/xvm/Makefile |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/fence/agents/xvm/Makefile b/fence/agents/xvm/Makefile
-index 6215263..31b277f 100644
---- a/fence/agents/xvm/Makefile
-+++ b/fence/agents/xvm/Makefile
-@@ -61,7 +61,7 @@ ${TARGET3}: ${OBJS3}
- 
- $(MANTARGET): $(TARGET1) ${SRCDIR}/fence/agents/lib/fence2man.xsl
- 	set -e && \
--	./$(TARGET1) -o metadata > .$@.tmp && \
-+	LD_LIBRARY_PATH=${logtlibdir} ./$(TARGET1) -o metadata > .$@.tmp && \
- 	xsltproc ${SRCDIR}/fence/agents/lib/fence2man.xsl .$@.tmp > $@
- 
- clean: generalclean
--- 
diff -Nru redhat-cluster-3.0.4/debian/patches/0002-Fix-Default-Start-Stop-for-dependency-based-boot.patch redhat-cluster-3.0.7/debian/patches/0002-Fix-Default-Start-Stop-for-dependency-based-boot.patch
--- redhat-cluster-3.0.4/debian/patches/0002-Fix-Default-Start-Stop-for-dependency-based-boot.patch	1970-01-01 00:00:00.000000000 +0000
+++ redhat-cluster-3.0.7/debian/patches/0002-Fix-Default-Start-Stop-for-dependency-based-boot.patch	2010-02-08 16:56:18.000000000 +0000
@@ -0,0 +1,75 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Tue, 13 Oct 2009 22:25:09 +0200
+Subject: [PATCH] Fix Default-Start/Stop for dependency based boot
+
+based on a patch by Peter Reinholdtsen
+
+Closes; #541980
+---
+ cman/init.d/cman.in           |    4 ++--
+ gfs/init.d/gfs.in             |    4 ++--
+ gfs2/init.d/gfs2.in           |    4 ++--
+ rgmanager/init.d/rgmanager.in |    4 ++--
+ 4 files changed, 8 insertions(+), 8 deletions(-)
+
+diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
+index 68fafd6..f090064 100644
+--- a/cman/init.d/cman.in
++++ b/cman/init.d/cman.in
+@@ -10,8 +10,8 @@
+ # Provides:		cman
+ # Required-Start:	$network $time
+ # Required-Stop:	$network $time
+-# Default-Start:
+-# Default-Stop:
++# Default-Start:	S
++# Default-Stop: 	0 6
+ # Short-Description:	Starts and stops cman
+ # Description:		Starts and stops the Cluster Manager set of daemons
+ ### END INIT INFO
+diff --git a/gfs/init.d/gfs.in b/gfs/init.d/gfs.in
+index 31104b4..031b29b 100644
+--- a/gfs/init.d/gfs.in
++++ b/gfs/init.d/gfs.in
+@@ -9,8 +9,8 @@
+ # Provides:		gfs
+ # Required-Start:	$network cman
+ # Required-Stop:	$network cman
+-# Default-Start:
+-# Default-Stop:
++# Default-Start:	S
++# Default-Stop: 	0 6
+ # Short-Description:	mount/unmount gfs filesystems configured in /etc/fstab
+ # Description:		mount/unmount gfs filesystems configured in /etc/fstab
+ ### END INIT INFO
+diff --git a/gfs2/init.d/gfs2.in b/gfs2/init.d/gfs2.in
+index b28a99a..9f994bd 100644
+--- a/gfs2/init.d/gfs2.in
++++ b/gfs2/init.d/gfs2.in
+@@ -9,8 +9,8 @@
+ # Provides:		gfs2
+ # Required-Start:	$network cman
+ # Required-Stop:	$network cman
+-# Default-Start:
+-# Default-Stop:
++# Default-Start:	S
++# Default-Stop: 	0 6
+ # Short-Description:	mount/unmount gfs2 filesystems configured in /etc/fstab
+ # Description:		mount/unmount gfs2 filesystems configured in /etc/fstab
+ ### END INIT INFO
+diff --git a/rgmanager/init.d/rgmanager.in b/rgmanager/init.d/rgmanager.in
+index 38f7b1f..3b283fe 100644
+--- a/rgmanager/init.d/rgmanager.in
++++ b/rgmanager/init.d/rgmanager.in
+@@ -8,8 +8,8 @@
+ # Provides:		rgmanager
+ # Required-Start:	cman
+ # Required-Stop:	cman
+-# Default-Start:
+-# Default-Stop:
++# Default-Start:	S
++# Default-Stop: 	0 6
+ # Short-Description:	Starts and stops Red Hat Service (resource group) Manager
+ # Description:		Starts and stops Red Hat Service (resource group) Manager
+ ### END INIT INFO
+-- 
diff -Nru redhat-cluster-3.0.4/debian/patches/0003-Do-nothing-if-cman_tool-isn-t-there.patch redhat-cluster-3.0.7/debian/patches/0003-Do-nothing-if-cman_tool-isn-t-there.patch
--- redhat-cluster-3.0.4/debian/patches/0003-Do-nothing-if-cman_tool-isn-t-there.patch	1970-01-01 00:00:00.000000000 +0000
+++ redhat-cluster-3.0.7/debian/patches/0003-Do-nothing-if-cman_tool-isn-t-there.patch	2010-02-08 16:56:18.000000000 +0000
@@ -0,0 +1,23 @@
+From: =?UTF-8?q?Guido=20G=C3=BCnther?= <agx@sigxcpu.org>
+Date: Wed, 25 Nov 2009 22:26:55 +0100
+Subject: [PATCH] Do nothing if cman_tool isn't there
+
+so we don't report an error if the package was removed but not purged.
+---
+ cman/init.d/cman.in |    2 ++
+ 1 files changed, 2 insertions(+), 0 deletions(-)
+
+diff --git a/cman/init.d/cman.in b/cman/init.d/cman.in
+index f090064..0801105 100644
+--- a/cman/init.d/cman.in
++++ b/cman/init.d/cman.in
+@@ -19,6 +19,8 @@
+ # set secure PATH
+ PATH="/bin:/usr/bin:/sbin:/usr/sbin:@SBINDIR@"
+ 
++test -x @SBINDIR@/cman_tool || exit 0
++
+ local_chkconfig()
+ {
+ 	ls /etc/rc${2}.d/S*${3} > /dev/null 2>/dev/null
+-- 
diff -Nru redhat-cluster-3.0.4/debian/patches/series redhat-cluster-3.0.7/debian/patches/series
--- redhat-cluster-3.0.4/debian/patches/series	2010-02-08 16:56:18.000000000 +0000
+++ redhat-cluster-3.0.7/debian/patches/series	2010-02-08 16:56:18.000000000 +0000
@@ -1,2 +1,3 @@
 0001-add-dlm-kernel-headers.patch
-0002-add-LD_LIBRARY_PATH-so-we-find-liblogthread.patch
+0002-Fix-Default-Start-Stop-for-dependency-based-boot.patch
+0003-Do-nothing-if-cman_tool-isn-t-there.patch
diff -Nru redhat-cluster-3.0.4/debian/po/cs.po redhat-cluster-3.0.7/debian/po/cs.po
--- redhat-cluster-3.0.4/debian/po/cs.po	1970-01-01 00:00:00.000000000 +0000
+++ redhat-cluster-3.0.7/debian/po/cs.po	2010-02-08 16:56:18.000000000 +0000
@@ -0,0 +1,34 @@
+# Czech translation of PO debconf template for package redhat-cluster.
+# Copyright (C) 2009 Michal Simunek
+# This file is distributed under the same license as the redhat-cluster package.
+# Michal Simunek <michal.simunek@gmail.com>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: redhat-cluster 3.0.2-5\n"
+"Report-Msgid-Bugs-To: redhat-cluster@packages.debian.org\n"
+"POT-Creation-Date: 2009-11-02 18:24+0100\n"
+"PO-Revision-Date: 2009-11-07 15:12+0100\n"
+"Last-Translator: Michal Simunek <michal.simunek@gmail.com>\n"
+"Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../cman.templates:2001
+msgid "Do you want to abort the Red Hat Cluster Suite upgrade?"
+msgstr "Chcete přerušit aktualizaci sady Red Hat Cluster?"
+
+#. Type: boolean
+#. Description
+#: ../cman.templates:2001
+msgid ""
+"The new version 3 of the Red Hat Cluster Suite is not compatible with the "
+"currently installed one. Upgrading these packages without stopping the "
+"complete cluster can cause file system corruption on shared storage devices."
+msgstr ""
+"Nová verze sady Red Hat Cluster 3 není kompatibilní s nainstalovanou verzí. "
+"Aktualizace těchto balíčků bez pozastavení celého clusteru může způsobit "
+"porušení souborového systému na sdílených úložištích."
diff -Nru redhat-cluster-3.0.4/debian/po/de.po redhat-cluster-3.0.7/debian/po/de.po
--- redhat-cluster-3.0.4/debian/po/de.po	1970-01-01 00:00:00.000000000 +0000
+++ redhat-cluster-3.0.7/debian/po/de.po	2010-02-08 16:56:18.000000000 +0000
@@ -0,0 +1,34 @@
+# Translation of redhat-cluster debconf templates to German
+# Copyright (C) Helge Kreutzmann <debian@helgefjell.de>, 2009.
+# This file is distributed under the same license as the redhat-cluster package.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: redhat-cluster 3.0.4-3\n"
+"Report-Msgid-Bugs-To: redhat-cluster@packages.debian.org\n"
+"POT-Creation-Date: 2009-11-17 17:39+0100\n"
+"PO-Revision-Date: 2009-12-27 10:03+0100\n"
+"Last-Translator: Helge Kreutzmann <debian@helgefjell.de>\n"
+"Language-Team: de <debian-l10n-german@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../cman.templates:2001
+msgid "Do you want to abort the Red Hat Cluster Suite upgrade?"
+msgstr "Möchten Sie das Upgrade der Red Hat Cluster Suite abbrechen?"
+
+#. Type: boolean
+#. Description
+#: ../cman.templates:2001
+msgid ""
+"The new version 3 of the Red Hat Cluster Suite is not compatible with the "
+"currently installed one. Upgrading these packages without stopping the "
+"complete cluster can cause file system corruption on shared storage devices."
+msgstr ""
+"Die neue Version 3 der Red Hat Cluster Suite ist zu der derzeitig "
+"installierten Version nicht kompatibel. Ein Upgrade ohne vorher den "
+"kompletten Cluster anzuhalten könnte zur Beschädigung des Dateisystems auf "
+"gemeinsam genutzten Speichergeräten führen."
diff -Nru redhat-cluster-3.0.4/debian/po/es.po redhat-cluster-3.0.7/debian/po/es.po
--- redhat-cluster-3.0.4/debian/po/es.po	1970-01-01 00:00:00.000000000 +0000
+++ redhat-cluster-3.0.7/debian/po/es.po	2010-02-08 16:56:18.000000000 +0000
@@ -0,0 +1,56 @@
+# redhat-cluster po-debconf translation to Spanish
+# Copyright (C) 2009 Software in the Public Interest
+# This file is distributed under the same license as the redhat-cluster package.
+# 
+# Changes:
+#   - Initial translation
+#       Francisco Javier Cuadrado <fcocuadrado@gmail.com>, 2009
+# 
+# Traductores, si no conocen el formato PO, merece la pena leer la
+# documentación de gettext, especialmente las secciones dedicadas a este
+# formato, por ejemplo ejecutando:
+#       info -n '(gettext)PO Files'
+#       info -n '(gettext)Header Entry'
+# 
+# Equipo de traducción al español, por favor, lean antes de traducir
+# los siguientes documentos:
+# 
+#   - El proyecto de traducción de Debian al español
+#     http://www.debian.org/intl/spanish/
+#     especialmente las notas de traducción en
+#     http://www.debian.org/intl/spanish/notas
+# 
+#   - La guía de traducción de po's de debconf:
+#     /usr/share/doc/po-debconf/README-trans
+#     o http://www.debian.org/intl/l10n/po-debconf/README-trans
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: redhat-cluster 3.0.2-5\n"
+"Report-Msgid-Bugs-To: redhat-cluster@packages.debian.org\n"
+"POT-Creation-Date: 2009-11-17 17:39+0100\n"
+"PO-Revision-Date: 2009-11-03 08:37+0100\n"
+"Last-Translator: Francisco Javier Cuadrado <fcocuadrado@gmail.com>\n"
+"Language-Team: Debian l10n Spanish <debian-l10n-spanish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../cman.templates:2001
+msgid "Do you want to abort the Red Hat Cluster Suite upgrade?"
+msgstr "¿Quiere abortar la actualización de Red Hat Cluster Suite?"
+
+#. Type: boolean
+#. Description
+#: ../cman.templates:2001
+msgid ""
+"The new version 3 of the Red Hat Cluster Suite is not compatible with the "
+"currently installed one. Upgrading these packages without stopping the "
+"complete cluster can cause file system corruption on shared storage devices."
+msgstr ""
+"La nueva versión 3 de Red Hat Cluster Suite no es compatible con la "
+"instalada actualmente. Actualizar estos paquetes sin parar todo el cluster "
+"puede ocasionar corrupción en los sistemas de archivos de los dispositivos "
+"de almacenamiento compartidos."
diff -Nru redhat-cluster-3.0.4/debian/po/eu.po redhat-cluster-3.0.7/debian/po/eu.po
--- redhat-cluster-3.0.4/debian/po/eu.po	1970-01-01 00:00:00.000000000 +0000
+++ redhat-cluster-3.0.7/debian/po/eu.po	2010-02-08 16:56:18.000000000 +0000
@@ -0,0 +1,38 @@
+# translation of redhat-cluster_3.0.2-5_eu.po to Basque
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Piarres Beobide <pi+debian@beobide.net>, 2009.
+# Iñaki Larrañaga Murgoitio <dooteo@euskalgnu.org>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: redhat-cluster_3.0.2-5_eu\n"
+"Report-Msgid-Bugs-To: redhat-cluster@packages.debian.org\n"
+"POT-Creation-Date: 2009-11-02 18:24+0100\n"
+"PO-Revision-Date: 2009-11-05 11:34+0100\n"
+"Last-Translator: Piarres Beobide <pi@beobide.net>\n"
+"Language-Team: Basque <debian-l10n-basque@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Type: boolean
+#. Description
+#: ../cman.templates:2001
+msgid "Do you want to abort the Red Hat Cluster Suite upgrade?"
+msgstr "Red Hat Cluster-en bertsio-berritzea etetzea nahi duzu?"
+
+#. Type: boolean
+#. Description
+#: ../cman.templates:2001
+msgid ""
+"The new version 3 of the Red Hat Cluster Suite is not compatible with the "
+"currently installed one. Upgrading these packages without stopping the "
+"complete cluster can cause file system corruption on shared storage devices."
+msgstr ""
+"Red Hat Cluster-en 3 bertsio berria ez da bateragarria instalatuta "
+"dagoenarekin. Cluster osoa gelditu gabe pakete hauek eguneratzeak "
+"partekatutako biltegiratze gailuen fitxategi-sistema honda dezake."
+
diff -Nru redhat-cluster-3.0.4/debian/po/fi.po redhat-cluster-3.0.7/debian/po/fi.po
--- redhat-cluster-3.0.4/debian/po/fi.po	1970-01-01 00:00:00.000000000 +0000
+++ redhat-cluster-3.0.7/debian/po/fi.po	2010-02-08 16:56:18.000000000 +0000
@@ -0,0 +1,38 @@
+# Copyright (C) 2009
+# This file is distributed under the same license as the redhat-cluster package.
+#
+# Esko Arajärvi <edu@iki.fi>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: redhat-cluster@packages.debian.org\n"
+"POT-Creation-Date: 2009-11-02 18:24+0100\n"
+"PO-Revision-Date: 2009-11-04 21:56+0200\n"
+"Last-Translator: Esko Arajärvi <edu@iki.fi>\n"
+"Language-Team: Finnish <debian-l10n-finnish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Type: boolean
+#. Description
+#: ../cman.templates:2001
+msgid "Do you want to abort the Red Hat Cluster Suite upgrade?"
+msgstr "Keskeytetäänkö Red Hat Cluster Suite -ohjelmiston päivitys?"
+
+#. Type: boolean
+#. Description
+#: ../cman.templates:2001
+msgid ""
+"The new version 3 of the Red Hat Cluster Suite is not compatible with the "
+"currently installed one. Upgrading these packages without stopping the "
+"complete cluster can cause file system corruption on shared storage devices."
+msgstr ""
+"Red Hat Cluster Suite -ohjelmiston uusi versio 3 ei ole yhteensopiva tällä "
+"hetkellä asennettuna olevan kanssa. Pakettien päivitys ilman, että klusteri "
+"pysäytetään kokonaan saattaa korruptoida jaettujen tallennuslaitteiden "
+"tiedostojärjestelmät."
+
+
diff -Nru redhat-cluster-3.0.4/debian/po/fr.po redhat-cluster-3.0.7/debian/po/fr.po
--- redhat-cluster-3.0.4/debian/po/fr.po	1970-01-01 00:00:00.000000000 +0000
+++ redhat-cluster-3.0.7/debian/po/fr.po	2010-02-08 16:56:18.000000000 +0000
@@ -0,0 +1,37 @@
+# French translation of redhat-cluster debconf templates
+# Copyright (C) 2009 Debian French l10n team <debian-l10n-french@lists.debian.org>
+# This file is distributed under the same license as the redhat-cluster package.
+#
+# Christian Perrier <bubulle@debian.org>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: \n"
+"Report-Msgid-Bugs-To: redhat-cluster@packages.debian.org\n"
+"POT-Creation-Date: 2009-11-02 18:24+0100\n"
+"PO-Revision-Date: 2009-11-03 07:19+0100\n"
+"Last-Translator: Christian Perrier <bubulle@debian.org>\n"
+"Language-Team: French <debian-l10n-french@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+
+#. Type: boolean
+#. Description
+#: ../cman.templates:2001
+msgid "Do you want to abort the Red Hat Cluster Suite upgrade?"
+msgstr "Voulez-vous interrompre la mise à jour de Red Hat Cluster Suite ?"
+
+#. Type: boolean
+#. Description
+#: ../cman.templates:2001
+msgid ""
+"The new version 3 of the Red Hat Cluster Suite is not compatible with the "
+"currently installed one. Upgrading these packages without stopping the "
+"complete cluster can cause file system corruption on shared storage devices."
+msgstr ""
+"La nouvelle version 3 de Red Hat Cluster Suite n'est pas compatible avec la "
+"version déjà installée. La mise à jour de ce paquet sans un arrêt complet de "
+"la grappe (« cluster ») pourrait corrompre les systèmes de fichiers sur les "
+"périphériques de stockage partagés."
diff -Nru redhat-cluster-3.0.4/debian/po/it.po redhat-cluster-3.0.7/debian/po/it.po
--- redhat-cluster-3.0.4/debian/po/it.po	1970-01-01 00:00:00.000000000 +0000
+++ redhat-cluster-3.0.7/debian/po/it.po	2010-02-08 16:56:18.000000000 +0000
@@ -0,0 +1,35 @@
+# ITALIAN TRANSLATION OF REDHAT-CLUSTER'S PO-DEBCONF FILE.
+# COPYRIGHT (C) 2009 THE REDHAT-CLUSTER'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the redhat-cluster package.
+#
+# Vincenzo Campanella <vinz65@gmail.com>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: redhat-cluster 3.0.2-5\n"
+"Report-Msgid-Bugs-To: redhat-cluster@packages.debian.org\n"
+"POT-Creation-Date: 2009-11-02 18:24+0100\n"
+"PO-Revision-Date: 2009-11-13 11:47+0100\n"
+"Last-Translator: Vincenzo Campanella <vinz65@gmail.com>\n"
+"Language-Team: Italian <tp@lists.linux.it>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../cman.templates:2001
+msgid "Do you want to abort the Red Hat Cluster Suite upgrade?"
+msgstr "Annullare l'aggiornamento della suite Red Hat Cluster?"
+
+#. Type: boolean
+#. Description
+#: ../cman.templates:2001
+msgid ""
+"The new version 3 of the Red Hat Cluster Suite is not compatible with the "
+"currently installed one. Upgrading these packages without stopping the "
+"complete cluster can cause file system corruption on shared storage devices."
+msgstr ""
+"La nuova versione 3 della suite Red Hat Cluster non è compatibile con quella "
+"installata attualmente. L'aggiornamento di questi pacchetti senza arrestare "
+"l'intero cluster può causare la corruzione del file system su dispositivi di "
+"memorizzazione condivisi."
diff -Nru redhat-cluster-3.0.4/debian/po/pt.po redhat-cluster-3.0.7/debian/po/pt.po
--- redhat-cluster-3.0.4/debian/po/pt.po	1970-01-01 00:00:00.000000000 +0000
+++ redhat-cluster-3.0.7/debian/po/pt.po	2010-02-08 16:56:18.000000000 +0000
@@ -0,0 +1,37 @@
+# translation of redhat-cluster debconf to Portuguese
+# Copyright (C) 2009 the redhat-cluster's copyright holder
+# This file is distributed under the same license as the redhat-cluster package.
+#
+# Américo Monteiro <a_monteiro@netcabo.pt>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: redhat-cluster 3.0.4-3\n"
+"Report-Msgid-Bugs-To: redhat-cluster@packages.debian.org\n"
+"POT-Creation-Date: 2009-11-17 17:39+0100\n"
+"PO-Revision-Date: 2009-12-26 17:17+0000\n"
+"Last-Translator: Américo Monteiro <a_monteiro@netcabo.pt>\n"
+"Language-Team: Portuguese <traduz@debianpt.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: Lokalize 1.0\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Type: boolean
+#. Description
+#: ../cman.templates:2001
+msgid "Do you want to abort the Red Hat Cluster Suite upgrade?"
+msgstr "Deseja abortar a actualização do Red Hat Cluster Suite?"
+
+#. Type: boolean
+#. Description
+#: ../cman.templates:2001
+msgid ""
+"The new version 3 of the Red Hat Cluster Suite is not compatible with the "
+"currently installed one. Upgrading these packages without stopping the "
+"complete cluster can cause file system corruption on shared storage devices."
+msgstr ""
+"A nova versão 3 do Red Hat Cluster Suite não é compatível com a versão "
+"actualmente instalada. Actualizar estes pacotes sem parar o cluster completo "
+"pode causar corrupção do sistema de ficheiros em dispositivos de "
+"armazenamento partilhados."
diff -Nru redhat-cluster-3.0.4/debian/po/ru.po redhat-cluster-3.0.7/debian/po/ru.po
--- redhat-cluster-3.0.4/debian/po/ru.po	1970-01-01 00:00:00.000000000 +0000
+++ redhat-cluster-3.0.7/debian/po/ru.po	2010-02-08 16:56:18.000000000 +0000
@@ -0,0 +1,37 @@
+# translation of redhat-cluster_3.0.4-3_ru.po to Russian
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+#
+# Yuri Kozlov <yuray@komyakino.ru>, 2009, 2010.
+msgid ""
+msgstr ""
+"Project-Id-Version: redhat-cluster 3.0.4-3\n"
+"Report-Msgid-Bugs-To: redhat-cluster@packages.debian.org\n"
+"POT-Creation-Date: 2009-11-17 17:39+0100\n"
+"PO-Revision-Date: 2010-01-02 09:29+0300\n"
+"Last-Translator: Yuri Kozlov <yuray@komyakino.ru>\n"
+"Language-Team: Russian <debian-l10n-russian@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms:  nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+#. Type: boolean
+#. Description
+#: ../cman.templates:2001
+msgid "Do you want to abort the Red Hat Cluster Suite upgrade?"
+msgstr "Прервать обновление Red Hat Cluster Suite?"
+
+#. Type: boolean
+#. Description
+#: ../cman.templates:2001
+msgid ""
+"The new version 3 of the Red Hat Cluster Suite is not compatible with the "
+"currently installed one. Upgrading these packages without stopping the "
+"complete cluster can cause file system corruption on shared storage devices."
+msgstr ""
+"Новая версия Red Hat Cluster Suite 3 несовместима с установленной. "
+"Обновление данных пакетов без остановки всего кластера может привести к "
+"повреждению файловой системы на общих устройствах хранения."
diff -Nru redhat-cluster-3.0.4/debian/po/sv.po redhat-cluster-3.0.7/debian/po/sv.po
--- redhat-cluster-3.0.4/debian/po/sv.po	1970-01-01 00:00:00.000000000 +0000
+++ redhat-cluster-3.0.7/debian/po/sv.po	2010-02-08 16:56:18.000000000 +0000
@@ -0,0 +1,40 @@
+# translation of redhat-cluster_sv.po to Swedish
+# Copyright (C) 2009 Martin Bagge
+# This file is distributed under the same license as the redhat-cluster package.
+#
+# Martin Bagge <brother@bsnet.se>, 2009
+# Martin Ågren <martin.agren@gmail.com>, 2009.
+msgid ""
+msgstr ""
+"Project-Id-Version: redhat-cluster_sv\n"
+"Report-Msgid-Bugs-To: redhat-cluster@packages.debian.org\n"
+"POT-Creation-Date: 2009-11-17 17:39+0100\n"
+"PO-Revision-Date: 2009-12-29 11:28+0100\n"
+"Last-Translator: Martin Bagge <brother@bsnet.se>\n"
+"Language-Team: Swedish <debian-l10n-swedish@lists.debian.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Poedit-Language: Swedish\n"
+"X-Poedit-Country: Sweden\n"
+
+#. Type: boolean
+#. Description
+#: ../cman.templates:2001
+msgid "Do you want to abort the Red Hat Cluster Suite upgrade?"
+msgstr "Vill du avbryta uppgraderingen av Red Hat Cluster Suite?"
+
+#. Type: boolean
+#. Description
+#: ../cman.templates:2001
+msgid ""
+"The new version 3 of the Red Hat Cluster Suite is not compatible with the "
+"currently installed one. Upgrading these packages without stopping the "
+"complete cluster can cause file system corruption on shared storage devices."
+msgstr ""
+"Den nya, tredje versionen, av Red Hat Cluster Suite är inte kompatibel med "
+"den som är installerad för tillfället. Uppgradering av dessa paket utan att "
+"stoppa hela klustret kan orsaka filsystemkorruption på delade "
+"lagringsenheter."
diff -Nru redhat-cluster-3.0.4/debian/po/templates.pot redhat-cluster-3.0.7/debian/po/templates.pot
--- redhat-cluster-3.0.4/debian/po/templates.pot	2010-02-08 16:56:18.000000000 +0000
+++ redhat-cluster-3.0.7/debian/po/templates.pot	2010-02-08 16:56:18.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: redhat-cluster@packages.debian.org\n"
-"POT-Creation-Date: 2007-12-23 20:05+0100\n"
+"POT-Creation-Date: 2009-11-17 17:39+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,29 +18,15 @@
 
 #. Type: boolean
 #. Description
-#: ../cman.templates:1001
-msgid "Do you want to abort now?"
+#: ../cman.templates:2001
+msgid "Do you want to abort the Red Hat Cluster Suite upgrade?"
 msgstr ""
 
 #. Type: boolean
 #. Description
-#: ../cman.templates:1001
+#: ../cman.templates:2001
 msgid ""
-"The new version 2.0 of the Red Hat Cluster Suite is not compatible with  the "
-"currently installed one. Upgrading these packages without stopping  the "
-"complete cluster can cause filesystem corruption on shared storage  devices."
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../cman.templates:1001
-msgid ""
-"For instructions on how to safely upgrade the Red Hat Cluster Suite to "
-"version 2.0, please refer to the following document:"
-msgstr ""
-
-#. Type: boolean
-#. Description
-#: ../cman.templates:1001
-msgid "http://wiki.debian.org/UpgradeRHCSV1toV2"
+"The new version 3 of the Red Hat Cluster Suite is not compatible with the "
+"currently installed one. Upgrading these packages without stopping the "
+"complete cluster can cause file system corruption on shared storage devices."
 msgstr ""
diff -Nru redhat-cluster-3.0.4/debian/README.Debian redhat-cluster-3.0.7/debian/README.Debian
--- redhat-cluster-3.0.4/debian/README.Debian	2010-02-08 16:56:18.000000000 +0000
+++ redhat-cluster-3.0.7/debian/README.Debian	2010-02-08 16:56:18.000000000 +0000
@@ -1,38 +1,15 @@
-Packaging notes
+Documentation pointers:
 
-The documentation provided by upstream is not the best around the world
-so here is a collections of little useful info:
+Configuration system:
+http://fabbione.fedorapeople.org/CCS.pdf
 
-Administrator's Guide:
-http://www.redhat.com/docs/manuals/csgfs/browse/rh-gfs-en/
+Configuration using LDAP:
+http://people.redhat.com/ccaulfie/docs/ClusterLDAP.pdf
 
 Configuration examples are located in /usr/share/doc/gfs-tools/examples/
 
 rgmanager error codes are located in /usr/share/doc/rgmanager/errors.txt
 
-KNOWN ISSUES
-------------
-
-NOTE that you will need a minimal valid configuration before you will be
-able to run the GUI or you might see horrible things like this one:
-
-root@beech:~# system-config-cluster
-Traceback (most recent call last):
-  File "/usr/sbin/system-config-cluster", line 540, in ?
-    runFullGUI()
-  File "/usr/sbin/system-config-cluster", line 522, in runFullGUI
-    baseapp = basecluster(glade_xml, app)
-  File "/usr/sbin/system-config-cluster", line 108, in __init__
-    self.model_builder = ModelBuilder(1, CLUSTER_CONF_PATH)
-  File "/usr/share/system-config-cluster/ModelBuilder.py", line 133, in __init__
-    self.resolve_fence_instance_types()
-  File "/usr/share/system-config-cluster/ModelBuilder.py", line 284, in
-resolve_fence_instance_types
-    nodes = self.getNodes()
-  File "/usr/share/system-config-cluster/ModelBuilder.py", line 406, in getNodes
-    return self.clusternodes_ptr.getChildren()
-AttributeError: 'NoneType' object has no attribute 'getChildren'
-
 ------------
 
 It appears that in some hw combinations the kernel is not fast enough to handle
diff -Nru redhat-cluster-3.0.4/debian/rgmanager.postinst redhat-cluster-3.0.7/debian/rgmanager.postinst
--- redhat-cluster-3.0.4/debian/rgmanager.postinst	1970-01-01 00:00:00.000000000 +0000
+++ redhat-cluster-3.0.7/debian/rgmanager.postinst	2010-02-08 16:56:18.000000000 +0000
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+set -e
+
+# Those using dependency based boot sequencing with sysv-rc and
+# installing rgmanager before version 2.20081102-1.1 would have wrong
+# runlevel symlinks.  Recover from this.
+if [ "$1" = "configure" ] && dpkg --compare-versions "$2" le "3.0.2-5" \
+   && [ -f /etc/rc2.d/S[0-9][0-9]rgmanager ] && [ ! -f /etc/rcS.d/S[0-9][0-9]rgmanager ]
+then
+    update-rc.d -f rgmanager remove
+fi
+
+#DEBHELPER#
diff -Nru redhat-cluster-3.0.4/debian/rules redhat-cluster-3.0.7/debian/rules
--- redhat-cluster-3.0.4/debian/rules	2010-02-08 16:56:18.000000000 +0000
+++ redhat-cluster-3.0.7/debian/rules	2010-02-08 16:56:18.000000000 +0000
@@ -39,13 +39,16 @@
 	$(MAKE) install DESTDIR=$(BUILDROOT)/debian/tmp/
 
 	cp $(BUILDROOT)/debian/tmp/etc/init.d/cman $(BUILDROOT)/debian/cman.init
-	cp $(BUILDROOT)/debian/tmp/etc/init.d/gfs $(BUILDROOT)/debian/gfs-tools.init
 	cp $(BUILDROOT)/debian/tmp/etc/init.d/gfs2 $(BUILDROOT)/debian/gfs2-tools.init
 	cp $(BUILDROOT)/debian/tmp/etc/init.d/rgmanager $(BUILDROOT)/debian/rgmanager.init
 
 	# no need for upstream doc install
 	rm -rf $(BUILDROOT)/debian/tmp/usr/share/doc/cluster
 
+	# drbd8 ships this itself
+	rm -f $(BUILDROOT)/debian/tmp/usr/share/cluster/drbd.metadata
+	rm -f $(BUILDROOT)/debian/tmp/usr/share/cluster/drbd.sh
+
 	# manual craft
 	install -d -m 0755 debian/tmp/etc/cluster
 
@@ -53,7 +56,9 @@
 	mv debian/tmp/etc/udev/rules.d/51-dlm.rules debian/tmp/lib/udev/rules.d/45-dlm.rules
 	rmdir debian/tmp/etc/udev/rules.d
 
-	dh_install --sourcedir=debian/tmp --list-missing
+	dh_install -Xcluster.rng --sourcedir=debian/tmp --list-missing
+	install -D -m 644 debian/tmp/usr/share/cluster/cluster.rng \
+			  debian/cman/usr/share/cluster/cluster.rng
 
 	# install gfs kernel sources
 	mkdir -p debian/redhat-cluster-source/usr/src/modules/redhat-cluster/debian
@@ -92,7 +97,6 @@
 	dh_installinit -p cman --no-start --no-restart-on-upgrade -- start 61 S . start 5 0 6 .
 	dh_installinit -p cman --name=qdiskd --no-start --no-restart-on-upgrade -- start 62 S . start 4 0 6 .
 	dh_installinit -p cman --name=scsi_reserve --no-start --no-restart-on-upgrade -- start 63 S . start 3 0 6 .
-	dh_installinit -p gfs-tools --no-start --no-restart-on-upgrade -- start 65 S . start 2 0 6 .
 	dh_installinit -p gfs2-tools --no-start --no-restart-on-upgrade -- start 65 S . start 2 0 6 .
 	dh_installinit -p rgmanager --no-start --no-restart-on-upgrade -- start 65 S . start 1 0 6 .
 
@@ -107,7 +111,7 @@
 	dh_fixperms -a
 	dh_perl -a
 	dh_makeshlibs -a -V
-	dh_shlibdeps -a -ldebian/tmp/usr/lib
+	dh_shlibdeps -a -v -- debian/cman/usr/lib/lcrso/*.lcrso
 	dh_installdeb -a
 	dh_gencontrol -a
 	dh_md5sums -a
@@ -138,3 +142,5 @@
 	rm -rf debian/*.init
 	rm -rf *-stamp
 	rm -rf debian/patched
+	debconf-updatepo
+
