--- rsnapshot-1.3.1.orig/debian/cron.d +++ rsnapshot-1.3.1/debian/cron.d @@ -0,0 +1,11 @@ +# This is a sample cron file for rsnapshot. +# The values used correspond to the examples in /etc/rsnapshot.conf. +# There you can also set the backup points and many other things. +# +# To activate this cron file you have to uncomment the lines below. +# Feel free to adapt it to your needs. + +# 0 */4 * * * root /usr/bin/rsnapshot hourly +# 30 3 * * * root /usr/bin/rsnapshot daily +# 0 3 * * 1 root /usr/bin/rsnapshot weekly +# 30 2 1 * * root /usr/bin/rsnapshot monthly --- rsnapshot-1.3.1.orig/debian/docs +++ rsnapshot-1.3.1/debian/docs @@ -0,0 +1,3 @@ +README +TODO +docs/Upgrading_from_1.1 --- rsnapshot-1.3.1.orig/debian/rules +++ rsnapshot-1.3.1/debian/rules @@ -0,0 +1,132 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +include /usr/share/quilt/quilt.make + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# This has to be exported to make some magic below work. +export DH_OPTIONS + +# 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) + +config.status: configure + dh_testdir +ifeq "$(wildcard config.sub.bak)" "" + cp -f config.sub config.sub.bak +endif +ifeq "$(wildcard config.guess.bak)" "" + cp -f config.guess config.guess.bak +endif +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 +ifeq "$(wildcard rsnapshot.1.bak)" "" + cp -f rsnapshot.1 rsnapshot.1.bak +endif +ifeq "$(wildcard rsnapshot-diff.1.bak)" "" + cp -f rsnapshot-diff.1 rsnapshot-diff.1.bak +endif + + + # Add here commands to configure the package. + touch aclocal.m4 Makefile.in configure + ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \ + --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --sysconfdir=/etc + +#Architecture +build: patch build-indep + +build-indep: build-indep-stamp +build-indep-stamp: config.status + + # Add here commands to compile the indep part of the package. + touch $@ + +clean: unpatch + dh_testdir + dh_testroot + rm -f build-indep-stamp + + # Add here commands to clean up after the build process. + [ ! -f Makefile ] || $(MAKE) distclean +ifneq "$(wildcard config.sub.bak)" "" + cp -f config.sub.bak config.sub +endif +ifneq "$(wildcard config.guess.bak)" "" + cp -f config.guess.bak config.guess +endif +ifneq "$(wildcard rsnapshot.1.bak)" "" + cp -f rsnapshot.1.bak rsnapshot.1 +endif +ifneq "$(wildcard rsnapshot-diff.1.bak)" "" + cp -f rsnapshot-diff.1.bak rsnapshot-diff.1 +endif + dh_clean + +install: install-indep +install-indep: + dh_testdir + dh_testroot + dh_prep + dh_installdirs -i + + # Add here commands to install the indep part of the package into + # debian/rsnapshot. + $(MAKE) install DESTDIR=$(CURDIR)/debian/rsnapshot + cp $(CURDIR)/docs/HOWTOs/rsnapshot-HOWTO.en.html $(CURDIR)/debian/rsnapshot/usr/share/doc/rsnapshot/html/ + mv $(CURDIR)/debian/rsnapshot/etc/rsnapshot.conf.default $(CURDIR)/debian/rsnapshot/etc/rsnapshot.conf + + # Manpages + mkdir -p $(CURDIR)/debian/rsnapshot/usr/share/man/man1 + gzip -9 -c $(CURDIR)/rsnapshot.1 > $(CURDIR)/debian/rsnapshot/usr/share/man/man1/rsnapshot.1.gz + gzip -9 -c $(CURDIR)/rsnapshot-diff.1 > $(CURDIR)/debian/rsnapshot/usr/share/man/man1/rsnapshot-diff.1.gz + + # lintian override on /var/cache/rsnapshot perms + mkdir -p $(CURDIR)/debian/rsnapshot/usr/share/lintian/overrides/ + cp $(CURDIR)/debian/lintian-overrides $(CURDIR)/debian/rsnapshot/usr/share/lintian/overrides/rsnapshot + + dh_install -i + +binary-common: + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples + + # Remove unnecessary extra license file, as per Policy Manual section 12.5 + rm $(CURDIR)/debian/rsnapshot/usr/share/doc/rsnapshot/examples/utils/rsnapshotdb/LICENSE.txt + + dh_installlogrotate + dh_installcron + dh_installman + dh_link + dh_strip + dh_compress + dh_fixperms + + # Fix permissions of the default rsnapshot_root directory + chmod 0700 $(CURDIR)/debian/rsnapshot/var/cache/rsnapshot + + dh_perl + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture independant packages using the common target. +binary-indep: build-indep install-indep + $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common + +binary-arch: + +binary: binary-indep +.PHONY: build clean binary-indep binary install install-indep --- rsnapshot-1.3.1.orig/debian/dirs +++ rsnapshot-1.3.1/debian/dirs @@ -0,0 +1,2 @@ +var/cache/rsnapshot +usr/share/doc/rsnapshot/html --- rsnapshot-1.3.1.orig/debian/doc-base +++ rsnapshot-1.3.1/debian/doc-base @@ -0,0 +1,10 @@ +Document: rsnapshot +Title: Rsnapshot Documentation +Author: David Cantrell +Abstract: rsnapshot is a filesystem backup utility based on rsync. It is + possible to take snapshots of your filesystems at different points in time. +Section: File Management + +Format: HTML +Index: /usr/share/doc/rsnapshot/html/rsnapshot-HOWTO.en.html +Files: /usr/share/doc/rsnapshot/html/rsnapshot-HOWTO.en.html --- rsnapshot-1.3.1.orig/debian/control +++ rsnapshot-1.3.1/debian/control @@ -0,0 +1,21 @@ +Source: rsnapshot +Section: utils +Priority: optional +Maintainer: Guillaume Delacour +Uploaders: MJ Ray (Debian) +Build-Depends: debhelper (>= 7), quilt (>= 0.46-7~) +Build-Depends-Indep: autotools-dev, rsync, openssh-client +Standards-Version: 3.8.3.0 +Homepage: http://www.rsnapshot.org/ +Vcs-Browser: http://git.debian.org/?p=collab-maint/rsnapshot.git +Vcs-Git: git://git.debian.org/collab-maint/rsnapshot.git + +Package: rsnapshot +Architecture: all +Depends: ${perl:Depends}, rsync, logrotate, ${misc:Depends}, liblchown-perl +Recommends: openssh-client +Description: local and remote filesystem snapshot utility + rsnapshot is an rsync-based filesystem snapshot utility. It can take + incremental backups of local and remote filesystems for any number of + machines. rsnapshot makes extensive use of hard links, so disk space is + only used when absolutely necessary. --- rsnapshot-1.3.1.orig/debian/watch +++ rsnapshot-1.3.1/debian/watch @@ -0,0 +1,6 @@ +# 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. +# Site Directory Pattern Version Script +version=3 +http://www.rsnapshot.org/downloads/rsnapshot-([\d\.]*)\.tar\.gz --- rsnapshot-1.3.1.orig/debian/rsnapshot.examples +++ rsnapshot-1.3.1/debian/rsnapshot.examples @@ -0,0 +1,2 @@ +utils/ +rsnapshot.conf.default --- rsnapshot-1.3.1.orig/debian/compat +++ rsnapshot-1.3.1/debian/compat @@ -0,0 +1 @@ +7 --- rsnapshot-1.3.1.orig/debian/rsnapshot.logrotate +++ rsnapshot-1.3.1/debian/rsnapshot.logrotate @@ -0,0 +1,6 @@ +/var/log/rsnapshot.log { + rotate 6 + monthly + compress + missingok +} --- rsnapshot-1.3.1.orig/debian/NEWS +++ rsnapshot-1.3.1/debian/NEWS @@ -0,0 +1,21 @@ +rsnapshot (1.3.0-1) unstable; urgency=low + + Until now, the Debian package of rsnapshot included a patch to ensure + backward compatibility with pre-1.2 configuration files (see below). This + patch has been dropped in this release, and all users are now forced to + upgrade their configuration files to the 1.2 format. Please see the UPGRADE + section from /usr/share/doc/rsnapshot/README.Debian if you are still using + 1.1.x configuration files. + + -- Simon Boulet Mon, 13 Nov 2006 13:16:38 -0500 + +rsnapshot (1.2.0-1) unstable; urgency=low + + In this release the default rsync long_args have changed, --relative and + --delete-excluded have been added. --relative will affect the destination + of the backup points. However your current config will continue to work in + a compatibility mode where --relative is not used. To benefit of all new + features and bugfixes you have to change your config file. Be sure to read + /usr/share/doc/rsnapshot/README.Debian + + -- Christoph Wegscheider Fri, 4 Feb 2005 12:33:31 +0100 --- rsnapshot-1.3.1.orig/debian/lintian-overrides +++ rsnapshot-1.3.1/debian/lintian-overrides @@ -0,0 +1 @@ +rsnapshot: non-standard-dir-perm var/cache/rsnapshot/ 0700 != 0755 --- rsnapshot-1.3.1.orig/debian/README.source +++ rsnapshot-1.3.1/debian/README.source @@ -0,0 +1 @@ +Please refer to /usr/share/doc/quilt/README.source. --- rsnapshot-1.3.1.orig/debian/postrm +++ rsnapshot-1.3.1/debian/postrm @@ -0,0 +1,10 @@ +#!/bin/sh +set -e + +#DEBHELPER# + +# purge the log files +if [ "$1" = purge ] ; then + rm -f /var/log/rsnapshot.log* +fi + --- rsnapshot-1.3.1.orig/debian/TODO.Debian +++ rsnapshot-1.3.1/debian/TODO.Debian @@ -0,0 +1,2 @@ +Add user prompting for delete archives when purge the package +(like mysql databases for example...) --- rsnapshot-1.3.1.orig/debian/changelog +++ rsnapshot-1.3.1/debian/changelog @@ -0,0 +1,172 @@ +rsnapshot (1.3.1-1) unstable; urgency=low + + * New maintainer + * New upstream release (Closes: #548966, #501992, #517657, #413439) + * debian/control: + - Bump Standards-Version 3.8.3.0 + - Homepage moved in extended description + - Recommend openssh-client instead of ssh (Closes: #422262) + - Depend on liblchown-perl (Closes: #497928) + - Build-Depends-Indep on openssh-client, to have ssh client path in + rsnapshot.conf at build time (Closes: #506760) + * debian/postrm: Add "set -e" to script + * debian/rules: + - remove warning ignorement ("-") in clean rule, test Makefile + - Bump debhelper compat version to 7 (dh_prep replacement) + - Delete unnecessary commented template based rules + * debian/copyright: Link to GPL-2 + * debian/patches/01_logfile_rsnapshot_conf: + change commented /var/log/rsnapshot to /var/log/rsnapshot.log + in rsnapshot.conf (Closes: #506218) + * debian/patches/02_default_rsnapshot_conf_manpage: + point to /usr/share/doc/rsnapshot/examples/rsnapshot.conf.default.gz + instead of non-existent /etc/rsnapshot.conf.default file in manpage + (Closes: #411317) + * debian/patches/04_default_backup_dir: + Really set /var/cache/rsnapshot as default snapshot dir + * debian/patches/05_backup_pgsql: + Modify backup_pgsql.sh according Debian specific (Closes: #500082) + Thanks to Antony Gelberg + * debian/patches/06_fix_random_file_verify: + Fix some error on upstream example utils/random_file_verify.sh + * Add doc-base support to html doc (Closes: #504920) + * debian/lintian-overrides: add override on /var/cache/rsnapshot perms + (700 instead of 755) + * debian/README.Debian: add some explanations on rsnapshot behavior + (Closes: #496908) + + -- Guillaume Delacour Wed, 18 Nov 2009 00:05:53 +0000 + +rsnapshot (1.3.0-2) unstable; urgency=low + + * Add experimental release to unstable (Closes: #460579) + + -- MJ Ray (Debian) Wed, 30 Jan 2008 19:02:48 +0000 + +rsnapshot (1.3.0-1) experimental; urgency=low + + * New upstream release + * Updated README.Debian + * Updated debian/copyright + * Updated html/rsnapshot-howto.html with newer html/rsnapshot-HOWTO.en.html + * Debian Policy compliance upgraded to 3.7.2.2 + * Now creates default rsnapshot_root directory with 0700 permissions instead + of 0755 + * Updated package description to make it easier to spot rsnapshot when + searching for "rsync" or "backup" + * Dropped old (pre-1.2) configuration files compatibility patch, updated + NEWS file accordingly + * Fixed default config file had spaces where only tabs should be in + backup_scripts examples + + -- Simon Boulet Wed, 22 Nov 2006 15:44:33 -0500 + +rsnapshot (1.2.9-1) unstable; urgency=low + + * New upstream release + * Updated Free Software Foundation address in debian/copyright + * Added rsnapshot-diff man page from CVS + * Switched autotools-dev and rsync back to Build-Depends-Indep + + -- Simon Boulet Mon, 5 Jun 2006 22:03:45 -0400 + +rsnapshot (1.2.1-2) unstable; urgency=low + + * New maintainer + * Switched back to Build-Depends as per Policy Manual section 7.6 + * Updated debian/copyright + * Merged upstream trailing slashes patch (Closes: #357535) + + -- Simon Boulet Wed, 17 May 2006 22:01:44 -0400 + +rsnapshot (1.2.1-1.1) unstable; urgency=high + + * Non-maintainer upload. + * Remove trailing slashes of dirs to cp command (Closes: #339845). + + -- Luk Claes Fri, 17 Mar 2006 23:34:50 +0100 + +rsnapshot (1.2.1-1) unstable; urgency=low + + * New upstream release + - fix a security hole where a local user can get ownership of an arbitrary + file by creating a symlink to it and let root backup that symlink + + -- Christoph Wegscheider Sun, 10 Apr 2005 10:52:23 +0200 + +rsnapshot (1.2.0-2) unstable; urgency=low + + * avoid unnecessary aclocal run by touching aclocal.m4, Makefile.in and + configure before ./configure in debian/rules (Closes: #299316) + * removed du from Recommends (Closes: #298164) + * add small debian specific note in manpage + + -- Christoph Wegscheider Sat, 9 Apr 2005 17:25:07 +0200 + +rsnapshot (1.2.0-1) unstable; urgency=low + + * New upstream release + - Closes: #289439: does not delete excluded directories + - Closes: #264818: one_fs broken + - Closes: #266569: rsnapshot doesn't give useful info on errors + - Closes: #261678: all directorys have same mtime + * updated doc/rsnapshot-howto.html + * added the Upgrade section from INSTALL as UPGRADE.gz + * added NEWS.Debian.gz + * updated README.Debian + + -- Christoph Wegscheider Sun, 6 Feb 2005 14:15:59 +0100 + +rsnapshot (1.1.6-6) unstable; urgency=low + + * corrected watch file. + * fixed the cron file and intervals to more reasonable values, thx + Chris for pointing me to it. + * added explanation of interval names (Closes: #262323). + * added explanation why link_dest is disabled (Closes: #262326). + + -- Christoph Wegscheider Sat, 7 Aug 2004 00:40:43 +0200 + +rsnapshot (1.1.6-5) unstable; urgency=low + + * updated README.Debian. + * added Uploaders: MJ Ray (Debian) . + * updated to Standards-Version 3.6.1.1. + + -- Christoph Wegscheider Fri, 16 Jul 2004 12:50:00 +0200 + +rsnapshot (1.1.6-4) unstable; urgency=low + + * added rsnapshot howto. + * added example config file. + * enabled /var/log/rsnapshot.log by default. + * using dh_perl now for perl dependencies. + + -- Christoph Wegscheider Thu, 15 Jul 2004 20:31:10 +0200 + +rsnapshot (1.1.6-3) unstable; urgency=low + + * set arch to all. + * changed Build-Depends to Build-Depends-Indep. + * added explicit copyright statement (GPL) for the manpage + after consultation with the upstream author. + + -- Christoph Wegscheider Sun, 11 Jul 2004 01:21:53 +0200 + +rsnapshot (1.1.6-2) unstable; urgency=low + + * added Build-Depend on autotools-dev. + * changed copyright after discussion with the upstream author. + * set save debian defaults in the conffile. + * added sample cron file. + + -- Christoph Wegscheider Thu, 8 Jul 2004 08:13:20 +0200 + +rsnapshot (1.1.6-1) unstable; urgency=low + + * Initial Release. + * Closes: #257913: ITP: rsnapshot -- a local and remote filesystem + snapshot utility + + -- Christoph Wegscheider Tue, 6 Jul 2004 20:19:39 +0200 + --- rsnapshot-1.3.1.orig/debian/copyright +++ rsnapshot-1.3.1/debian/copyright @@ -0,0 +1,34 @@ +This package was first debianized by Christoph Wegscheider on +Tue, 6 Jul 2004 08:43:21 +0200. +Maintained by Simon Boulet since 2008. +It is now maintained by Guillaume Delacour . + +It was downloaded from: http://www.rsnapshot.org/ + +Upstream Author: + + Nathan Rosenquist + +Copyright: + + Copyright (C) 2003-2005 Nathan Rosenquist + + Portions Copyright (C) 2002-2006 Mike Rubel, Carl Wilhelm Soderstrom, + Ted Zlatanov, Carl Boe, Shane Liebling, Bharat Mediratta, + Peter Palfrader, Nicolas Kaiser, David Cantrell, Chris Petersen, + Robert Jackson, Justin Grote, David Keegel, Alan Batie + + rsnapshot comes with ABSOLUTELY NO WARRANTY. This is free software, + and you may copy, distribute and/or modify it under the terms of + the GNU GPL (version 2 or at your option any later version). + See the GNU General Public License for details. + + Based on code originally by Mike Rubel + http://www.mikerubel.org/computers/rsync_snapshots/ + +License: + + GPL-2 + +On Debian GNU/Linux systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL-2'. --- rsnapshot-1.3.1.orig/debian/README.Debian +++ rsnapshot-1.3.1/debian/README.Debian @@ -0,0 +1,46 @@ +rsnapshot for Debian +==================== + +UPGRADE +------- +If you are upgrading from an old (pre 1.2) version of rsnapshot, you will need +to change your backup destination paths as rsnapshot uses now the --relative +rsync option. As of version 1.3 of the Debian package, rsnapshot will not start +if your configuration file is not upgraded. + +There are no special instructions for upgrading from rsnapshot 1.2.x to +1.3.x, since both use config_version 1.2. + +If you are not sure whether you need to do anything to upgrade your +old rsnapshot.conf, you can run + rsnapshot upgrade-config-file +or + rsnapshot -c /etc/rsnapshot.conf upgrade-config-file + +All users upgrading from and old (pre 1.2) version are encouraged to read +/usr/share/doc/rsnapshot/Upgrading_from_1.1.gz. + +GENERAL +------- +Make sure to adapt /etc/rsnapshot.conf to your needs. You can run it either +manually or via cron. A sample cron file is provided in /etc/cron.d/rsnapshot. +To activate it, uncomment the relevant lines. + +Currently the default directory for the snapshots is /var/cache/rsnapshot/. +You can change this in the config file. Unless the directory is empty, it will +not be deleted if the package is purged. + +For more information, please read the complete rsnapshot HOWTO from +/usr/share/doc/rsnapshot/html/rsnapshot-HOWTO.en.html + +The default configuration file is available at +/usr/share/doc/rsnapshot/examples/rsnapshot.conf.default.gz + +Important considerations on config file (from #496908): +The first interval in the configuration file is always the one that +get synced from the "backup" sources specified at the bottom of your +configuration file. All the other intervals simply moves the oldest +copy of the interval listed immediately above in the configuration file. + + + -- Simon Boulet , Mon, 13 Nov 2006 14:39:22 -0500 --- rsnapshot-1.3.1.orig/debian/patches/series +++ rsnapshot-1.3.1/debian/patches/series @@ -0,0 +1,6 @@ +01_logfile_rsnapshot_conf +02_default_rsnapshot_conf_manpage +03_pod_missing_back +04_default_backup_dir +05_backup_pgsql +06_fix_random_file_verify --- rsnapshot-1.3.1.orig/debian/patches/02_default_rsnapshot_conf_manpage +++ rsnapshot-1.3.1/debian/patches/02_default_rsnapshot_conf_manpage @@ -0,0 +1,26 @@ +Point to the real default file on Debian systems. + +--- a/rsnapshot-program.pl ++++ b/rsnapshot-program.pl +@@ -6120,10 +6120,10 @@ + =head1 CONFIGURATION + + B is the default configuration file. All parameters +-in this file must be separated by tabs. B ++in this file must be separated by tabs. B + can be used as a reference. + +-It is recommended that you copy B to ++It is recommended that you copy B to + B, and then modify B to suit + your needs. + +@@ -6917,7 +6917,7 @@ + =head1 NOTES + + Make sure your /etc/rsnapshot.conf file has all elements separated by tabs. +-See /etc/rsnapshot.conf.default for a working example file. ++See /usr/share/doc/rsnapshot/examples/rsnapshot.conf.default.gz for a working example file. + + Make sure you put a trailing slash on the end of all directory references. + If you don't, you may have extra directories created in your snapshots. --- rsnapshot-1.3.1.orig/debian/patches/04_default_backup_dir +++ rsnapshot-1.3.1/debian/patches/04_default_backup_dir @@ -0,0 +1,13 @@ +Fix default Debian directory for snapshots. + +--- a/rsnapshot.conf.default.in ++++ b/rsnapshot.conf.default.in +@@ -24,7 +24,7 @@ + + # All snapshots will be stored under this root directory. + # +-snapshot_root /.snapshots/ ++snapshot_root /var/cache/rsnapshot/ + + # If no_create_root is enabled, rsnapshot will not automatically create the + # snapshot_root directory. This is particularly useful if you are backing --- rsnapshot-1.3.1.orig/debian/patches/05_backup_pgsql +++ rsnapshot-1.3.1/debian/patches/05_backup_pgsql @@ -0,0 +1,42 @@ +Apply patch to backup_pgsql.sh, Debian issues. + +--- a/utils/backup_pgsql.sh ++++ b/utils/backup_pgsql.sh +@@ -3,18 +3,16 @@ + ############################################################################## + # backup_pgsql.sh + # ++# Debian modifications by Antony Gelberg ++# + # by Nathan Rosenquist + # http://www.rsnapshot.org/ + # + # This is a simple shell script to backup a PostgreSQL database with rsnapshot. + # + # The assumption is that this will be invoked from rsnapshot. Also, since it +-# will run unattended, the user that runs rsnapshot (probably root) should have +-# a .pgpass file in their home directory that contains the password for the +-# postgres user. For example: +-# +-# /root/.pgpass (chmod 0600) +-# *:*:*:postgres:thepassword ++# will run unattended, the user that runs rsnapshot (probably root) must su ++# to Debian's postgres user. + # + # This script simply needs to dump a file into the current working directory. + # rsnapshot handles everything else. +@@ -25,7 +23,12 @@ + umask 0077 + + # backup the database +-/usr/local/pgsql/bin/pg_dumpall -Upostgres > pg_dumpall.sql ++su -c 'pg_dumpall > ~/pg_dumpall.sql' postgres + + # make the backup readable only by root +-/bin/chmod 600 pg_dumpall.sql ++chown root.root ~postgres/pg_dumpall.sql ++chmod 600 ~postgres/pg_dumpall.sql ++ ++# Move the backup to current working directory ++mv ~postgres/pg_dumpall.sql `pwd` ++ --- rsnapshot-1.3.1.orig/debian/patches/06_fix_random_file_verify +++ rsnapshot-1.3.1/debian/patches/06_fix_random_file_verify @@ -0,0 +1,30 @@ +Fix some error on upstream example shell script utils/random_file_verify.sh. + +--- a/utils/random_file_verify.sh ++++ b/utils/random_file_verify.sh +@@ -32,10 +32,10 @@ + + if [ $? -eq 0 ] + then +- echo "SUCCESS: Randomly generated test file created." >> ++ echo "SUCCESS: Randomly generated test file created." >>\ + /var/log/localbackup.log + else +- echo "FAILED: Randomly generated test file not created." >> ++ echo "FAILED: Randomly generated test file not created." >>\ + /var/log/localbackup.log + msubject="Local Backup has ERRORS!" + fi +@@ -60,10 +60,10 @@ + + if [ $? -eq 0 ] + then +- echo "PASSED: Randomly generated test file is the same." >> ++ echo "PASSED: Randomly generated test file is the same." >>\ + /var/log/localbackup.log + else +- echo "FAILED: Randomly generated test file differs." >> ++ echo "FAILED: Randomly generated test file differs." >>\ + /var/log/localbackup.log + msubject="Local Backup has ERRORS!" + fi --- rsnapshot-1.3.1.orig/debian/patches/01_logfile_rsnapshot_conf +++ rsnapshot-1.3.1/debian/patches/01_logfile_rsnapshot_conf @@ -0,0 +1,13 @@ +Change (default commented) log filename as per Debian Policy section 10.8. + +--- a/rsnapshot.conf.default.in ++++ b/rsnapshot.conf.default.in +@@ -113,7 +113,7 @@ + # If you enable this, data will be written to the file you specify. The + # amount of data written is controlled by the "loglevel" parameter. + # +-#logfile /var/log/rsnapshot ++#logfile /var/log/rsnapshot.log + + # If enabled, rsnapshot will write a lockfile to prevent two instances + # from running simultaneously (and messing up the snapshot_root). --- rsnapshot-1.3.1.orig/debian/patches/03_pod_missing_back +++ rsnapshot-1.3.1/debian/patches/03_pod_missing_back @@ -0,0 +1,13 @@ +Add missing "=back" to fix pod2man error. + +--- a/rsnapshot-program.pl ++++ b/rsnapshot-program.pl +@@ -6716,6 +6716,8 @@ + + =back + ++=back ++ + =head1 USAGE + + B can be used by any user, but for system-wide backups