[Pkg-mysql-commits] r1801 - in mylvmbackup/trunk/debian: . patches

[Norbert Tretkowski]

Author: nobse
Date: 2010-01-13 12:01:38 +0000 (Wed, 13 Jan 2010)
New Revision: 1801

Modified:
   mylvmbackup/trunk/debian/changelog
   mylvmbackup/trunk/debian/patches/02_fix-config-paths.diff
Log:
Update patch.

Modified: mylvmbackup/trunk/debian/changelog
===================================================================
--- mylvmbackup/trunk/debian/changelog	2010-01-13 11:41:21 UTC (rev 1800)
+++ mylvmbackup/trunk/debian/changelog	2010-01-13 12:01:38 UTC (rev 1801)
@@ -5,7 +5,7 @@
     + copyright-refers-to-versionless-license-file
     + debhelper-but-no-misc-depends
 
- -- Norbert Tretkowski <nobse at debian.org>  Thu, 17 Sep 2009 08:27:07 +0200
+ -- Norbert Tretkowski <nobse at debian.org>  Wed, 13 Jan 2010 13:02:20 +0100
 
 mylvmbackup (0.12-1) unstable; urgency=low
 

Modified: mylvmbackup/trunk/debian/patches/02_fix-config-paths.diff
===================================================================
--- mylvmbackup/trunk/debian/patches/02_fix-config-paths.diff	2010-01-13 11:41:21 UTC (rev 1800)
+++ mylvmbackup/trunk/debian/patches/02_fix-config-paths.diff	2010-01-13 12:01:38 UTC (rev 1801)
@@ -15,10 +15,10 @@
 exit 0
 
 @DPATCH@
-diff -Nur mylvmbackup-0.11.orig/man/mylvmbackup.pod mylvmbackup-0.11/man/mylvmbackup.pod
---- mylvmbackup-0.11.orig/man/mylvmbackup.pod	2008-11-23 14:09:31.000000000 +0100
-+++ mylvmbackup-0.11/man/mylvmbackup.pod	2009-01-21 12:38:57.000000000 +0100
-@@ -219,7 +219,7 @@
+diff -Nur mylvmbackup-0.13.orig/man/mylvmbackup.pod mylvmbackup-0.13/man/mylvmbackup.pod
+--- mylvmbackup-0.13.orig/man/mylvmbackup.pod	2009-06-26 17:49:08.000000000 +0200
++++ mylvmbackup-0.13/man/mylvmbackup.pod	2010-01-13 12:50:38.000000000 +0100
+@@ -230,7 +230,7 @@
  that is spawned to perform the InnoDB recovery (see option
  I<--innodb_recover>). Must be different from the PID file that the actual
  running server uses.
@@ -27,27 +27,27 @@
  
  =item B<--lvcreate=string>
  
-@@ -322,7 +322,7 @@
+@@ -344,7 +344,7 @@
  =item B<--mountdir=string>
  
  Path for mounting the snapshot volume to.
 -The default value is I</var/tmp/mylvmbackup/mnt/>.
 +The default value is I</var/cache/mylvmbackup/mnt/>.
+ If the directory does not exist, it will be created.
  
- =item B<--backupdir=string>
+ It is possible to use selected I<timestr()> formatting sequences to create
+@@ -382,7 +382,7 @@
+ This requires a properly configured remote rsync setup (e.g. pre-setup SSH keys
+ or a working rsyncd configuration).
  
-@@ -333,7 +333,7 @@
- properly configured remote rsync setup (e.g. pre-setup SSH keys and a
- valid rsyncd.conf file). Note that using rsync for remote backups is still
- under development and the way to configure it may change!
 -The default is I</var/tmp/mylvmbackup/backup/>
 +The default is I</var/cache/mylvmbackup/backup/>
  
  =item B<--mount=string>
-
-diff -Nur mylvmbackup-0.11.orig/mylvmbackup.conf mylvmbackup-0.11/mylvmbackup.conf
---- mylvmbackup-0.11.orig/mylvmbackup.conf	2008-11-23 13:59:09.000000000 +0100
-+++ mylvmbackup-0.11/mylvmbackup.conf	2009-01-21 12:34:00.000000000 +0100
+ 
+diff -Nur mylvmbackup-0.13.orig/mylvmbackup.conf mylvmbackup-0.13/mylvmbackup.conf
+--- mylvmbackup-0.13.orig/mylvmbackup.conf	2009-09-05 15:44:09.000000000 +0200
++++ mylvmbackup-0.13/mylvmbackup.conf	2010-01-13 12:51:16.000000000 +0100
 @@ -18,7 +18,7 @@
  host=
  port=
@@ -68,10 +68,19 @@
  relpath=
  
  #
-diff -Nur mylvmbackup-0.11.orig/mylvmbackup.pl.in mylvmbackup-0.11/mylvmbackup.pl.in
---- mylvmbackup-0.11.orig/mylvmbackup.pl.in	2008-11-23 13:32:47.000000000 +0100
-+++ mylvmbackup-0.11/mylvmbackup.pl.in	2009-01-21 12:34:00.000000000 +0100
-@@ -386,7 +386,7 @@
+@@ -80,7 +80,7 @@
+ rsnaparg=7
+ datefmt=%Y%m%d_%H%M%S
+ innodb_recover=0
+-pidfile=/var/tmp/mylvmbackup_recoverserver.pid
++pidfile=/var/run/mylvmbackup_recoverserver.pid
+ skip_flush_tables=0
+ extra_flush_tables=0
+ skip_mycnf=0
+diff -Nur mylvmbackup-0.13.orig/mylvmbackup.pl.in mylvmbackup-0.13/mylvmbackup.pl.in
+--- mylvmbackup-0.13.orig/mylvmbackup.pl.in	2009-09-05 15:44:09.000000000 +0200
++++ mylvmbackup-0.13/mylvmbackup.pl.in	2010-01-13 12:57:46.000000000 +0100
+@@ -406,7 +406,7 @@
    $port = '';
    $socket = '';
    $mysqld_safe='mysqld_safe';
@@ -80,16 +89,16 @@
  
  # lvm
    $vgname='mysql';
-@@ -400,7 +400,7 @@
+@@ -420,7 +420,7 @@
    $suffix='_mysql';
    $datefmt='%Y%m%d_%H%M%S';
    $innodb_recover=0;
--  $pidfile = '/var/tmp/mylvmbackup_recoverserver.pid';
-+  $pidfile = '/var/run/mylvmbackup_recoverserver.pid';
+-  $pidfile = '$TMP/mylvmbackup_recoverserver.pid';
++  $pidfile = '/var/run/mylvmbackup_recoverserver.pid'
    $skip_flush_tables=0;
    $extra_flush_tables=0;
    $skip_mycnf=0;
-@@ -416,8 +416,8 @@
+@@ -437,8 +437,8 @@
    $quiet=0;
  
  # fs