diff -Nru ocfs2-tools-1.4.2/debian/changelog ocfs2-tools-1.4.3/debian/changelog
--- ocfs2-tools-1.4.2/debian/changelog	2010-02-08 16:51:12.000000000 +0000
+++ ocfs2-tools-1.4.3/debian/changelog	2010-02-08 16:51:13.000000000 +0000
@@ -1,15 +1,37 @@
-ocfs2-tools (1.4.2-1.1~bpo50+1) lenny-backports; urgency=low
+ocfs2-tools (1.4.3-1ubuntu0ppa4) lucid; urgency=low
 
-  * Rebuild for lenny-backports. 
+  * Add link /usr/sbin/ocfs2_controld.pcmk -> /sbin/ocfs2_controld.pcmk
 
- -- Martin Loschwitz <madkiss@debian.org>  Fri, 06 Nov 2009 10:47:30 +0000
+ -- Ante Karamatic <ivoks@ubuntu.com>  Sat, 06 Feb 2010 10:10:57 +0000
 
-ocfs2-tools (1.4.2-1.1) unstable; urgency=low
+ocfs2-tools (1.4.3-1ubuntu0ppa3) lucid; urgency=low
 
-  * Non-maintainer upload.
-  * Enable pacemaker functionality
+  * Install vendor/common/51-ocfs2.rules udev rule
+
+ -- Ante Karamatic <ivoks@ubuntu.com>  Fri, 05 Feb 2010 17:19:56 +0000
+
+ocfs2-tools (1.4.3-1ubuntu0ppa2) lucid; urgency=low
+
+  * Add libbz2-dev, cluster-glue-dev and libxml2-dev to build deps
+  * Removed debian/ocfs2-tools.ocfs2.init (no need for it)
+
+ -- Ante Karamatic <ivoks@ubuntu.com>  Wed, 03 Feb 2010 18:55:23 +0000
+
+ocfs2-tools (1.4.3-1ubuntu0ppa1) lucid; urgency=low
+
+  * Enable pacemaker functionality:
+    - add libdlm-dev and libdlmcontrol-dev to build deps
+
+ -- Ante Karamatic <ivoks@ubuntu.com>  Wed, 03 Feb 2010 18:10:57 +0000
+
+ocfs2-tools (1.4.3-1) unstable; urgency=low
+
+  * New upstream release.
+  * Replace libreadline-dev Build-Depends by libreadline5-dev
+    (Closes: #553819).
+  * Update to Standards-Version 3.8.3.
 
- -- Martin Loschwitz <madkiss@debian.org>  Thu, 05 Nov 2009 15:47:11 +0000
+ -- Jeremy Lainé <jeremy.laine@m4x.org>  Thu, 05 Nov 2009 07:59:29 +0100
 
 ocfs2-tools (1.4.2-1) unstable; urgency=low
 
diff -Nru ocfs2-tools-1.4.2/debian/control ocfs2-tools-1.4.3/debian/control
--- ocfs2-tools-1.4.2/debian/control	2010-02-08 16:51:12.000000000 +0000
+++ ocfs2-tools-1.4.3/debian/control	2010-02-08 16:51:13.000000000 +0000
@@ -3,8 +3,8 @@
 Priority: optional
 Maintainer: Jeremy Lainé <jeremy.laine@m4x.org>
 Uploaders: Frederik Schüler <fs@debian.org>
-Standards-Version: 3.8.0
-Build-Depends: cdbs, debhelper (>= 5), po-debconf, python-support (>= 0.4), comerr-dev, uuid-dev, libncurses5-dev, libreadline5-dev, libglib2.0-dev (>= 2.2.3), libblkid-dev (>= 1.36), libdevmapper-dev, python-dev, python-gtk2, pacemaker-dev
+Standards-Version: 3.8.3
+Build-Depends: cdbs, debhelper (>= 5), po-debconf, python-support (>= 0.4), comerr-dev, uuid-dev, libncurses5-dev, libreadline-dev, libglib2.0-dev (>= 2.2.3), libblkid-dev (>= 1.36), libdevmapper-dev, python-dev, python-gtk2, pacemaker-dev, libdlmcontrol-dev, libdlm-dev, libopenais-dev, cluster-glue-dev, libxml2-dev, libbz2-dev
 Homepage: http://oss.oracle.com/projects/ocfs2-tools/
 Vcs-Svn: svn://svn.debian.org/collab-maint/deb-maint/ocfs2-tools/trunk/
 Vcs-Browser: http://svn.debian.org/viewsvn/collab-maint/deb-maint/ocfs2-tools/trunk/
diff -Nru ocfs2-tools-1.4.2/debian/ocfs2-tools.install ocfs2-tools-1.4.3/debian/ocfs2-tools.install
--- ocfs2-tools-1.4.2/debian/ocfs2-tools.install	2010-02-08 16:51:12.000000000 +0000
+++ ocfs2-tools-1.4.3/debian/ocfs2-tools.install	2010-02-08 16:51:13.000000000 +0000
@@ -19,3 +19,4 @@
 debian/tmp/usr/share/man/man8/ocfs2_hb_ctl.8
 debian/tmp/usr/share/man/man8/tunefs.ocfs2.8
 debian/tmp/sbin/ocfs2_controld.pcmk
+debian/tmp/lib/udev/rules.d/51-ocfs2.rules
diff -Nru ocfs2-tools-1.4.2/debian/ocfs2-tools.o2cb.ra ocfs2-tools-1.4.3/debian/ocfs2-tools.o2cb.ra
--- ocfs2-tools-1.4.2/debian/ocfs2-tools.o2cb.ra	2010-02-08 16:51:12.000000000 +0000
+++ ocfs2-tools-1.4.3/debian/ocfs2-tools.o2cb.ra	1970-01-01 00:00:00.000000000 +0000
@@ -1,464 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2008 Andrew Beekhof
-#                    All Rights Reserved.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of version 2 of the GNU General Public License as
-# published by the Free Software Foundation.
-#
-# This program is distributed in the hope that it would be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-#
-# Further, this software is distributed without any warranty that it is
-# free of the rightful claim of any third person regarding infringement
-# or the like.  Any license provided herein, whether implied or
-# otherwise, applies only to this software file.  Patent licenses, if
-# any, provided herein do not apply to combinations of this program with
-# other software, or any other product whatsoever.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write the Free Software Foundation,
-# Inc., 59 Temple Place - Suite 330, Boston MA 02111-1307, USA.
-#
-#######################################################################
-
-# OCF initialization
-. ${OCF_ROOT}/resource.d/heartbeat/.ocf-shellfuncs
-
-# Parameter defaults
-: ${OCF_RESKEY_stack:="pcmk"}
-: ${OCF_RESKEY_sysfs:="/sys/fs"}
-: ${OCF_RESKEY_daemon:="/usr/sbin/ocfs2_controld.${OCF_RESKEY_stack}"}
-: ${OCF_RESKEY_daemon_timeout:="10"} 
-: ${OCF_RESKEY_configfs:="/sys/kernel/config"}
-: ${OCF_RESKEY_CRM_meta_gloablly_unique:="false"}
-
-# Common variables
-CLUSTER_STACK_FILE="${OCF_RESKEY_sysfs}/ocfs2/cluster_stack"
-LOADED_PLUGINS_FILE="${OCF_RESKEY_sysfs}/ocfs2/loaded_cluster_plugins"
-
-#
-# Check to see if a filesystem driver is loaded.
-# 0 is loaded, 1 is not.
-#
-driver_filesystem() {
-    if [ -z "$1" ]
-    then
-        ocf_log err "driver_filesystem(): Missing an argument"
-        exit 1
-    fi
-    FSNAME="$1"
-
-    FSOUT="$(awk '(NF == 1 && $1 ~ /^'$FSNAME'$/) || $2 ~ /^'$FSNAME'$/{
-                      print $1;exit
-                  }' /proc/filesystems 2>/dev/null)"
-
-    test -n "$FSOUT"
-    return $?
-}
-
-#
-# Check to see if a filesystem of type $1 is mounted at $2.
-#
-# 0 is mounted, 1 is not.
-#
-check_filesystem()
-{
-    if [ "$#" != "2" -o -z "$1" -o -z "$2" ]
-    then
-        ocf_log err "check_filesystem(): Missing arguments"
-        exit 4
-    fi
-    FSNAME="$1"
-    MOUNTPOINT="$2"
-
-    FULL_MOUNTSEARCH="`echo "$MOUNTPOINT" | sed -e 's/\//\\\\\//g'`"
-    MOUNTOUT="`awk '$2 ~ /^'$FULL_MOUNTSEARCH'$/ && $3 ~ /^'$FSNAME'$/{print $2; exit}' < /proc/mounts 2>/dev/null`"
-    test -n "$MOUNTOUT"
-    return $?
-}
-
-#
-# Unload a filesystem driver.  
-# Be careful to notice if the driver is built-in and do nothing.
-#
-# 0 is success, 1 is error, 2 is already unloaded.
-#
-unload_filesystem()
-{
-    if [ "$#" != "1" -o -z "$1" ]
-    then
-        ocf_log err "unload_filesystem(): Missing an argument"
-        return 1
-    fi
-    FSNAME="$1"
-
-    driver_filesystem "$FSNAME" || return 2
-
-    MODOUT="`awk '$1 ~ /^'$FSNAME'$/{print $1,$3;exit}' < /proc/modules 2>/dev/null`"
-    if [ -z "$MODOUT" ]; then
-        # The driver is built in, we can't unload it.
-        return 0
-    fi
-
-    case "$MODOUT" in
-    $FSNAME\ 0)
-        ;;
-    $FSNAME\ *)
-        # The driver is busy, leave it alone
-        ocf_log err "Module $FSNAME is still in use"
-        return 1
-        ;;
-    *)
-        ocf_log err "Invalid module parsing! "
-        return 1
-        ;;
-    esac
-
-    modprobe -rs "$FSNAME"
-    if [ "$?" != 0 ]; then
-        ocf_log err "Unable to unload module: $FSNAME"
-        return 1
-    fi
-
-    return 0
-}
-
-status_daemon()
-{
-    PID=`pidof "$OCF_RESKEY_daemon"`
-    if [ -n "$PID" ]; then
-	return $OCF_SUCCESS
-    fi
-    return $OCF_NOT_RUNNING
-}
-
-bringup_daemon()
-{
-    if [ ! -e "$OCF_RESKEY_daemon" ]; then
-	ocf_log err "Required binary not found: $OCF_RESKEY_daemon"
-	return $OCF_ERR_INSTALLED
-    fi
-
-    start-stop-daemon -S --exec "$OCF_RESKEY_daemon"; rc=$?
-    if [ $rc != 0 ]; then
-	ocf_log err "Could not start $OCF_RESKEY_daemon"
-	return $OCF_ERR_GENERIC
-    fi
-
-    sleep 1
-    COUNT=0
-    rc=$OCF_NOT_RUNNING
-
-    while [ $rc = $OCF_NOT_RUNNING ]; do
-        COUNT=`expr $COUNT + 1`
-        if [ $COUNT -gt $OCF_RESKEY_daemon_timeout ]; then
-	    ocf_log err "`basename $OCF_RESKEY_daemon` did not come up"
-	    ps axf | grep -C 3 $$
-	    return $OCF_ERR_GENERIC
-        fi
-	status_daemon; rc=$?
-        sleep 1
-    done
-
-    return $rc
-}
-
-kill_daemon()
-{
-    status_daemon; rc=$?
-    if [ $rc != $OCF_SUCCESS ]; then
-	return $rc
-    fi
-
-    ocf_log info "Stopping `basename "$OCF_RESKEY_daemon"`"
-    killall "$OCF_RESKEY_daemon"
-
-    while [ $rc = $OCF_NOT_RUNNING ]; do
-        sleep 1
-	status_daemon; rc=$?
-    done
-
-    return $OCF_SUCCESS
-}
-
-#
-# Unload a module
-# 0 is success, 1 is error, 2 is not loaded
-#
-unload_module()
-{
-    if [ "$#" -lt "1" -o -z "$1" ]
-    then
-	ocf_log err  "unload_module(): Requires an argument"
-        return 1
-    fi
-    MODNAME="$1"
-
-    MODOUT="`awk '$1 ~ /^'$MODNAME'$/{print $1,$3;exit}' < /proc/modules 2>/dev/null`"
-    if [ -z "$MODOUT" ]
-    then
-        return 2
-    fi
-
-    case "$MODOUT" in
-    $MODNAME\ 0)
-        ;;
-    $MODNAME\ *)
-        return 2
-        ;;
-    *)
-	ocf_log err "Invalid module parsing!"
-        return 1
-        ;;
-    esac
-
-    modprobe -rs "$MODNAME"
-    if [ "$?" != 0 ]; then
-	ocf_log err "Unable to unload module \"$MODNAME\""
-        return 1
-    fi
-
-    return 0
-}
-
-o2cb_start() {
-
-    o2cb_monitor; rc=$?
-    if [ $rc != $OCF_NOT_RUNNING ]; then 
-	return $rc
-    fi
-
-    ocf_log info "Starting $OCF_RESOURCE_INSTANCE"
-
-    if [ ! -e "$CLUSTER_STACK_FILE" ]; then
-	modprobe -s ocfs2_stackglue
-	if [ $? != 0 ]; then
-	    ocf_log err "Could not load ocfs2_stackglue"
-	    return $OCF_ERR_INSTALLED
-	fi
-    fi
-
-    SP_OUT="$(awk '/^'user'$/{print; exit}' "$LOADED_PLUGINS_FILE" 2>/dev/null)"
-    if [ -z "$SP_OUT" ]
-    then
-        modprobe -s ocfs2_stack_user
-	if [ $? != 0 ]; then
-	    ocf_log err "Could not load ocfs2_stack_user"
-	    return $OCF_ERR_INSTALLED
-	fi
-    fi
-
-    SP_OUT="$(awk '/^'user'$/{print; exit}' "$LOADED_PLUGINS_FILE" 2>/dev/null)"
-    if [ -z "$SP_OUT" ]; then
-	ocf_log err "Switch to userspace stack unsuccessful"
-	return $OCF_ERR_INSTALLED
-    fi
-
-    if [ -f "$CLUSTER_STACK_FILE" ]; then
-        echo "$OCF_RESKEY_stack" >"$CLUSTER_STACK_FILE"
-        if [ $? != 0 ]; then
-	    ocf_log err "Userspace stack '$OCF_RESKEY_stack' not supported"
-	    return $OCF_ERR_INSTALLED
-	fi
-    else
-	ocf_log err "Switch to userspace stack not supported"
-	return $OCF_ERR_INSTALLED
-    fi
-
-    driver_filesystem ocfs2; rc=$?
-    if [ $rc != 0 ]; then
-	modprobe -s ocfs2
-	if [ "$?" != 0 ]; then
-            ocf_log err "Unable to load ocfs2 module"
-            return $OCF_ERR_INSTALLED
-	fi
-    fi
-
-    bringup_daemon
-    return $?
-}
-
-o2cb_stop() {
-    o2cb_monitor; rc=$?
-    case $rc in
-	$OCF_NOT_RUNNING) return $OCF_SUCCESS;;
-    esac
-
-    ocf_log info "Stopping $OCF_RESOURCE_INSTANCE"
-
-    kill_daemon
-    if [ $? != 0 ]; then 
-        ocf_log err "Unable to unload modules: the cluster is still online"
-	return $OCF_ERR_GENERIC
-    fi
-
-    unload_filesystem ocfs2
-    if [ $? = 1 ]; then
-	ocf_log err "Unable to unload ocfs2 module"
-	return $OCF_ERR_GENERIC
-    fi
-
-    # If we can't find the stack glue, we have nothing to do.
-    [ ! -e "$LOADED_PLUGINS_FILE" ] && return $OCF_SUCCESS
-
-    while read plugin
-    do
-        unload_module "ocfs2_stack_${plugin}"
-        if [ $? = 1 ]; then
-	    ocf_log err "Unable to unload ocfs2_stack_${plugin}"
-	    return $OCF_ERR_GENERIC
-	fi
-    done <"$LOADED_PLUGINS_FILE"
-
-    unload_module "ocfs2_stackglue"
-    if [ $? = 1 ]; then
-	ocf_log err "Unable to unload ocfs2_stackglue"
-	return $OCF_ERR_GENERIC
-    fi
-
-    # Dont unmount configfs - its always in use by libdlm
-}
-
-o2cb_monitor() {
-    o2cb_validate
-
-    # Assume that ocfs2_controld will terminate if any of the conditions below are met
-
-    driver_filesystem configfs; rc=$?
-    if [ $rc != 0 ]; then
-	ocf_log info "configfs not laoded"
-	return $OCF_NOT_RUNNING
-    fi
-
-    check_filesystem configfs "${OCF_RESKEY_configfs}"; rc=$?
-    if [ $rc != 0 ]; then
-	ocf_log info "configfs not mounted"
-	return $OCF_NOT_RUNNING
-    fi
-
-    if [ ! -e "$LOADED_PLUGINS_FILE" ]; then
-	ocf_log info "Stack glue driver not loaded"
-	return $OCF_NOT_RUNNING
-    fi
-
-    grep user "$LOADED_PLUGINS_FILE" >/dev/null 2>&1; rc=$?
-    if [ $rc != 0 ]; then
-	ocf_log err "Wrong stack `cat $LOADED_PLUGINS_FILE`"
-	return $OCF_ERR_INSTALLED
-    fi
-
-    driver_filesystem ocfs2; rc=$?
-    if [ $rc != 0 ]; then
-	ocf_log info "ocfs2 not loaded"
-	return $OCF_NOT_RUNNING
-    fi
-
-    status_daemon
-    return $?
-}
-
-o2cb_usage() {
-    echo "usage: $0 {start|stop|monitor|validate-all|meta-data}"
-    echo "  Expects to have a fully populated OCF RA-compliant environment set."
-    echo "  In particualr, a value for OCF_ROOT"
-}
-
-o2cb_validate() {
-    : TODO: check for gloablly_unique=true and return OCF_ERR_CONFIGURED
-    case ${OCF_RESKEY_CRM_meta_gloablly_unique} in
-	yes|Yes|true|True|1) 
-	    ocf_log err "$OCF_RESOURCE_INSTANCE must be configured with the gloablly_unique=false meta attribute"
-	    exit $OCF_ERR_CONFIGURED
-	    ;;
-    esac
-
-    return $OCF_SUCCESS
-}
-
-meta_data() {
-	cat <<END
-<?xml version="1.0"?>
-<!DOCTYPE resource-agent SYSTEM "ra-api-1.dtd">
-<resource-agent name="o2cb">
-  <version>1.0</version>
-  <shortdesc lang="en">o2cb resource agent</shortdesc>
-  <longdesc lang="en">
-This is a o2cb Resource Agent. It runs o2cb daemon as a instance of anonymous clone.
-  </longdesc>
-  <parameters>
-
-    <parameter name="daemon" unique="0">
-      <longdesc lang="en">
-Full Path to ocfs2_controld daemon binary.
-      </longdesc>
-      <shortdesc lang="en">ocfs2_controld binary</shortdesc>
-      <content type="string" default="${OCF_RESKEY_daemon}"/>
-    </parameter>
-
-    <parameter name="sysfs" unique="0">
-      <longdesc lang="en">
-Location where sysfs is mounted
-      </longdesc>
-      <shortdesc lang="en">Sysfs location</shortdesc>
-      <content type="string" default="/sys/fs"/>
-    </parameter>
-
-    <parameter name="configfs" unique="0">
-      <longdesc lang="en">
-Location where configfs is mounted
-      </longdesc>
-      <shortdesc lang="en">Configfs location</shortdesc>
-      <content type="string" default="/sys/kernel/config"/>
-    </parameter>
-
-    <parameter name="stack" unique="0">
-      <longdesc lang="en">
-Which userspace stack to use.  Known values: pcmk, cman
-      </longdesc>
-      <shortdesc lang="en">Userspace stack</shortdesc>
-      <content type="string" default="pcmk"/>
-    </parameter>
-
-    <parameter name="daemon_timeout" unique="0">
-      <longdesc lang="en">
-Number of seconds to allow the control daemon to come up
-      </longdesc>
-      <shortdesc lang="en">Daemon Timeout</shortdesc>
-      <content type="string" default="10"/>
-    </parameter>
-
-  </parameters>
-  <actions>
-    <action name="start"         timeout="90" />
-    <action name="stop"          timeout="100" />
-    <action name="monitor"       timeout="20" depth="0"/>
-    <action name="meta-data"     timeout="5" />
-    <action name="validate-all"  timeout="30" />
-  </actions>
-</resource-agent>
-END
-}
-
-case $__OCF_ACTION in
-meta-data)	meta_data
-		exit $OCF_SUCCESS
-		;;
-start)		o2cb_start
-		;;
-stop)		o2cb_stop
-		;;
-monitor)	o2cb_monitor
-		;;
-validate-all)	o2cb_validate
-		;;
-usage|help)	o2cb_usage
-		exit $OCF_SUCCESS
-		;;
-*)		o2cb_usage
-		exit $OCF_ERR_UNIMPLEMENTED
-		;;
-esac
-
-exit $?
diff -Nru ocfs2-tools-1.4.2/debian/ocfs2-tools.ocfs2.init ocfs2-tools-1.4.3/debian/ocfs2-tools.ocfs2.init
--- ocfs2-tools-1.4.2/debian/ocfs2-tools.ocfs2.init	2010-02-08 16:51:12.000000000 +0000
+++ ocfs2-tools-1.4.3/debian/ocfs2-tools.ocfs2.init	1970-01-01 00:00:00.000000000 +0000
@@ -1,180 +0,0 @@
-#! /bin/bash
-# Copyright (c) 2005 Oracle
-# All rights reserved.
-#
-# chkconfig: 2345 25 19
-# description: Mount OCFS2 volumes at boot.
-#
-### BEGIN INIT INFO
-# Provides: ocfs2
-# Required-Start: $network o2cb
-# Required-Stop: 
-# X-UnitedLinux-Should-Start:
-# X-UnitedLinux-Should-Stop:
-# Default-Start:  2 3 5
-# Default-Stop:
-# Short-Description: Mount OCFS2 volumes at boot.
-# Description:  Mount OCFS2 volumes at boot.
-### END INIT INFO
-
-if [ -f /etc/redhat-release ]
-then
-. /etc/init.d/functions
-
-init_status()
-{
-    return 0
-}
-
-success_status()
-{
-    success
-    echo
-}
-
-failure_status()
-{
-    failure $1
-    echo
-}
-
-exit_status()
-{
-    exit $?
-}
-elif [ -f /etc/SuSE-release -o -f /etc/UnitedLinux-release ]
-then
-. /etc/rc.status
-
-init_status()
-{
-    rc_reset
-}
-
-success_status()
-{
-    /bin/true
-    rc_status -v
-}
-
-failure_status()
-{
-    /bin/false
-    rc_status -v
-}
-
-exit_status()
-{
-    rc_exit
-}
-else
-init_status()
-{
-    return 0
-}
-
-success_status()
-{
-    echo "OK"
-    return 0
-}
-
-failure_status()
-{
-    echo "Failed"
-    return 0
-}
-
-exit_status()
-{
-    exit $?
-}
-fi
-
-ocfs2mounts()
-{
-    LC_ALL=C awk '$3 == "ocfs2"  { print $2 }' /proc/mounts
-}
-
-ocfs2fstab()
-{
-    LC_ALL=C awk '!/^#/ && $3 == "ocfs2" && $4 !~ /noauto/ { print $2 }' /etc/fstab
-}
-
-init_status
-
-FUSER=`which fuser`
-
-case "$1" in
-    start|reload)
-        if [ -d /var/lock/subsys ] ; then
-            touch /var/lock/subsys/ocfs2
-        fi
-        if [ -n "`ocfs2fstab`" ] ; then
-            echo -n "Starting Oracle Cluster File System (OCFS2) "
-            mount -at ocfs2
-            if [ $? = 0 ]
-            then
-                success_status
-            else
-                failure_status "Unable to mount OCFS2 filesystems"
-            fi
-        fi
-        ;;
-    stop)
-        echo -n "Stopping Oracle Cluster File System (OCFS2) "
-        remaining="`ocfs2mounts`"
-        sig=
-        retry=3
-        while [ -n "$remaining" -a "$retry" -gt 0 ]
-        do
-            if [ "$retry" -lt 3 ]; then
-                echo -n "Retry stopping Oracle Cluster File System (OCFS2) "
-            fi
-            umount -a -t ocfs2 2>/dev/null
-            sleep 1
-
-            remaining="`ocfs2mounts`"
-            [ -z "$remaining" ] && break
-            failure_status "Unable to unmount OCFS2 filesystems"
-
-            $FUSER -km $sig $remaining >/dev/null
-            sleep 5
-            retry=$(($retry - 1))
-            sig=-9
-        done
-        if [ -z "$remaining" ] && [ -e /var/lock/subsys/ocfs2 ] ; then
-                rm /var/lock/subsys/ocfs2
-        fi
-        [ -z "$remaining" ] && success_status
-        ;;
-    restart|force-reload)
-        $0 stop
-        $0 start
-        ;;
-    status)
-        if [ -f /proc/mounts ] ; then
-            [ -n "`ocfs2fstab`" ] && {
-                echo "Configured OCFS2 mountpoints: " `ocfs2fstab`
-            }
-
-            [ -n "`ocfs2mounts`" ] && {
-                echo "Active OCFS2 mountpoints: " `ocfs2mounts`
-            }
-        else
-            echo -n "Checking OCFS2 mountpoints: "
-            failure_status
-        fi
-        ;;
-    try-restart|condrestart)
-        $0 status
-        if test $? = 0; then
-            $0 restart
-        fi
-        ;;
-    *)
-        echo "Usage: $0 {start|stop|status|reload|force-reload|restart|try-restart}"
-        exit 1
-esac
-
-exit_status
diff -Nru ocfs2-tools-1.4.2/debian/patches/shorten-manpage-lines.patch ocfs2-tools-1.4.3/debian/patches/shorten-manpage-lines.patch
--- ocfs2-tools-1.4.2/debian/patches/shorten-manpage-lines.patch	1970-01-01 00:00:00.000000000 +0000
+++ ocfs2-tools-1.4.3/debian/patches/shorten-manpage-lines.patch	2010-02-08 16:51:13.000000000 +0000
@@ -0,0 +1,25 @@
+diff -urN ocfs2-tools-1.4.3.orig/mkfs.ocfs2/mkfs.ocfs2.8.in ocfs2-tools-1.4.3/mkfs.ocfs2/mkfs.ocfs2.8.in
+--- ocfs2-tools-1.4.3.orig/mkfs.ocfs2/mkfs.ocfs2.8.in	2009-07-24 00:22:28.000000000 +0200
++++ ocfs2-tools-1.4.3/mkfs.ocfs2/mkfs.ocfs2.8.in	2009-11-05 08:53:35.000000000 +0100
+@@ -219,7 +219,7 @@
+ .TS
+ ;
+ L.
+-[root@node1 ~]# tunefs.ocfs2 -Q "Label: %V\\nFeatures: %H %O\\n" /dev/sdg1
++[root@node ~]# tunefs.ocfs2 -Q "Label: %V\\nFeatures: %H %O\\n" /dev/sdg1
+ Label: apache_files_10
+ Features: sparse inline-data unwritten
+ .TE
+diff -urN ocfs2-tools-1.4.3.orig/o2image/o2image.8.in ocfs2-tools-1.4.3/o2image/o2image.8.in
+--- ocfs2-tools-1.4.3.orig/o2image/o2image.8.in	2009-05-09 00:13:13.000000000 +0200
++++ ocfs2-tools-1.4.3/o2image/o2image.8.in	2009-11-05 08:29:59.000000000 +0100
+@@ -46,7 +46,8 @@
+ Copies metadata blocks from /dev/sda1 device to sda1.out file
+ 
+ [root@node1 ~] o2image -I /dev/sda1 sda1.out
+-\fBUse with CAUTION\fR. Copies meta-data blocks from sda1.out onto the /dev/sda1 device.
++\fBUse with CAUTION\fR. Copies meta-data blocks from sda1.out onto the
++/dev/sda1 device.
+ .TE
+ 
+ .SH "SEE ALSO"
diff -Nru ocfs2-tools-1.4.2/debian/rules ocfs2-tools-1.4.3/debian/rules
--- ocfs2-tools-1.4.2/debian/rules	2010-02-08 16:51:12.000000000 +0000
+++ ocfs2-tools-1.4.3/debian/rules	2010-02-08 16:51:13.000000000 +0000
@@ -1,10 +1,11 @@
 #!/usr/bin/make -f
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/autotools.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
 
 DEB_CONFIGURE_EXTRA_FLAGS = --disable-debug \
 	--enable-dynamic-ctl \
-	--enable-dynamic-fsck 
+	--enable-dynamic-fsck
 
 DEB_INSTALL_EXAMPLES_ocfs2-tools = documentation/samples/cluster.conf
 
@@ -12,17 +13,18 @@
 CFLAGS += -I/usr/include/libxml2 
 CPPFLAGS += -I/usr/include/libxml2
 
+
 common-install-arch::
 	cp -f vendor/common/o2cb.init debian/ocfs2-tools.o2cb.init
 	cp -f vendor/common/ocfs2.init debian/ocfs2-tools.ocfs2.init
+	mkdir -p debian/tmp/lib/udev/rules.d
+	cp -f vendor/common/51-ocfs2.rules debian/tmp/lib/udev/rules.d/51-ocfs2.rules
 
 binary-install/ocfs2-tools::
 	dh_installinit -p$(cdbs_curpkg) --name=o2cb --no-restart-on-upgrade -- start 60 S . start 6 0 6 . 
 	dh_installinit -p$(cdbs_curpkg) --name=ocfs2 --no-restart-on-upgrade -- start 65 S . start 2 0 6 .
-	dh_install -p$(cdbs_curpkg) --list-missing
-	mkdir -p debian/ocfs2-tools/usr/lib/ocf/resource.d/pacemaker/
-	cp -ax debian/ocfs2-tools.o2cb.ra debian/ocfs2-tools/usr/lib/ocf/resource.d/pacemaker/o2cb
-	chmod +x debian/ocfs2-tools/usr/lib/ocf/resource.d/pacemaker/
+	mkdir `pwd`/debian/ocfs2-tools/usr/sbin
+	ln -fs /sbin/ocfs2_controld.pcmk `pwd`/debian/ocfs2-tools/usr/sbin/ocfs2_controld.pcmk
 
 binary-install/ocfs2console::
 	dh_pysupport -p$(cdbs_curpkg)
