Merge lp:~percona-dev/percona-xtrabackup/safe-slave-backup into lp:percona-xtrabackup/2.0

[Aleksandr Kuzminsky]

The branch with feature:
This branch adds two new options: --safe-slave-backup and --safe-slave-backup-timeout. The options cause innobackupex to stop the slave SQL thread and wait until Slave_open_temp_tables is zero.

=== modified file 'innobackupex-1.5.1'
--- innobackupex-1.5.1	2010-08-10 12:28:48 +0000
+++ innobackupex-1.5.1	2010-08-10 17:17:44 +0000
@@ -94,6 +94,9 @@
 my $option_force_tar = '';
 my $option_scp_opt = '-Cp -c arcfour';
 
+my $option_safe_slave_backup = '';
+my $option_safe_slave_backup_timeout = 300;
+
 # name of the my.cnf configuration file
 #my $config_file = '';
 
@@ -447,6 +450,20 @@
                 server with TCP/IP.
                 Try 'mysql --help' for more details on this option.
 
+    --safe-slave-backup
+                Stop slave SQL thread and wait to start backup until
+                Slave_open_temp_tables in SHOW STATUS is zero.  If
+                there are no open temp tables, the backup will take place,
+                else the SQL thread will be started and stopped until there
+                are no open temp tables.  The backup will fail if
+                Slave_open_temp_tables does not become zero after
+                --safe-slave-backup-timeout seconds.  The slave SQL thread
+                will be restarted when the backup finishes.
+
+    --safe-slave-backup-timeout
+                 How many seconds --safe-slave-backup should wait for
+                 Slave_open_temp_tables to become zero.  (default 300)
+
     --slave-info
                 This option is useful when backing up a replication
                 slave server. It prints the binary log position and
@@ -547,12 +564,16 @@
         # connect to database
         mysql_open();
 
+        if ( $option_safe_slave_backup ) {
+          wait_for_safe_slave();
+        }
+
         # flush tables with read lock
         mysql_check();
         mysql_lockall() if !$option_no_lock;
 
     }
-    
+
     # backup .frm, .MRG, .MYD, .MYI, .TRG, .TRN, .ARM, .ARZ and .opt files
     backup_files();
 
@@ -563,6 +584,11 @@
         # release read locks on all tables
         mysql_unlockall() if !$option_no_lock;
 
+       if ( $option_safe_slave_backup ) {
+         print STDERR "$prefix: Starting slave SQL thread\n";
+         mysql_send('START SLAVE SQL_THREAD;');
+       }
+
         # disconnect from database
         mysql_close();
     }
@@ -1719,7 +1745,11 @@
                         'no-lock' => \$option_no_lock,
                         'ibbackup=s' => \$option_ibbackup_binary,
                         'scpopt=s' => \$option_scp_opt,
-                        'force-tar', => \$option_force_tar);
+                        'force-tar', => \$option_force_tar,
+        'safe-slave-backup' => \$option_safe_slave_backup,
+        'safe-slave-backup-timeout' => $option_safe_slave_backup_timeout,
+    );
+                        
     if (!$rcode) {
         # failed to read options
         print STDERR "$prefix Bad command line arguments\n";
@@ -2301,6 +2331,7 @@
   return $str;
 
 }
+<<<<<<< TREE
 
 sub set_xtrabackup_version {
 # Based on MySQL version choose correct binary
@@ -2340,3 +2371,71 @@
 return $ibbackup_binary;
 }
           
+=======
+
+# Wait until it's safe to backup a slave.  Returns immediately if
+# the host isn't a slave.  Currently there's only one check:
+# Slave_open_temp_tables has to be zero.  Dies on timeout.
+sub wait_for_safe_slave {
+   my @lines;
+
+   my $host_is_slave = 0;
+   mysql_send 'SHOW SLAVE STATUS\G;';
+   file_to_array($mysql_stdout, \@lines);
+   foreach my $line ( @lines ) {
+      if ( $line =~ m/Read_Master_Log_Pos/ ) {
+         $host_is_slave = 1;
+         last;
+      }
+   }
+   if ( !$host_is_slave ) {
+      print STDERR "$prefix: Not checking slave open temp tables for --safe-slave-backup because host is not a slave\n";
+      return;
+   }
+
+   mysql_send 'STOP SLAVE SQL_THREAD;';
+
+   my $open_temp_tables = get_slave_open_temp_tables();
+   print STDERR "$prefix: Slave open temp tables: $open_temp_tables\n";
+
+   return if $open_temp_tables == 0;
+
+   my $sleep_time = 3;
+   my $n_attempts = int($option_safe_slave_backup_timeout / $sleep_time) || 1;
+   while ( $n_attempts-- ) {
+      print STDERR "$prefix: Starting slave SQL thread, waiting $sleep_time seconds, then checking Slave_open_temp_tables again ($n_attempts attempts remaining)...\n";
+      
+      mysql_send 'START SLAVE SQL_THREAD;';
+      sleep $sleep_time;
+      mysql_send 'STOP SLAVE SQL_THREAD;';
+
+      $open_temp_tables = get_slave_open_temp_tables();
+      print STDERR "$prefix: Slave open temp tables: $open_temp_tables\n";
+      if ( !$open_temp_tables ) {
+         print STDERR "$prefix: Slave is safe to backup\n";
+         return;
+      }
+   } 
+
+   Die "Slave_open_temp_tables did not become zero after waiting $option_safe_slave_backup_timeout seconds";
+}
+
+sub get_slave_open_temp_tables {
+   my @lines;
+   mysql_send 'SHOW STATUS LIKE "slave_open_temp_tables"\G;';
+   file_to_array($mysql_stdout, \@lines);
+   my $last_value;
+   for my $i ( 0..$#lines ) {
+      $last_value = $i + 1
+         if $lines[$i] =~ m/Variable_name: Slave_open_temp_tables/i;
+   }
+   Die "SHOW STATUS LIKE 'slave_open_temp_tables' did not return anything"
+      unless $last_value;
+
+   Die "Failed to get Slave_open_temp_tables from SHOW STATUS"
+      unless defined $lines[$last_value];
+
+   my ($n) = $lines[$last_value] =~ m/(\d+)/;
+   return $n;
+}
+>>>>>>> MERGE-SOURCE

=== added directory 'utils/debian'
=== renamed directory 'utils/debian' => 'utils/debian.moved'
=== added file 'utils/debian/README.Debian'
--- utils/debian/README.Debian	1970-01-01 00:00:00 +0000
+++ utils/debian/README.Debian	2010-08-10 17:17:44 +0000
@@ -0,0 +1,6 @@
+xtrabackup for Debian
+---------------------
+
+<possible notes regarding this package - if none, delete this file>
+
+ -- Alex <[e-mail]>  Sun, 28 Jun 2009 14:20:17 -0700

=== added file 'utils/debian/changelog'
--- utils/debian/changelog	1970-01-01 00:00:00 +0000
+++ utils/debian/changelog	2010-08-10 17:17:44 +0000
@@ -0,0 +1,16 @@
+xtrabackup (1.2) unstable; urgency=low
+
+  * XtraBackup is based on XtraDB 10
+
+ -- Aleksandr Kuzminsky <[e-mail]>  Wed, 07 Mar 2010 23:45:00 +0200
+xtrabackup (1.1) unstable; urgency=low
+
+  * XtraBackup is ported to InnoDB plugin
+
+ -- Aleksandr Kuzminsky <[e-mail]>  Mon, 15 Mar 2010 07:00:00 +0200
+xtrabackup (1.0) unstable; urgency=low
+
+  * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
+
+ -- Alex <[e-mail]>  Sun, 28 Jun 2009 14:20:17 -0700
+

=== added file 'utils/debian/compat'
--- utils/debian/compat	1970-01-01 00:00:00 +0000
+++ utils/debian/compat	2010-08-10 17:17:44 +0000
@@ -0,0 +1,1 @@
+7

=== added file 'utils/debian/control'
--- utils/debian/control	1970-01-01 00:00:00 +0000
+++ utils/debian/control	2010-08-10 17:17:44 +0000
@@ -0,0 +1,15 @@
+Source: xtrabackup
+Section: misc
+Priority: extra
+Maintainer: Aleksandr Kuzminsky <[e-mail]>
+Build-Depends: debhelper, autotools-dev
+Standards-Version: 3.7.3
+Homepage: https://launchpad.net/percona-xtrabackup
+Vcs-Browser: http://bazaar.launchpad.net/~percona-dev/percona-xtrabackup/release-1.2/files
+Vcs-Bzr: bzr+ssh://bazaar.launchpad.net/~percona-dev/percona-xtrabackup/release-1.2/
+
+Package: xtrabackup
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, mysql-client
+Description: Open source backup tool for InnoDB and XtraDB
+ Open source backup tool for InnoDB and XtraDB

=== added file 'utils/debian/copyright'
--- utils/debian/copyright	1970-01-01 00:00:00 +0000
+++ utils/debian/copyright	2010-08-10 17:17:44 +0000
@@ -0,0 +1,24 @@
+This package was debianized by Alex <[e-mail]> on
+Sun, 28 Jun 2009 14:20:17 -0700.
+
+It was downloaded from <url://example.com>
+
+Upstream Author(s):
+
+    <put author's name and email here>
+    <likewise for another author>
+
+Copyright:
+
+    <Copyright (C) YYYY Name OfAuthor>
+    <likewise for another author>
+
+License:
+
+    <Put the license of the package here indented by 4 spaces>
+
+The Debian packaging is (C) 2009, Alex <[e-mail]> and
+is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.

=== added file 'utils/debian/cron.d.ex'
--- utils/debian/cron.d.ex	1970-01-01 00:00:00 +0000
+++ utils/debian/cron.d.ex	2010-08-10 17:17:44 +0000
@@ -0,0 +1,4 @@
+#
+# Regular cron jobs for the xtrabackup package
+#
+0 4	* * *	root	[ -x /usr/bin/xtrabackup_maintenance ] && /usr/bin/xtrabackup_maintenance

=== added file 'utils/debian/dirs'
--- utils/debian/dirs	1970-01-01 00:00:00 +0000
+++ utils/debian/dirs	2010-08-10 17:17:44 +0000
@@ -0,0 +1,2 @@
+usr/bin
+usr/sbin

=== added file 'utils/debian/docs'
--- utils/debian/docs	1970-01-01 00:00:00 +0000
+++ utils/debian/docs	2010-08-10 17:17:44 +0000
@@ -0,0 +1,2 @@
+CMakeLists.txt
+README

=== added file 'utils/debian/emacsen-install.ex'
--- utils/debian/emacsen-install.ex	1970-01-01 00:00:00 +0000
+++ utils/debian/emacsen-install.ex	2010-08-10 17:17:44 +0000
@@ -0,0 +1,45 @@
+#! /bin/sh -e
+# /usr/lib/emacsen-common/packages/install/xtrabackup
+
+# Written by Jim Van Zandt <[e-mail]>, borrowing heavily
+# from the install scripts for gettext by Santiago Vila
+# <[e-mail]> and octave by Dirk Eddelbuettel <[e-mail]>.
+
+FLAVOR=$1
+PACKAGE=xtrabackup
+
+if [ ${FLAVOR} = emacs ]; then exit 0; fi
+
+echo install/${PACKAGE}: Handling install for emacsen flavor ${FLAVOR}
+
+#FLAVORTEST=`echo $FLAVOR | cut -c-6`
+#if [ ${FLAVORTEST} = xemacs ] ; then
+#    SITEFLAG="-no-site-file"
+#else
+#    SITEFLAG="--no-site-file"
+#fi
+FLAGS="${SITEFLAG} -q -batch -l path.el -f batch-byte-compile"
+
+ELDIR=/usr/share/emacs/site-lisp/${PACKAGE}
+ELCDIR=/usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+
+# Install-info-altdir does not actually exist.
+# Maybe somebody will write it.
+if test -x /usr/sbin/install-info-altdir; then
+    echo install/${PACKAGE}: install Info links for ${FLAVOR}
+    install-info-altdir --quiet --section "" "" --dirname=${FLAVOR} /usr/share/info/${PACKAGE}.info.gz
+fi
+
+install -m 755 -d ${ELCDIR}
+cd ${ELDIR}
+FILES=`echo *.el`
+cp ${FILES} ${ELCDIR}
+cd ${ELCDIR}
+
+cat << EOF > path.el
+(setq load-path (cons "." load-path) byte-compile-warnings nil)
+EOF
+${FLAVOR} ${FLAGS} ${FILES}
+rm -f *.el path.el
+
+exit 0

=== added file 'utils/debian/emacsen-remove.ex'
--- utils/debian/emacsen-remove.ex	1970-01-01 00:00:00 +0000
+++ utils/debian/emacsen-remove.ex	2010-08-10 17:17:44 +0000
@@ -0,0 +1,15 @@
+#!/bin/sh -e
+# /usr/lib/emacsen-common/packages/remove/xtrabackup
+
+FLAVOR=$1
+PACKAGE=xtrabackup
+
+if [ ${FLAVOR} != emacs ]; then
+    if test -x /usr/sbin/install-info-altdir; then
+        echo remove/${PACKAGE}: removing Info links for ${FLAVOR}
+        install-info-altdir --quiet --remove --dirname=${FLAVOR} /usr/share/info/xtrabackup.info.gz
+    fi
+
+    echo remove/${PACKAGE}: purging byte-compiled files for ${FLAVOR}
+    rm -rf /usr/share/${FLAVOR}/site-lisp/${PACKAGE}
+fi

=== added file 'utils/debian/emacsen-startup.ex'
--- utils/debian/emacsen-startup.ex	1970-01-01 00:00:00 +0000
+++ utils/debian/emacsen-startup.ex	2010-08-10 17:17:44 +0000
@@ -0,0 +1,25 @@
+;; -*-emacs-lisp-*-
+;;
+;; Emacs startup file, e.g.  /etc/emacs/site-start.d/50xtrabackup.el
+;; for the Debian xtrabackup package
+;;
+;; Originally contributed by Nils Naumann <[e-mail]>
+;; Modified by Dirk Eddelbuettel <[e-mail]>
+;; Adapted for dh-make by Jim Van Zandt <[e-mail]>
+
+;; The xtrabackup package follows the Debian/GNU Linux 'emacsen' policy and
+;; byte-compiles its elisp files for each 'emacs flavor' (emacs19,
+;; xemacs19, emacs20, xemacs20...).  The compiled code is then
+;; installed in a subdirectory of the respective site-lisp directory.
+;; We have to add this to the load-path:
+(let ((package-dir (concat "/usr/share/"
+                           (symbol-name flavor)
+                           "/site-lisp/xtrabackup")))
+;; If package-dir does not exist, the xtrabackup package must have
+;; removed but not purged, and we should skip the setup.
+  (when (file-directory-p package-dir)
+        (setq load-path (cons package-dir load-path))
+       (autoload 'xtrabackup-mode "xtrabackup-mode"
+         "Major mode for editing xtrabackup files." t)
+       (add-to-list 'auto-mode-alist '("\\.xtrabackup$" . xtrabackup-mode))))
+

=== added file 'utils/debian/info'
--- utils/debian/info	1970-01-01 00:00:00 +0000
+++ utils/debian/info	2010-08-10 17:17:44 +0000
@@ -0,0 +1,1 @@
+Docs/mysql.info

=== added file 'utils/debian/init.d.ex'
--- utils/debian/init.d.ex	1970-01-01 00:00:00 +0000
+++ utils/debian/init.d.ex	2010-08-10 17:17:44 +0000
@@ -0,0 +1,157 @@
+#! /bin/sh
+#
+# skeleton	example file to build /etc/init.d/ scripts.
+#		This file should be used to construct scripts for /etc/init.d.
+#
+#		Written by Miquel van Smoorenburg <[e-mail]>.
+#		Modified for Debian
+#		by Ian Murdock <[e-mail]>.
+#               Further changes by Javier Fernandez-Sanguino <[e-mail]>
+#
+# Version:	@(#)skeleton  1.9  26-Feb-2001  [e-mail]
+#
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+DAEMON=/usr/sbin/xtrabackup
+NAME=xtrabackup
+DESC=xtrabackup
+
+test -x $DAEMON || exit 0
+
+LOGDIR=/var/log/xtrabackup
+PIDFILE=/var/run/$NAME.pid
+DODTIME=1                   # Time to wait for the server to die, in seconds
+                            # If this value is set too low you might not
+                            # let some servers to die gracefully and
+                            # 'restart' will not work
+
+# Include xtrabackup defaults if available
+if [ -f /etc/default/xtrabackup ] ; then
+	. /etc/default/xtrabackup
+fi
+
+set -e
+
+running_pid()
+{
+    # Check if a given process pid's cmdline matches a given name
+    pid=$1
+    name=$2
+    [ -z "$pid" ] && return 1
+    [ ! -d /proc/$pid ] &&  return 1
+    cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1`
+    # Is this the expected child?
+    [ "$cmd" != "$name" ] &&  return 1
+    return 0
+}
+
+running()
+{
+# Check if the process is running looking at /proc
+# (works for all users)
+
+    # No pidfile, probably no daemon present
+    [ ! -f "$PIDFILE" ] && return 1
+    # Obtain the pid and check it against the binary name
+    pid=`cat $PIDFILE`
+    running_pid $pid $DAEMON || return 1
+    return 0
+}
+
+force_stop() {
+# Forcefully kill the process
+    [ ! -f "$PIDFILE" ] && return
+    if running ; then
+        kill -15 $pid
+        # Is it really dead?
+        [ -n "$DODTIME" ] && sleep "$DODTIME"s
+        if running ; then
+            kill -9 $pid
+            [ -n "$DODTIME" ] && sleep "$DODTIME"s
+            if running ; then
+                echo "Cannot kill $LABEL (pid=$pid)!"
+                exit 1
+            fi
+        fi
+    fi
+    rm -f $PIDFILE
+    return 0
+}
+
+case "$1" in
+  start)
+	echo -n "Starting $DESC: "
+	start-stop-daemon --start --quiet --pidfile $PIDFILE \
+		--exec $DAEMON -- $DAEMON_OPTS
+        if running ; then
+            echo "$NAME."
+        else
+            echo " ERROR."
+        fi
+	;;
+  stop)
+	echo -n "Stopping $DESC: "
+	start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+		--exec $DAEMON
+	echo "$NAME."
+	;;
+  force-stop)
+	echo -n "Forcefully stopping $DESC: "
+        force_stop
+        if ! running ; then
+            echo "$NAME."
+        else
+            echo " ERROR."
+        fi
+	;;
+  #reload)
+	#
+	#	If the daemon can reload its config files on the fly
+	#	for example by sending it SIGHUP, do it here.
+	#
+	#	If the daemon responds to changes in its config file
+	#	directly anyway, make this a do-nothing entry.
+	#
+	# echo "Reloading $DESC configuration files."
+	# start-stop-daemon --stop --signal 1 --quiet --pidfile \
+	#	/var/run/$NAME.pid --exec $DAEMON
+  #;;
+  force-reload)
+	#
+	#	If the "reload" option is implemented, move the "force-reload"
+	#	option to the "reload" entry above. If not, "force-reload" is
+	#	just the same as "restart" except that it does nothing if the
+	#   daemon isn't already running.
+	# check wether $DAEMON is running. If so, restart
+	start-stop-daemon --stop --test --quiet --pidfile \
+		/var/run/$NAME.pid --exec $DAEMON \
+	&& $0 restart \
+	|| exit 0
+	;;
+  restart)
+    echo -n "Restarting $DESC: "
+	start-stop-daemon --stop --quiet --pidfile \
+		/var/run/$NAME.pid --exec $DAEMON
+	[ -n "$DODTIME" ] && sleep $DODTIME
+	start-stop-daemon --start --quiet --pidfile \
+		/var/run/$NAME.pid --exec $DAEMON -- $DAEMON_OPTS
+	echo "$NAME."
+	;;
+  status)
+    echo -n "$LABEL is "
+    if running ;  then
+        echo "running"
+    else
+        echo " not running."
+        exit 1
+    fi
+    ;;
+  *)
+	N=/etc/init.d/$NAME
+	# echo "Usage: $N {start|stop|restart|reload|force-reload}" >&2
+	echo "Usage: $N {start|stop|restart|force-reload|status|force-stop}" >&2
+	exit 1
+	;;
+esac
+
+exit 0

=== added file 'utils/debian/init.d.lsb.ex'
--- utils/debian/init.d.lsb.ex	1970-01-01 00:00:00 +0000
+++ utils/debian/init.d.lsb.ex	2010-08-10 17:17:44 +0000
@@ -0,0 +1,296 @@
+#!/bin/sh
+#
+# Example init.d script with LSB support.
+#
+# Please read this init.d carefully and modify the sections to
+# adjust it to the program you want to run.
+#
+# Copyright (c) 2007 Javier Fernandez-Sanguino <[e-mail]>
+#
+# This is free software; you may redistribute it and/or modify
+# it under the terms of the GNU General Public License as
+# published by the Free Software Foundation; either version 2,
+# or (at your option) any later version.
+#
+# This is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License with
+# the Debian operating system, in /usr/share/common-licenses/GPL;  if
+# not, write to the Free Software Foundation, Inc., 59 Temple Place,
+# Suite 330, Boston, MA 02111-1307 USA
+#
+### BEGIN INIT INFO
+# Provides:          xtrabackup
+# Required-Start:    $network $local_fs
+# Required-Stop:
+# Should-Start:      $named
+# Should-Stop:
+# Default-Start:     2 3 4 5
+# Default-Stop:      0 1 6
+# Short-Description: <Enter a short description of the sortware>
+# Description:       <Enter a long description of the software>
+#                    <...>
+#                    <...>
+### END INIT INFO
+
+PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
+
+DAEMON=/usr/sbin/xtrabackup # Introduce the server's location here
+NAME=#PACKAGE              # Introduce the short server's name here
+DESC=#PACKAGE              # Introduce a short description here
+LOGDIR=/var/log/xtrabackup  # Log directory to use
+
+PIDFILE=/var/run/$NAME.pid
+
+test -x $DAEMON || exit 0
+
+. /lib/lsb/init-functions
+
+# Default options, these can be overriden by the information
+# at /etc/default/$NAME
+DAEMON_OPTS=""          # Additional options given to the server
+
+DIETIME=10              # Time to wait for the server to die, in seconds
+                        # If this value is set too low you might not
+                        # let some servers to die gracefully and
+                        # 'restart' will not work
+
+#STARTTIME=2             # Time to wait for the server to start, in seconds
+                        # If this value is set each time the server is
+                        # started (on start or restart) the script will
+                        # stall to try to determine if it is running
+                        # If it is not set and the server takes time
+                        # to setup a pid file the log message might 
+                        # be a false positive (says it did not start
+                        # when it actually did)
+                        
+LOGFILE=$LOGDIR/$NAME.log  # Server logfile
+#DAEMONUSER=xtrabackup   # Users to run the daemons as. If this value
+                        # is set start-stop-daemon will chuid the server
+
+# Include defaults if available
+if [ -f /etc/default/$NAME ] ; then
+	. /etc/default/$NAME
+fi
+
+# Use this if you want the user to explicitly set 'RUN' in
+# /etc/default/
+#if [ "x$RUN" != "xyes" ] ; then
+#    log_failure_msg "$NAME disabled, please adjust the configuration to your needs "
+#    log_failure_msg "and then set RUN to 'yes' in /etc/default/$NAME to enable it."
+#    exit 1
+#fi
+
+# Check that the user exists (if we set a user)
+# Does the user exist?
+if [ -n "$DAEMONUSER" ] ; then
+    if getent passwd | grep -q "^$DAEMONUSER:"; then
+        # Obtain the uid and gid
+        DAEMONUID=`getent passwd |grep "^$DAEMONUSER:" | awk -F : '{print $3}'`
+        DAEMONGID=`getent passwd |grep "^$DAEMONUSER:" | awk -F : '{print $4}'`
+    else
+        log_failure_msg "The user $DAEMONUSER, required to run $NAME does not exist."
+        exit 1
+    fi
+fi
+
+
+set -e
+
+running_pid() {
+# Check if a given process pid's cmdline matches a given name
+    pid=$1
+    name=$2
+    [ -z "$pid" ] && return 1
+    [ ! -d /proc/$pid ] &&  return 1
+    cmd=`cat /proc/$pid/cmdline | tr "\000" "\n"|head -n 1 |cut -d : -f 1`
+    # Is this the expected server
+    [ "$cmd" != "$name" ] &&  return 1
+    return 0
+}
+
+running() {
+# Check if the process is running looking at /proc
+# (works for all users)
+
+    # No pidfile, probably no daemon present
+    [ ! -f "$PIDFILE" ] && return 1
+    pid=`cat $PIDFILE`
+    running_pid $pid $DAEMON || return 1
+    return 0
+}
+
+start_server() {
+# Start the process using the wrapper
+        if [ -z "$DAEMONUSER" ] ; then
+            start_daemon -p $PIDFILE $DAEMON -- $DAEMON_OPTS
+            errcode=$?
+        else
+# if we are using a daemonuser then change the user id
+            start-stop-daemon --start --quiet --pidfile $PIDFILE \
+                        --chuid $DAEMONUSER \
+                        --exec $DAEMON -- $DAEMON_OPTS
+            errcode=$?
+        fi
+	return $errcode
+}
+
+stop_server() {
+# Stop the process using the wrapper
+        if [ -z "$DAEMONUSER" ] ; then
+            killproc -p $PIDFILE $DAEMON
+            errcode=$?
+        else
+# if we are using a daemonuser then look for process that match
+            start-stop-daemon --stop --quiet --pidfile $PIDFILE \
+                        --user $DAEMONUSER \
+                        --exec $DAEMON
+            errcode=$?
+        fi
+
+	return $errcode
+}
+
+reload_server() {
+    [ ! -f "$PIDFILE" ] && return 1
+    pid=pidofproc $PIDFILE # This is the daemon's pid
+    # Send a SIGHUP
+    kill -1 $pid
+    return $?
+}
+
+force_stop() {
+# Force the process to die killing it manually
+	[ ! -e "$PIDFILE" ] && return
+	if running ; then
+		kill -15 $pid
+	# Is it really dead?
+		sleep "$DIETIME"s
+		if running ; then
+			kill -9 $pid
+			sleep "$DIETIME"s
+			if running ; then
+				echo "Cannot kill $NAME (pid=$pid)!"
+				exit 1
+			fi
+		fi
+	fi
+	rm -f $PIDFILE
+}
+
+
+case "$1" in
+  start)
+	log_daemon_msg "Starting $DESC " "$NAME"
+        # Check if it's running first
+        if running ;  then
+            log_progress_msg "apparently already running"
+            log_end_msg 0
+            exit 0
+        fi
+        if start_server ; then
+            # NOTE: Some servers might die some time after they start,
+            # this code will detect this issue if STARTTIME is set
+            # to a reasonable value
+            [ -n "$STARTTIME" ] && sleep $STARTTIME # Wait some time 
+            if  running ;  then
+                # It's ok, the server started and is running
+                log_end_msg 0
+            else
+                # It is not running after we did start
+                log_end_msg 1
+            fi
+        else
+            # Either we could not start it
+            log_end_msg 1
+        fi
+	;;
+  stop)
+        log_daemon_msg "Stopping $DESC" "$NAME"
+        if running ; then
+            # Only stop the server if we see it running
+			errcode=0
+            stop_server || errcode=$?
+            log_end_msg $errcode
+        else
+            # If it's not running don't do anything
+            log_progress_msg "apparently not running"
+            log_end_msg 0
+            exit 0
+        fi
+        ;;
+  force-stop)
+        # First try to stop gracefully the program
+        $0 stop
+        if running; then
+            # If it's still running try to kill it more forcefully
+            log_daemon_msg "Stopping (force) $DESC" "$NAME"
+			errcode=0
+            force_stop || errcode=$?
+            log_end_msg $errcode
+        fi
+	;;
+  restart|force-reload)
+        log_daemon_msg "Restarting $DESC" "$NAME"
+		errcode=0
+        stop_server || errcode=$?
+        # Wait some sensible amount, some server need this
+        [ -n "$DIETIME" ] && sleep $DIETIME
+        start_server || errcode=$?
+        [ -n "$STARTTIME" ] && sleep $STARTTIME
+        running || errcode=$?
+        log_end_msg $errcode
+	;;
+  status)
+
+        log_daemon_msg "Checking status of $DESC" "$NAME"
+        if running ;  then
+            log_progress_msg "running"
+            log_end_msg 0
+        else
+            log_progress_msg "apparently not running"
+            log_end_msg 1
+            exit 1
+        fi
+        ;;
+  # Use this if the daemon cannot reload
+  reload)
+        log_warning_msg "Reloading $NAME daemon: not implemented, as the daemon"
+        log_warning_msg "cannot re-read the config file (use restart)."
+        ;;
+  # And this if it cann
+  #reload)
+          #
+          # If the daemon can reload its config files on the fly
+          # for example by sending it SIGHUP, do it here.
+          #
+          # If the daemon responds to changes in its config file
+          # directly anyway, make this a do-nothing entry.
+          #
+          # log_daemon_msg "Reloading $DESC configuration files" "$NAME"
+          # if running ; then
+          #    reload_server
+          #    if ! running ;  then
+          # Process died after we tried to reload
+          #       log_progress_msg "died on reload"
+          #       log_end_msg 1
+          #       exit 1
+          #    fi
+          # else
+          #    log_progress_msg "server is not running"
+          #    log_end_msg 1
+          #    exit 1
+          # fi
+                                                                                    #;;
+
+  *)
+	N=/etc/init.d/$NAME
+	echo "Usage: $N {start|stop|force-stop|restart|force-reload|status}" >&2
+	exit 1
+	;;
+esac
+
+exit 0

=== added file 'utils/debian/manpage.1.ex'
--- utils/debian/manpage.1.ex	1970-01-01 00:00:00 +0000
+++ utils/debian/manpage.1.ex	2010-08-10 17:17:44 +0000
@@ -0,0 +1,59 @@
+.\"                                      Hey, EMACS: -*- nroff -*-
+.\" First parameter, NAME, should be all caps
+.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
+.\" other parameters are allowed: see man(7), man(1)
+.TH XTRABACKUP SECTION "June 28, 2009"
+.\" Please adjust this date whenever revising the manpage.
+.\"
+.\" Some roff macros, for reference:
+.\" .nh        disable hyphenation
+.\" .hy        enable hyphenation
+.\" .ad l      left justify
+.\" .ad b      justify to both left and right margins
+.\" .nf        disable filling
+.\" .fi        enable filling
+.\" .br        insert line break
+.\" .sp <n>    insert n+1 empty lines
+.\" for manpage-specific macros, see man(7)
+.SH NAME
+xtrabackup \- program to do something
+.SH SYNOPSIS
+.B xtrabackup
+.RI [ options ] " files" ...
+.br
+.B bar
+.RI [ options ] " files" ...
+.SH DESCRIPTION
+This manual page documents briefly the
+.B xtrabackup
+and
+.B bar
+commands.
+.PP
+.\" TeX users may be more comfortable with the \fB<whatever>\fP and
+.\" \fI<whatever>\fP escape sequences to invode bold face and italics,
+.\" respectively.
+\fBxtrabackup\fP is a program that...
+.SH OPTIONS
+These programs follow the usual GNU command line syntax, with long
+options starting with two dashes (`-').
+A summary of options is included below.
+For a complete description, see the Info files.
+.TP
+.B \-h, \-\-help
+Show summary of options.
+.TP
+.B \-v, \-\-version
+Show version of program.
+.SH SEE ALSO
+.BR bar (1),
+.BR baz (1).
+.br
+The programs are documented fully by
+.IR "The Rise and Fall of a Fooish Bar" ,
+available via the Info system.
+.SH AUTHOR
+xtrabackup was written by <upstream author>.
+.PP
+This manual page was written by Alex <[e-mail]>,
+for the Debian project (but may be used by others).

=== added file 'utils/debian/manpage.sgml.ex'
--- utils/debian/manpage.sgml.ex	1970-01-01 00:00:00 +0000
+++ utils/debian/manpage.sgml.ex	2010-08-10 17:17:44 +0000
@@ -0,0 +1,156 @@
+<!doctype refentry PUBLIC "-//OASIS//DTD DocBook V4.1//EN" [
+
+<!-- Process this file with docbook-to-man to generate an nroff manual
+     page: `docbook-to-man manpage.sgml > manpage.1'.  You may view
+     the manual page with: `docbook-to-man manpage.sgml | nroff -man |
+     less'.  A typical entry in a Makefile or Makefile.am is:
+
+manpage.1: manpage.sgml
+	docbook-to-man $< > $@
+
+
+	The docbook-to-man binary is found in the docbook-to-man package.
+	Please remember that if you create the nroff version in one of the
+	debian/rules file targets (such as build), you will need to include
+	docbook-to-man in your Build-Depends control field.
+
+  -->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "<firstname>FIRSTNAME</firstname>">
+  <!ENTITY dhsurname   "<surname>SURNAME</surname>">
+  <!-- Please adjust the date whenever revising the manpage. -->
+  <!ENTITY dhdate      "<date>June 28, 2009</date>">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1). -->
+  <!ENTITY dhsection   "<manvolnum>SECTION</manvolnum>">
+  <!ENTITY dhemail     "<email>[e-mail]</email>">
+  <!ENTITY dhusername  "Alex">
+  <!ENTITY dhucpackage "<refentrytitle>XTRABACKUP</refentrytitle>">
+  <!ENTITY dhpackage   "xtrabackup">
+
+  <!ENTITY debian      "<productname>Debian</productname>">
+  <!ENTITY gnu         "<acronym>GNU</acronym>">
+  <!ENTITY gpl         "&gnu; <acronym>GPL</acronym>">
+]>
+
+<refentry>
+  <refentryinfo>
+    <address>
+      &dhemail;
+    </address>
+    <author>
+      &dhfirstname;
+      &dhsurname;
+    </author>
+    <copyright>
+      <year>2003</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    &dhdate;
+  </refentryinfo>
+  <refmeta>
+    &dhucpackage;
+
+    &dhsection;
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+
+    <refpurpose>program to do something</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+
+      <arg><option>-e <replaceable>this</replaceable></option></arg>
+
+      <arg><option>--example <replaceable>that</replaceable></option></arg>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1>
+    <title>DESCRIPTION</title>
+
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> and <command>bar</command>
+      commands.</para>
+
+    <para>This manual page was written for the &debian; distribution
+      because the original program does not have a manual page.
+      Instead, it has documentation in the &gnu;
+      <application>Info</application> format; see below.</para>
+
+    <para><command>&dhpackage;</command> is a program that...</para>
+
+  </refsect1>
+  <refsect1>
+    <title>OPTIONS</title>
+
+    <para>These programs follow the usual &gnu; command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below.  For a complete description, see the
+      <application>Info</application> files.</para>
+
+    <variablelist>
+      <varlistentry>
+        <term><option>-h</option>
+          <option>--help</option>
+        </term>
+        <listitem>
+          <para>Show summary of options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-v</option>
+          <option>--version</option>
+        </term>
+        <listitem>
+          <para>Show version of program.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1>
+    <title>SEE ALSO</title>
+
+    <para>bar (1), baz (1).</para>
+
+    <para>The programs are documented fully by <citetitle>The Rise and
+      Fall of a Fooish Bar</citetitle> available via the
+      <application>Info</application> system.</para>
+  </refsect1>
+  <refsect1>
+    <title>AUTHOR</title>
+
+    <para>This manual page was written by &dhusername; &dhemail; for
+      the &debian; system (but may be used by others).  Permission is
+      granted to copy, distribute and/or modify this document under
+      the terms of the &gnu; General Public License, Version 2 any
+	  later version published by the Free Software Foundation.
+    </para>
+	<para>
+	  On Debian systems, the complete text of the GNU General Public
+	  License can be found in /usr/share/common-licenses/GPL.
+	</para>
+
+  </refsect1>
+</refentry>
+
+<!-- Keep this comment at the end of the file
+Local variables:
+mode: sgml
+sgml-omittag:t
+sgml-shorttag:t
+sgml-minimize-attributes:nil
+sgml-always-quote-attributes:t
+sgml-indent-step:2
+sgml-indent-data:t
+sgml-parent-document:nil
+sgml-default-dtd-file:nil
+sgml-exposed-tags:nil
+sgml-local-catalogs:nil
+sgml-local-ecat-files:nil
+End:
+-->
+
+

=== added file 'utils/debian/manpage.xml.ex'
--- utils/debian/manpage.xml.ex	1970-01-01 00:00:00 +0000
+++ utils/debian/manpage.xml.ex	2010-08-10 17:17:44 +0000
@@ -0,0 +1,291 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+"http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd" [
+
+<!--
+
+`xsltproc -''-nonet \
+          -''-param man.charmap.use.subset "0" \
+          -''-param make.year.ranges "1" \
+          -''-param make.single.year.ranges "1" \
+          /usr/share/xml/docbook/stylesheet/nwalsh/manpages/docbook.xsl \
+          manpage.xml'
+
+A manual page <package>.<section> will be generated. You may view the
+manual page with: nroff -man <package>.<section> | less'. A typical entry
+in a Makefile or Makefile.am is:
+
+DB2MAN = /usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
+XP     = xsltproc -''-nonet -''-param man.charmap.use.subset "0"
+
+manpage.1: manpage.xml
+        $(XP) $(DB2MAN) $<
+
+The xsltproc binary is found in the xsltproc package. The XSL files are in
+docbook-xsl. A description of the parameters you can use can be found in the
+docbook-xsl-doc-* packages. Please remember that if you create the nroff
+version in one of the debian/rules file targets (such as build), you will need
+to include xsltproc and docbook-xsl in your Build-Depends control field.
+Alternatively use the xmlto command/package. That will also automatically
+pull in xsltproc and docbook-xsl.
+
+Notes for using docbook2x: docbook2x-man does not automatically create the
+AUTHOR(S) and COPYRIGHT sections. In this case, please add them manually as
+<refsect1> ... </refsect1>.
+
+To disable the automatic creation of the AUTHOR(S) and COPYRIGHT sections
+read /usr/share/doc/docbook-xsl/doc/manpages/authors.html. This file can be
+found in the docbook-xsl-doc-html package.
+
+Validation can be done using: `xmllint -''-noout -''-valid manpage.xml`
+
+General documentation about man-pages and man-page-formatting:
+man(1), man(7), http://www.tldp.org/HOWTO/Man-Page/
+
+-->
+
+  <!-- Fill in your name for FIRSTNAME and SURNAME. -->
+  <!ENTITY dhfirstname "FIRSTNAME">
+  <!ENTITY dhsurname   "SURNAME">
+  <!-- dhusername could also be set to "&firstname; &surname;". -->  
+  <!ENTITY dhusername  "Alex">
+  <!ENTITY dhemail     "[e-mail]">
+  <!-- SECTION should be 1-8, maybe w/ subsection other parameters are
+       allowed: see man(7), man(1) and
+       http://www.tldp.org/HOWTO/Man-Page/q2.html. -->
+  <!ENTITY dhsection   "SECTION">
+  <!-- TITLE should be something like "User commands" or similar (see
+       http://www.tldp.org/HOWTO/Man-Page/q2.html). -->
+  <!ENTITY dhtitle     "xtrabackup User Manual">
+  <!ENTITY dhucpackage "XTRABACKUP">
+  <!ENTITY dhpackage   "xtrabackup">
+]>
+
+<refentry>
+  <refentryinfo>
+    <title>&dhtitle;</title>
+    <productname>&dhpackage;</productname>
+    <authorgroup>
+      <author>
+       <firstname>&dhfirstname;</firstname>
+        <surname>&dhsurname;</surname>
+        <contrib>Wrote this manpage for the Debian system.</contrib>
+        <address>
+          <email>&dhemail;</email>
+        </address>
+      </author>
+    </authorgroup>
+    <copyright>
+      <year>2007</year>
+      <holder>&dhusername;</holder>
+    </copyright>
+    <legalnotice>
+      <para>This manual page was written for the Debian system
+        (but may be used by others).</para>
+      <para>Permission is granted to copy, distribute and/or modify this
+        document under the terms of the GNU General Public License,
+        Version 2 or (at your option) any later version published by
+        the Free Software Foundation.</para>
+      <para>On Debian systems, the complete text of the GNU General Public
+        License can be found in
+	<filename>/usr/share/common-licenses/GPL</filename>.</para>
+    </legalnotice>
+  </refentryinfo>
+  <refmeta>
+    <refentrytitle>&dhucpackage;</refentrytitle>
+    <manvolnum>&dhsection;</manvolnum>
+  </refmeta>
+  <refnamediv>
+    <refname>&dhpackage;</refname>
+    <refpurpose>program to do something</refpurpose>
+  </refnamediv>
+  <refsynopsisdiv>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+      <!-- These are several examples, how syntaxes could look -->
+      <arg choice="plain"><option>-e <replaceable>this</replaceable></option></arg>
+      <arg choice="opt"><option>--example=<parameter>that</parameter></option></arg>
+      <arg choice="opt">
+        <group choice="req">
+          <arg choice="plain"><option>-e</option></arg>
+          <arg choice="plain"><option>--example</option></arg>
+        </group>
+        <replaceable class="option">this</replaceable>
+      </arg>
+      <arg choice="opt">
+        <group choice="req">
+          <arg choice="plain"><option>-e</option></arg>
+          <arg choice="plain"><option>--example</option></arg>
+        </group>
+        <group choice="req">
+          <arg choice="plain"><replaceable>this</replaceable></arg>
+          <arg choice="plain"><replaceable>that</replaceable></arg>
+        </group>
+      </arg>
+    </cmdsynopsis>
+    <cmdsynopsis>
+      <command>&dhpackage;</command>
+      <!-- Normally the help and version options make the programs stop
+           right after outputting the requested information. -->
+      <group choice="opt">
+        <arg choice="plain">
+          <group choice="req">
+            <arg choice="plain"><option>-h</option></arg>
+            <arg choice="plain"><option>--help</option></arg>
+          </group>
+        </arg>
+        <arg choice="plain">
+          <group choice="req">
+            <arg choice="plain"><option>-v</option></arg>
+            <arg choice="plain"><option>--version</option></arg>
+          </group>
+        </arg>
+      </group>
+    </cmdsynopsis>
+  </refsynopsisdiv>
+  <refsect1 id="description">
+    <title>DESCRIPTION</title>
+    <para>This manual page documents briefly the
+      <command>&dhpackage;</command> and <command>bar</command>
+      commands.</para>
+    <para>This manual page was written for the Debian distribution
+      because the original program does not have a manual page.
+      Instead, it has documentation in the GNU <citerefentry>
+        <refentrytitle>info</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry> format; see below.</para>
+    <para><command>&dhpackage;</command> is a program that...</para>
+  </refsect1>
+  <refsect1 id="options">
+    <title>OPTIONS</title>
+    <para>The program follows the usual GNU command line syntax,
+      with long options starting with two dashes (`-').  A summary of
+      options is included below.  For a complete description, see the
+      <citerefentry>
+        <refentrytitle>info</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry> files.</para>
+    <variablelist>
+      <!-- Use the variablelist.term.separator and the
+           variablelist.term.break.after parameters to
+           control the term elements. -->
+      <varlistentry>
+        <term><option>-e <replaceable>this</replaceable></option></term>
+        <term><option>--example=<replaceable>that</replaceable></option></term>
+        <listitem>
+          <para>Does this and that.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-h</option></term>
+        <term><option>--help</option></term>
+        <listitem>
+          <para>Show summary of options.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><option>-v</option></term>
+        <term><option>--version</option></term>
+        <listitem>
+          <para>Show version of program.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1 id="files">
+    <title>FILES</title>
+    <variablelist>
+      <varlistentry>
+        <term><filename>/etc/foo.conf</filename></term>
+        <listitem>
+          <para>The system-wide configuration file to control the
+            behaviour of <application>&dhpackage;</application>. See
+            <citerefentry>
+              <refentrytitle>foo.conf</refentrytitle>
+              <manvolnum>5</manvolnum>
+            </citerefentry> for further details.</para>
+        </listitem>
+      </varlistentry>
+      <varlistentry>
+        <term><filename>${HOME}/.foo.conf</filename></term>
+        <listitem>
+          <para>The per-user configuration file to control the
+             behaviour of <application>&dhpackage;</application>. See
+             <citerefentry>
+               <refentrytitle>foo.conf</refentrytitle>
+               <manvolnum>5</manvolnum>
+             </citerefentry> for further details.</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1 id="environment">
+    <title>ENVIONMENT</title>
+    <variablelist>
+      <varlistentry>
+        <term><envar>FOO_CONF</envar></term>
+        <listitem>
+          <para>If used, the defined file is used as configuration
+            file (see also <xref linkend="files"/>).</para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+  </refsect1>
+  <refsect1 id="diagnostics">
+    <title>DIAGNOSTICS</title>
+    <para>The following diagnostics may be issued
+      on <filename class="devicefile">stderr</filename>:</para>
+    <variablelist>
+      <varlistentry>
+        <term><errortext>Bad configuration file. Exiting.</errortext></term>
+        <listitem>
+          <para>The configuration file seems to contain a broken configuration
+            line. Use the <option>--verbose</option> option, to get more info.
+          </para>
+        </listitem>
+      </varlistentry>
+    </variablelist>
+    <para><command>&dhpackage;</command> provides some return codes, that can
+      be used in scripts:</para>
+    <segmentedlist>
+      <segtitle>Code</segtitle>
+      <segtitle>Diagnostic</segtitle>
+      <seglistitem>
+        <seg><errorcode>0</errorcode></seg>
+        <seg>Program exited successfully.</seg>
+      </seglistitem>
+      <seglistitem>
+        <seg><errorcode>1</errorcode></seg>
+        <seg>The configuration file seems to be broken.</seg>
+      </seglistitem>
+    </segmentedlist>
+  </refsect1>
+  <refsect1 id="bugs">
+    <!-- Or use this section to tell about upstream BTS. -->
+    <title>BUGS</title>
+    <para>The program is currently limited to only work
+      with the <package>foobar</package> library.</para>
+    <para>The upstreams <acronym>BTS</acronym> can be found
+      at <ulink url="http://bugzilla.foo.tld"/>.</para>
+  </refsect1>
+  <refsect1 id="see_also">
+    <title>SEE ALSO</title>
+    <!-- In alpabetical order. -->
+    <para><citerefentry>
+        <refentrytitle>bar</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry>, <citerefentry>
+        <refentrytitle>baz</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry>, <citerefentry>
+        <refentrytitle>foo.conf</refentrytitle>
+        <manvolnum>5</manvolnum>
+      </citerefentry></para>
+    <para>The programs are documented fully by <citetitle>The Rise and
+      Fall of a Fooish Bar</citetitle> available via the <citerefentry>
+        <refentrytitle>info</refentrytitle>
+        <manvolnum>1</manvolnum>
+      </citerefentry> system.</para>
+  </refsect1>
+</refentry>
+

=== added file 'utils/debian/menu.ex'
--- utils/debian/menu.ex	1970-01-01 00:00:00 +0000
+++ utils/debian/menu.ex	2010-08-10 17:17:44 +0000
@@ -0,0 +1,2 @@
+?package(xtrabackup):needs="X11|text|vc|wm" section="Applications/see-menu-manual"\
+  title="xtrabackup" command="/usr/bin/xtrabackup"

=== added file 'utils/debian/postinst.ex'
--- utils/debian/postinst.ex	1970-01-01 00:00:00 +0000
+++ utils/debian/postinst.ex	2010-08-10 17:17:44 +0000
@@ -0,0 +1,41 @@
+#!/bin/sh
+# postinst script for xtrabackup
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postinst> `configure' <most-recently-configured-version>
+#        * <old-postinst> `abort-upgrade' <new version>
+#        * <conflictor's-postinst> `abort-remove' `in-favour' <package>
+#          <new-version>
+#        * <postinst> `abort-remove'
+#        * <deconfigured's-postinst> `abort-deconfigure' `in-favour'
+#          <failed-install-package> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    configure)
+    ;;
+
+    abort-upgrade|abort-remove|abort-deconfigure)
+    ;;
+
+    *)
+        echo "postinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

=== added file 'utils/debian/postrm.ex'
--- utils/debian/postrm.ex	1970-01-01 00:00:00 +0000
+++ utils/debian/postrm.ex	2010-08-10 17:17:44 +0000
@@ -0,0 +1,39 @@
+#!/bin/sh
+# postrm script for xtrabackup
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <postrm> `remove'
+#        * <postrm> `purge'
+#        * <old-postrm> `upgrade' <new-version>
+#        * <new-postrm> `failed-upgrade' <old-version>
+#        * <new-postrm> `abort-install'
+#        * <new-postrm> `abort-install' <old-version>
+#        * <new-postrm> `abort-upgrade' <old-version>
+#        * <disappearer's-postrm> `disappear' <overwriter>
+#          <overwriter-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    purge|remove|upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
+    ;;
+
+    *)
+        echo "postrm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

=== added file 'utils/debian/preinst.ex'
--- utils/debian/preinst.ex	1970-01-01 00:00:00 +0000
+++ utils/debian/preinst.ex	2010-08-10 17:17:44 +0000
@@ -0,0 +1,37 @@
+#!/bin/sh
+# preinst script for xtrabackup
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <new-preinst> `install'
+#        * <new-preinst> `install' <old-version>
+#        * <new-preinst> `upgrade' <old-version>
+#        * <old-preinst> `abort-upgrade' <new-version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    install|upgrade)
+    ;;
+
+    abort-upgrade)
+    ;;
+
+    *)
+        echo "preinst called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

=== added file 'utils/debian/prerm.ex'
--- utils/debian/prerm.ex	1970-01-01 00:00:00 +0000
+++ utils/debian/prerm.ex	2010-08-10 17:17:44 +0000
@@ -0,0 +1,40 @@
+#!/bin/sh
+# prerm script for xtrabackup
+#
+# see: dh_installdeb(1)
+
+set -e
+
+# summary of how this script can be called:
+#        * <prerm> `remove'
+#        * <old-prerm> `upgrade' <new-version>
+#        * <new-prerm> `failed-upgrade' <old-version>
+#        * <conflictor's-prerm> `remove' `in-favour' <package> <new-version>
+#        * <deconfigured's-prerm> `deconfigure' `in-favour'
+#          <package-being-installed> <version> `removing'
+#          <conflicting-package> <version>
+# for details, see http://www.debian.org/doc/debian-policy/ or
+# the debian-policy package
+
+
+case "$1" in
+    remove|upgrade|deconfigure)
+    ;;
+
+    failed-upgrade)
+    ;;
+
+    *)
+        echo "prerm called with unknown argument \`$1'" >&2
+        exit 1
+    ;;
+esac
+
+# dh_installdeb will replace this with shell code automatically
+# generated by other debhelper scripts.
+
+#DEBHELPER#
+
+exit 0
+
+

=== added file 'utils/debian/rules'
--- utils/debian/rules	1970-01-01 00:00:00 +0000
+++ utils/debian/rules	2010-08-10 17:17:44 +0000
@@ -0,0 +1,109 @@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# This file was originally written by Joey Hess and Craig Small.
+# As a special exception, when this file is copied by dh-make into a
+# dh-make output file, you may use that output file without restriction.
+# This special exception was added by Craig Small in version 0.37 of dh-make.
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+
+# These are used for cross-compiling and for saving the configure script
+# from having to guess our platform (since we know it already)
+DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
+CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
+else
+CROSS= --build $(DEB_BUILD_GNU_TYPE)
+endif
+
+MAKE_J = -j$(shell if [ -f /proc/cpuinfo ] ; then grep -c processor.* /proc/cpuinfo ; else echo 1 ; fi)
+
+
+config.status: configure
+	dh_testdir
+	# Add here commands to configure the package.
+ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+	cp -f /usr/share/misc/config.sub config.sub
+endif
+ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+	cp -f /usr/share/misc/config.guess config.guess
+endif
+	./configure --enable-local-infile --enable-thread-safe-client --with-plugins=innobase --with-zlib-dir=bundled --with-extra-charsets=complex
+
+
+build: build-stamp
+
+build-stamp:  config.status 
+	dh_testdir
+
+	# Add here commands to compile the package.
+	$(MAKE) $(MAKE_J)
+	cd storage/innobase/xtrabackup && $(MAKE) && cd -
+	cd libtar-1.2.11 && ./configure --prefix=/usr && $(MAKE) && cd -
+
+	#docbook-to-man debian/xtrabackup.sgml > xtrabackup.1
+
+	touch $@
+
+clean: 
+	dh_testdir
+	dh_testroot
+	rm -f build-stamp 
+
+	# Add here commands to clean up after the build process.
+	[ ! -f Makefile ] || $(MAKE) distclean
+	rm -f config.sub config.guess
+
+	dh_clean 
+
+install: build
+	dh_testdir
+	dh_testroot
+	dh_clean -k 
+	dh_installdirs
+
+	# Add here commands to install the package into debian/xtrabackup.
+	cd storage/innobase/xtrabackup && install xtrabackup $(CURDIR)/debian/xtrabackup/usr/bin && install innobackupex-1.5.1 $(CURDIR)/debian/xtrabackup/usr/bin && cd -
+	cd libtar-1.2.11/libtar/ && install tar4ibd $(CURDIR)/debian/xtrabackup/usr/bin && cd -
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+# Build architecture-dependent files here.
+binary-arch: build install
+	dh_testdir
+	dh_testroot
+	dh_installchangelogs ChangeLog
+	dh_installdocs
+	dh_installexamples
+#	dh_install
+#	dh_installmenu
+#	dh_installdebconf	
+#	dh_installlogrotate
+#	dh_installemacsen
+#	dh_installpam
+#	dh_installmime
+#	dh_python
+#	dh_installinit
+#	dh_installcron
+#	dh_installinfo
+	dh_installman
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+#	dh_perl
+#	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
+
+binary: binary-indep binary-arch
+.PHONY: build clean binary-indep binary-arch binary install 

=== added file 'utils/debian/watch.ex'
--- utils/debian/watch.ex	1970-01-01 00:00:00 +0000
+++ utils/debian/watch.ex	2010-08-10 17:17:44 +0000
@@ -0,0 +1,23 @@
+# Example watch control file for uscan
+# Rename this file to "watch" and then you can run the "uscan" command
+# to check for upstream updates and more.
+# See uscan(1) for format
+
+# Compulsory line, this is a version 3 file
+version=3
+
+# Uncomment to examine a Webpage
+# <Webpage URL> <string match>
+#http://www.example.com/downloads.php xtrabackup-(.*)\.tar\.gz
+
+# Uncomment to examine a Webserver directory
+#http://www.example.com/pub/xtrabackup-(.*)\.tar\.gz
+
+# Uncommment to examine a FTP server
+#ftp://ftp.example.com/pub/xtrabackup-(.*)\.tar\.gz debian uupdate
+
+# Uncomment to find new files on sourceforge, for devscripts >= 2.9
+# http://sf.net/xtrabackup/xtrabackup-(.*)\.tar\.gz
+
+# Uncomment to find new files on GooglePages
+# http://example.googlepages.com/foo.html xtrabackup-(.*)\.tar\.gz

=== added file 'utils/debian/xtrabackup.default.ex'
--- utils/debian/xtrabackup.default.ex	1970-01-01 00:00:00 +0000
+++ utils/debian/xtrabackup.default.ex	2010-08-10 17:17:44 +0000
@@ -0,0 +1,10 @@
+# Defaults for xtrabackup initscript
+# sourced by /etc/init.d/xtrabackup
+# installed at /etc/default/xtrabackup by the maintainer scripts
+
+#
+# This is a POSIX shell fragment
+#
+
+# Additional options that are passed to the Daemon.
+DAEMON_OPTS=""

=== added file 'utils/debian/xtrabackup.doc-base.EX'
--- utils/debian/xtrabackup.doc-base.EX	1970-01-01 00:00:00 +0000
+++ utils/debian/xtrabackup.doc-base.EX	2010-08-10 17:17:44 +0000
@@ -0,0 +1,22 @@
+Document: xtrabackup
+Title: Debian xtrabackup Manual
+Author: <insert document author here>
+Abstract: This manual describes what xtrabackup is
+ and how it can be used to
+ manage online manuals on Debian systems.
+Section: unknown
+
+Format: debiandoc-sgml
+Files: /usr/share/doc/xtrabackup/xtrabackup.sgml.gz
+
+Format: postscript
+Files: /usr/share/doc/xtrabackup/xtrabackup.ps.gz
+
+Format: text
+Files: /usr/share/doc/xtrabackup/xtrabackup.text.gz
+
+Format: HTML
+Index: /usr/share/doc/xtrabackup/html/index.html
+Files: /usr/share/doc/xtrabackup/html/*.html
+
+

=== modified file 'utils/xtrabackup.spec'
--- utils/xtrabackup.spec	2010-08-10 10:48:03 +0000
+++ utils/xtrabackup.spec	2010-08-10 17:17:44 +0000
@@ -5,9 +5,16 @@
 %{!?buildnumber:%define buildnumber 1}
 %define distribution  rhel%{redhat_version}
 %define release       %{buildnumber}.%{distribution}
+<<<<<<< TREE
 %define xtrabackup_version 1.3
 %define xtradb_version 11
+=======
+%define xtrabackup_version 1.2
+>>>>>>> MERGE-SOURCE
 %{!?xtrabackup_revision:%define xtrabackup_revision undefined}
+%define mysql_version 5.1.45
+%define innodb_plugin_version 1.0.6
+%define xtradb_version 10
 
 %define __os_install_post /usr/lib/rpm/brp-compress
 
@@ -18,8 +25,16 @@
 Group: Server/Databases
 License: GPLv2
 Packager: Vadim Tkachenko <[e-mail]>
+<<<<<<< TREE
 URL: http://www.percona.com/software/percona-xtrabackup/
 Source: xtrabackup-%{xtrabackup_version}.tar.gz
+=======
+URL: http://percona.com/percona-lab.html
+Source0: mysql-%{mysql_version}.tar.gz
+Source1: http://www.percona.com/percona-builds/Percona-XtraDB/Percona-XtraDB-%{mysql_version}-%{xtradb_version}/source/percona-xtradb-%{innodb_plugin_version}-%{xtradb_version}.tar.gz
+Source2: ftp://ftp.feep.net/pub/software/libtar/libtar-1.2.11.tar.gz
+Source3: xtrabackup-%{xtrabackup_version}.tar.gz
+>>>>>>> MERGE-SOURCE
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 Requires: mysql
 
@@ -39,17 +54,46 @@
 
 
 %prep
+<<<<<<< TREE
 %setup -q
+=======
 
+%setup -n mysql-%{mysql_version} -q
+tar zxf $RPM_SOURCE_DIR/libtar-1.2.11.tar.gz
+cd libtar-1.2.11
+cd ../
+cd storage
+rm -rf innobase
+tar zxf $RPM_SOURCE_DIR/percona-xtradb-%{innodb_plugin_version}-%{xtradb_version}.tar.gz
+mv percona-xtradb-%{innodb_plugin_version}-%{xtradb_version} innobase
+cd innobase
+tar zxf $RPM_SOURCE_DIR/xtrabackup-%{xtrabackup_version}.tar.gz
+mv xtrabackup-%{xtrabackup_version} xtrabackup
+patch -p1 < xtrabackup/fix_innodb_for_backup_xtradb.patch
+cd ../../libtar-1.2.11
+patch -p1 < ../storage/innobase/xtrabackup/tar4ibd_libtar-1.2.11.patch
+>>>>>>> MERGE-SOURCE
 
 %build
 export CC=${CC-"gcc"} 
 export CXX=$CC 
 export CFLAGS="$CFLAGS -DXTRABACKUP_VERSION=\\\"%{xtrabackup_version}\\\" -DXTRABACKUP_REVISION=\\\"%{xtrabackup_revision}\\\"" 
+<<<<<<< TREE
 export CXXFLAGS="$CXXFLAGS -DXTRABACKUP_VERSION=\\\"%{xtrabackup_version}\\\" -DXTRABACKUP_REVISION=\\\"%{xtrabackup_revision}\\\"" 
 cp $RPM_SOURCE_DIR/libtar-1.2.11.tar.gz $RPM_SOURCE_DIR/mysql-5.0.91.tar.gz .
 ./utils/build.sh 5.0
 ./utils/build.sh xtradb
+=======
+./configure \
+  --prefix=%{_prefix} --enable-local-infile --enable-thread-safe-client --with-plugins=innobase --with-zlib-dir=bundled --with-extra-charsets=complex
+make -j`if [ -f /proc/cpuinfo ] ; then grep -c processor.* /proc/cpuinfo ; else echo 1 ; fi`
+cd storage/innobase/xtrabackup
+make
+cd ../../..
+cd libtar-1.2.11
+./configure --prefix=%{_prefix}
+make
+>>>>>>> MERGE-SOURCE
 
 %install
 [ "%{buildroot}" != '/' ] && rm -rf %{buildroot}