--- rdiff-backup-1.2.8.orig/debian/README.source +++ rdiff-backup-1.2.8/debian/README.source @@ -0,0 +1,38 @@ +This package uses dpatch to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +To get the fully patched source after unpacking the source package, cd +to the root level of the source package and run: + + debian/rules patch + +Removing a patch is as simple as removing its entry from the +debian/patches/00list file, and please also remove the patch file +itself. + +Creating a new patch is done with "dpatch-edit-patch patch XX_patchname" +where you should replace XX with a new number and patchname with a +descriptive shortname of the patch. You can then simply edit all the +files your patch wants to edit, and then simply "exit 0" from the shell +to actually create the patch file. + +To tweak an already existing patch, call "dpatch-edit-patch XX_patchname" +and replace XX_patchname with the actual filename from debian/patches +you want to use. + +To clean up afterwards again, "debian/rules unpatch" will do the +work for you - or you can of course choose to call +"fakeroot debian/rules clean" all together. + + +--- + +this documentation is part of dpatch package, and may be used by +packages using dpatch to comply with policy on README.source. This +documentation is meant to be useful to users who are not proficient in +dpatch in doing work with dpatch-based packages. Please send any +improvements to the BTS of dpatch package. + +original text by Gerfried Fuchs, edited by Junichi Uekawa +10 Aug 2008. --- rdiff-backup-1.2.8.orig/debian/copyright +++ rdiff-backup-1.2.8/debian/copyright @@ -0,0 +1,42 @@ +Author: Ben Escoto +Download: http://rdiff-backup.nongnu.org/ + +Files: * +Copyright: (C) 2001-2008 Ben Escoto +License: GPL-2+ + This program is free software; you can 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 + of the License, or (at your option) any later version. + . + This program 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 + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. + +Files: debian/* +Copyright: (C) 2005-2009 Daniel Baumann +License: GPL-2+ + This program is free software; you can 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 + of the License, or (at your option) any later version. + . + This program 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 + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. --- rdiff-backup-1.2.8.orig/debian/rdiff-backup.README.Debian +++ rdiff-backup-1.2.8/debian/rdiff-backup.README.Debian @@ -0,0 +1,8 @@ +rdiff-backup for Debian +----------------------- + +Note: rdiff-backup *depends* on a filesystem capable of long-filenames on the + target-side. If you want to backup onto a Windows filesystems, you have to + mount them as vfat. + + -- Daniel Baumann Mon, 28 Nov 2005 09:21:00 +0100 --- rdiff-backup-1.2.8.orig/debian/watch +++ rdiff-backup-1.2.8/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://savannah.nongnu.org/download/rdiff-backup/ rdiff-backup-(1.2.*)\.tar.gz --- rdiff-backup-1.2.8.orig/debian/rdiff-backup.manpages +++ rdiff-backup-1.2.8/debian/rdiff-backup.manpages @@ -0,0 +1 @@ +rdiff-backup.1 --- rdiff-backup-1.2.8.orig/debian/control +++ rdiff-backup-1.2.8/debian/control @@ -0,0 +1,30 @@ +Source: rdiff-backup +Section: utils +Priority: optional +Maintainer: Python Applications Packaging Team +Uploaders: Carl Chenet +Build-Depends: + debhelper (>= 7.3.5~), python-support, python-all-dev, python-pylibacl, python-pyxattr, + librsync-dev, dpatch +Standards-Version: 3.8.3 +Homepage: http://rdiff-backup.nongnu.org/ +Vcs-Svn: svn://svn.debian.org/python-apps/packages/rdiff-backup/trunk/ +Vcs-Browser: http://svn.debian.org/viewsvn/python-apps/packages/rdiff-backup/trunk/ + +Package: rdiff-backup +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends}, ${python:Depends} +Recommends: python-pylibacl, python-pyxattr +Description: remote incremental backup + rdiff-backup backs up one directory to another, possibly over a network. The + target directory ends up a copy of the source directory, but extra reverse + diffs are stored in a special subdirectory of that target directory, so you can + still recover files lost some time ago. The idea is to combine the best + features of a mirror and an incremental backup. rdiff-backup also preserves + subdirectories, hard links, dev files, permissions, uid/gid ownership, + modification times, extended attributes, acls, and resource forks. + . + Also, rdiff-backup can operate in a bandwidth efficient manner over a pipe, + like rsync. Thus you can use rdiff-backup and ssh to securely back a hard drive + up to a remote location, and only the differences will be transmitted. Finally, + rdiff-backup is easy to use and settings have sensible defaults. --- rdiff-backup-1.2.8.orig/debian/rules +++ rdiff-backup-1.2.8/debian/rules @@ -0,0 +1,19 @@ +#!/usr/bin/make -f + +include /usr/share/dpatch/dpatch.make + +build: patch-stamp + dh build + +clean: unpatch + dh clean + +%: + dh $@ + +override_dh_install: + install -D -m 0644 debian/local/bash-completion debian/rdiff-backup/etc/bash_completion.d/rdiff-backup + + # Removing useless files + rm -rf debian/rdiff-backup/usr/share/doc/rdiff-backup-* + --- rdiff-backup-1.2.8.orig/debian/rdiff-backup.docs +++ rdiff-backup-1.2.8/debian/rdiff-backup.docs @@ -0,0 +1,3 @@ +FAQ.html +README +examples.html --- rdiff-backup-1.2.8.orig/debian/changelog +++ rdiff-backup-1.2.8/debian/changelog @@ -0,0 +1,449 @@ +rdiff-backup (1.2.8-6) unstable; urgency=low + + * debian/control + - switching Maintainer to PAPT team + - switching Uploaders to Carl Chenet + * debian/patches/01_fix_restricted_test-server_option.dpatch + - added one line accidentely removed in the previous patch (Closes:#570627) + + -- Carl Chenet Sat, 20 Feb 2010 12:29:55 +0100 + +rdiff-backup (1.2.8-5) unstable; urgency=low + + [ Carl Chenet ] + * debian/local/bash-completion + - Switch from dashes to underscores in bash function names (Closes:#531606) + + [ Piotr Ożarowski ] + * Provide public module again (sorry for not checking rdepends more + carefully, closes: #547135) + - bump minimum required debhelper version to 7.3.5 + - replace python-dev with python-all-dev build dependency + + -- Carl Chenet Thu, 17 Sep 2009 21:07:43 +0200 + +rdiff-backup (1.2.8-4) unstable; urgency=low + + * Patch fixing restricted test-server option (Closes:#522278). + * debian/control + - add dpatch in Build-Depends + * debian/rules + - add call to dpatch + * Create debian/patches directory + * Create debian/patches/00list file + * Create debian/patches/01_fix_restricted_test-server_option.dpatch + * Create debian/README.source for dpatch + + -- Carl Chenet Mon, 07 Sep 2009 23:42:56 +0200 + +rdiff-backup (1.2.8-3) unstable; urgency=low + + * New debian/watch file + * debian/control + - Bump to Standard-Versions 3.8.3 + - New maintainer (Closes: #540633). + - Set Uploaders field to PAPT. + - Vcs-Svn and Vcs-Browser fields were added. + - Bump debhelper to (>= 7.0.50~). + * debian/rules + - Use now a private directory for not polluting global namespace + + -- Carl Chenet Mon, 31 Aug 2009 23:25:49 +0200 + +rdiff-backup (1.2.8-2) unstable; urgency=low + + * Prefixing debhelper files with package name. + * Wrapping build-depends. + * Removing version from librsync build-depends, already fulfilled in stable. + * Renaming local directory to store debian additions to more sensible name. + * Minimizing rules file. + * Updating year in copyright file. + * Removing vcs fields. + * Orphaning package. + + -- Daniel Baumann Sun, 09 Aug 2009 11:41:00 +0200 + +rdiff-backup (1.2.8-1) unstable; urgency=low + + * Merging upstream version 1.2.8 (Closes: #520089): + - Don't crash on zlib errors (Closes: #518531). + + -- Daniel Baumann Thu, 19 Mar 2009 06:25:00 +0100 + +rdiff-backup (1.2.7-1) unstable; urgency=low + + * Merging upstream version 1.2.7. + + -- Daniel Baumann Wed, 11 Mar 2009 08:10:00 +0100 + +rdiff-backup (1.2.6-1) unstable; urgency=low + + * Merging upstream version 1.2.6. + + -- Daniel Baumann Wed, 11 Mar 2009 08:06:00 +0100 + +rdiff-backup (1.2.5-1) unstable; urgency=low + + * Merging upstream version 1.2.5. + + -- Daniel Baumann Sat, 17 Jan 2009 23:17:00 -0500 + +rdiff-backup (1.2.4-1) unstable; urgency=low + + * Merging upstream version 1.2.4. + + -- Daniel Baumann Sat, 17 Jan 2009 23:13:00 -0500 + +rdiff-backup (1.2.3-1) unstable; urgency=high + + * Replacing obsolete dh_clean -k with dh_prep. + * Merging upstream version 1.2.3: + - fixes regression with "Too many levels of symbolic links" exception + (Closes: #409514). + + -- Daniel Baumann Mon, 29 Dec 2008 22:26:00 +0100 + +rdiff-backup (1.2.2-1) unstable; urgency=low + + * Merging upstream version 1.2.2. + + -- Daniel Baumann Tue, 28 Oct 2008 13:50:00 +0100 + +rdiff-backup (1.2.1-2) unstable; urgency=low + + * Updating vcs fields in control file. + * Adding bash-completion from Andreas Olsson . + + -- Daniel Baumann Sat, 04 Oct 2008 10:46:00 +0200 + +rdiff-backup (1.2.1-1) unstable; urgency=medium + + * Merging upstream version 1.2.1. + + -- Daniel Baumann Fri, 29 Aug 2008 22:19:00 +0200 + +rdiff-backup (1.2.0-1) unstable; urgency=medium + + * Merging upstream version 1.2.0 + (Closes: #345627, #420869, #426110, #443686, #463035, #480785, #481098). + + -- Daniel Baumann Thu, 31 Jul 2008 22:27:00 +0200 + +rdiff-backup (1.1.17-1) unstable; urgency=low + + * Merging upstream version 1.1.17 (Closes: #491185): + - fixes failure with 'exceptions.KeyError' (Closes: #410586). + - fixes failure with 'KeyError inode' exception (Closes: #486653). + + -- Daniel Baumann Thu, 17 Jul 2008 16:30:00 +0200 + +rdiff-backup (1.1.16-2) unstable; urgency=medium + + * Making build-depends against librsync version to ensure 4gb bugfix. + + -- Daniel Baumann Wed, 25 Jun 2008 11:42:00 +0200 + +rdiff-backup (1.1.16-1) unstable; urgency=medium + + * Removing 01-manpage.dpatch, went upstream. + * Reordering rules file. + * Rewriting copyright file in machine-interpretable format. + * Removing watch file. + * Simplyfing control file. + * Adding vcs fields in control file. + * Upgrading package to standards 3.8.0. + * Upgrading package to debhelper 7. + * Merging upstream version 1.1.16. + + -- Daniel Baumann Sun, 22 Jun 2008 23:14:00 +0200 + +rdiff-backup (1.1.15-2) unstable; urgency=low + + * Applied patches from Justin Pryzby to fix manpage + typos (Closes: #461934). + + -- Daniel Baumann Mon, 21 Jan 2008 21:42:00 +0100 + +rdiff-backup (1.1.15-1) unstable; urgency=low + + * New upstream release. + + -- Daniel Baumann Wed, 09 Jan 2008 20:59:00 +0100 + +rdiff-backup (1.1.14-2) unstable; urgency=low + + * Bumping to new policy. + * Using new homepage field in control. + + -- Daniel Baumann Sun, 23 Dec 2007 17:26:00 +0100 + +rdiff-backup (1.1.14-1) unstable; urgency=low + + * New upstream release: + - Adds support for custom tmpdir location (Closes: #289395). + + -- Daniel Baumann Mon, 13 Aug 2007 23:18:00 +0200 + +rdiff-backup (1.1.12-1) unstable; urgency=low + + * New upstream release: + - Doesn't crash if previous backup failed + Closes: #376781, #388720, #422961, #426216). + - Doesn't fail when saving fat32 to fat32 (Closes: #422593). + - Fixes a typo with RPath in metadata (Closes: #349593). + - Doesn't crash without compression (Closes: #395100). + * Fixed typo in long description (Closes: #426806). + * Dropping 01-fs-abilities.dpatch, went upstream. + + -- Daniel Baumann Sun, 15 Jul 2007 20:58:00 +0200 + +rdiff-backup (1.1.9-2) unstable; urgency=low + + * Added patch from Marc Dyksterhouse to fix --list-increments + (Closes: #413981). + + -- Daniel Baumann Sun, 01 Apr 2007 19:13:00 +0100 + +rdiff-backup (1.1.9-1) unstable; urgency=low + + * New upstream release. + * Bumped to debhelper 5. + + -- Daniel Baumann Mon, 05 Mar 2007 01:27:00 +0100 + +rdiff-backup (1.1.7-1) experimental; urgency=low + + * New upstream release: + - fixes problem with device files handling as user (Closes: #395096). + - fixes problems with storing to smbfs/cifs (Closes: #386983, #404947). + * Dropping 01-manpage.dpatch, went upstream. + * Uploading to experimental to not interfere the testing migration of + 1.1.5-4. + + -- Daniel Baumann Fri, 29 Dec 2006 16:15:00 +0100 + +rdiff-backup (1.1.5-4) unstable; urgency=medium + + * In a previous version, the python-pylibacl and python-pyxattr got lost + from depends, re-adding them as recommends now, which is more appropriate + anyway (Closes: #404708). + + -- Daniel Baumann Wed, 27 Dec 2006 20:38:00 +0100 + +rdiff-backup (1.1.5-3) unstable; urgency=low + + * Migrated to new python policy (Closes: #380928, #383415). + + -- Daniel Baumann Thu, 17 Aug 2006 17:06:00 +0200 + +rdiff-backup (1.1.5-2) unstable; urgency=low + + * New email address. + * Bumped policy version. + + -- Daniel Baumann Sun, 30 Jul 2006 08:46:00 +0200 + +rdiff-backup (1.1.5-1) unstable; urgency=low + + * New upstream release. + + -- Daniel Baumann Mon, 02 Jan 2006 15:53:00 +0100 + +rdiff-backup (1.1.4-1) unstable; urgency=low + + * New upstream release: + - now using development-releases as they are stable enough. + + -- Daniel Baumann Tue, 27 Dec 2005 15:50:00 +0100 + +rdiff-backup (1.0.3-1) unstable; urgency=low + + * New upstream release (Closes: #338055). + * Removed old patches which are now in upstream. + * Added patch to fix manpage characters (Closes: #335162). + + -- Daniel Baumann Mon, 28 Nov 2005 09:21:00 +0100 + +rdiff-backup (1.0.1-1) unstable; urgency=low + + * New upstream release (Closes: #323332, #302099): + - works with SElinux (Closes: #306798). + - compiled with ACL support now (Closes: #224666). + * Removed old patches which are now in upstream. + * Added watch file. + * Bumped policy version. + + -- Daniel Baumann Wed, 28 Sep 2005 15:32:00 +0200 + +rdiff-backup (0.13.4-5) unstable; urgency=high + + * Forgot debian/compat (Closes: #295638). + + -- Daniel Baumann Fri, 18 Feb 2005 00:29:00 +0100 + +rdiff-backup (0.13.4-4) unstable; urgency=low + + * New maintainer (Closes: #261578). + * Took over Alec Berrymans interim package. + * debian/* redone and updated to new policy. + * debian/control: added correct python depency (Closes: #252960). + * Added rdiff-backup-hardlinks.dpatch to insure flag '--no-hard-links' is not + overridden by filesystem abilities and to fix handling of hard links on Mac + OS X (Thanks to Dave Vasilevsky ). + * Added typo-fix.dpatch to fix an error message typo (Thanks to Thomas Jarosch + ). + * Added patch from CVS to fix broken '--calculate-average' flag (Thanks to + Dean Gaudet , Closes: #241906, #225471, #225485). + * Patched hard link test with afs-hardlinks.dpatch to only enable hard links + if able to link across directories. AFS only allows hard links within a + directory (Closes: #260018). + * Patched error message thrown when invoking after an unsuccessful backup with + typo-fix-2.dpatch (Closes: #256266). + * Added patch backup_warn_if_infinite_regress.dpatch backported from CVS to + fix handling of destination directory as subdirectories of source directory + (Closes: #235875). + * Patched types of files not to be compressed with no-compress-regexp.dpatch + (Closes: #270715). + * Added patch restrict-read-only.dpatch to correct the behavior of the + '--restrict-read-only' flag to bring it in line with the documented behavior + (Thanks to Dean Gaudet , Closes: #277044). + + -- Daniel Baumann Tue, 15 Feb 2005 18:29:00 +0100 + +rdiff-backup (0.13.4-3) unstable; urgency=low + + * Orphaning this package. (WNPP bug has been submitted). + + -- John Goerzen Mon, 26 Jul 2004 14:56:59 -0500 + +rdiff-backup (0.13.4-2) unstable; urgency=low + + * Added build-dep on python. Closes: #259127. + + -- John Goerzen Tue, 13 Jul 2004 10:53:51 -0500 + +rdiff-backup (0.13.4-1) unstable; urgency=low + + * New upstream release. This version contains my + MacOS X patches upstream, so they are no longer included + in the Debian diff. + * .deb now includes examples.html. Closes: #239750. + + -- John Goerzen Fri, 04 Jun 2004 11:47:24 -0500 + +rdiff-backup (0.13.3.jgoerzen-3) unstable; urgency=low + + * xattr support was failing with IOError: [Errno 78] Function not + implemented on Alpha. Back out xattr and ACL support for now. + + -- John Goerzen Mon, 22 Dec 2003 18:00:20 -0600 + +rdiff-backup (0.13.3.jgoerzen-2) unstable; urgency=low + + * Add support for ACLs and EAs by (build-)depending on pylibacl and + pyxattr. Closes: #224666. + * Newer debhelper builds package in debian/rdiff-backup instead of + debian/tmp. The rules file command that deleted the rdiff-backup-0.x.y + directory that setup.py installed therefore quit working. Fixed. + Closes: #224664. + + -- John Goerzen Sat, 20 Dec 2003 16:26:42 -0600 + +rdiff-backup (0.13.3.jgoerzen-1) unstable; urgency=low + + * New upstream release. 0.13.3 is stabilizing. + Closes: #221840. + * The "jgoerzen" in the name means this includes my patches to the 0.13.3 + tree, which implement saving of Finder metadata from MacOS. I expect + this to be integrated into the mainline shortly. These patches are in + my tla archive + jgoerzen@complete.org--projects/rdiff-backup--jgoerzen--0.13 at + http://arch.complete.org/projects. + + -- John Goerzen Wed, 17 Dec 2003 21:05:39 -0600 + +rdiff-backup (0.12.5-2) unstable; urgency=low + + * Build-dep on librsync-dev >= 0.9.6-7 to get a versioned + lib dependency in the generated .deb. That version fixed + its shlibs file. Closes: #210368. + + -- John Goerzen Sat, 11 Oct 2003 23:09:14 -0500 + +rdiff-backup (0.12.5-1) unstable; urgency=low + + * New upstream release. Closes: #213094. + * Calls debian/python, and removed .pyc files from .deb. + Closes: #207416. + + -- John Goerzen Fri, 10 Oct 2003 11:43:41 -0500 + +rdiff-backup (0.12.3-1) unstable; urgency=low + + * New upstream release. Closes: #202749, #192238, #203209. + * Deleted usr/share/doc/rdiff-backup-*. Closes: #182001. + * Updated to Python 2.3. + * New req: librsync 0.9.6. + + -- John Goerzen Mon, 11 Aug 2003 17:40:27 -0500 + +rdiff-backup (0.10.1-3) unstable; urgency=low + + * Added build-depends on python2.2. Closes: #167651. + + -- John Goerzen Thu, 07 Nov 2002 08:44:55 -0600 + +rdiff-backup (0.10.1-2) unstable; urgency=low + + * Fixed installation -- now uses new setup.py. Closes: #167131. + + -- John Goerzen Wed, 30 Oct 2002 15:53:21 -0600 + +rdiff-backup (0.10.1-1) unstable; urgency=low + + * New upstream release + + -- John Goerzen Mon, 28 Oct 2002 15:50:25 -0600 + +rdiff-backup (0.8.0-1) unstable; urgency=low + + * New upstream release + + -- John Goerzen Fri, 12 Jul 2002 07:57:45 -0500 + +rdiff-backup (0.6.1-1) unstable; urgency=low + + * New upstream release. Closes: #147470, #143828. + + -- John Goerzen Thu, 23 May 2002 16:07:09 -0500 + +rdiff-backup (0.6.0-1) unstable; urgency=low + + * New upstream release + + -- John Goerzen Tue, 19 Mar 2002 09:46:20 -0500 + +rdiff-backup (0.5.3-1) unstable; urgency=low + + * New upstream release + + -- John Goerzen Tue, 05 Mar 2002 09:48:05 -0500 + +rdiff-backup (0.5.0-2) unstable; urgency=low + + * Applied a patch from the upstream author to correct remote + backups in some situations. + + -- John Goerzen Thu, 21 Feb 2002 08:46:52 -0500 + +rdiff-backup (0.5.0-1) unstable; urgency=low + + * New upstream release + + -- John Goerzen Mon, 18 Feb 2002 10:53:30 -0500 + +rdiff-backup (0.4.4-1) unstable; urgency=low + + * Initial Release, lintian clean. Closes: #133442. + + -- John Goerzen Mon, 11 Feb 2002 14:15:42 -0500 --- rdiff-backup-1.2.8.orig/debian/compat +++ rdiff-backup-1.2.8/debian/compat @@ -0,0 +1 @@ +7 --- rdiff-backup-1.2.8.orig/debian/local/bash-completion +++ rdiff-backup-1.2.8/debian/local/bash-completion @@ -0,0 +1,97 @@ +# /etc/bash_completion.d/rdiff-backup - bash-completion for rdiff-backup +# 2008 Andreas Olsson +# +# Developed for 1.2.x but can be "ported" to older version by modifying the +# lists of available options. +# +# Besides supplying options it will also try to determine +# when it is suitible to complete what. +# +# Feel free to send comments or suggestions. + +shopt -s extglob + +_rdiff_backup () +{ + local cur prev wfilearg wpatharg wnumarg wotherarg longopts shortopts options + COMPREPLAY=() + cur="${COMP_WORDS[COMP_CWORD]}" + prev="${COMP_WORDS[COMP_CWORD-1]}" + + # These options will be completed by the path to a filename. + wfilearg="--exclude-filelist|--exclude-globbing-filelist|--exclude-if-present| + |--group-mapping-file|--include-filelist|--include-globbing-filelist| + |--user-mapping-file" + + # These options will be completed by the path to a directory. + wpatharg="--remote-tempdir|--restrict|--restrict-read-only| + |--restrict-update-only|--tempdir" + + # These options will be completed by a number, from 0 to 9. + wnumarg="--terminal-verbosity|--verbosity|-v" + + # These options requires a non-completable argument. + # They won't be completed at all. + wotherarg="--compare-at-time|--compare-full-at-time|--compare-hash-at-time| + |--current-time|--exclude|--exclude-regexp|--include|--include-regexp| + |--list-at-time|--list-changed-since|--max-file-size|--min-file-size| + |--no-compression-regexp|-r|--restore-as-of|--remote-schema| + |--remove-older-than|--verify-at-time" + + # Availible long options + longopts="--backup-mode --calculate-average --carbonfile --check-destination-dir \ + --compare --compare-at-time --compare-full --compare-full-at-time \ + --compare-hash --compare-hash-at-time --create-full-path --current-time \ + --exclude --exclude-device-files --exclude-fifos --exclude-filelist \ + --exclude-filelist-stdin --exclude-globbing-filelist --exclude-globbing-filelist-stdin \ + --exclude-other-filesystems --exclude-regexp --exclude-special-files --exclude-sockets \ + --exclude-symbolic-links --exclude-if-present --force --group-mapping-file --include \ + --include-filelist --include-filelist-stdin --include-globbing-filelist \ + --include-globbing-filelist-stdin --include-regexp --include-special-files \ + --include-symbolic-links --list-at-time --list-changed-since --list-increments \ + --list-increment-sizes --max-file-size --min-file-size --never-drop-acls --no-acls \ + --no-carbonfile --no-compare-inode --no-compression --no-compression-regexp --no-eas \ + --no-file-statistics --no-hard-links --null-separator --parsable-output \ + --override-chars-to-quote --preserve-numerical-ids --print-statistics --restore-as-of \ + ----remote-schema --remote-tempdir --remove-older-than --restrict \ + --restrict-read-only --restrict-update-only --ssh-no-compression --tempdir \ + --terminal-verbosity --test-server --user-mapping-file --verbosity --verify \ + --verify-at-time --version" + + # Availible short options + shortopts="-b -l -r -v -V" + + options=${longopts}" "${shortopts} + + case "$prev" in + @($wfilearg)) + _filedir + return 0 + ;; + + @($wpatharg)) + _filedir -d + return 0 + ;; + + @($wotherarg)) + return 0 + ;; + + @($wnumarg)) + COMPREPLY=( $( compgen -W '0 1 2 3 4 5 6 7 8 9' -- $cur ) ) + return 0 + ;; + esac + + if [[ ${cur} == -* ]] + then + COMPREPLY=( $(compgen -W "${options}" -- ${cur}) ) + return 0 + else + _filedir + return 0 + fi +} + +complete -F _rdiff_backup -o filenames rdiff-backup --- rdiff-backup-1.2.8.orig/debian/patches/00list +++ rdiff-backup-1.2.8/debian/patches/00list @@ -0,0 +1 @@ +01_fix_restricted_test-server_option.dpatch --- rdiff-backup-1.2.8.orig/debian/patches/01_fix_restricted_test-server_option.dpatch +++ rdiff-backup-1.2.8/debian/patches/01_fix_restricted_test-server_option.dpatch @@ -0,0 +1,53 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## 01_fix_restricted_test-server_option.dpatch by Carl Chenet +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Reimplemented from the Ubuntu patch by +## DP: Original patch from : https://bugs.launchpad.net/ubuntu/+source/rdiff-backup/+bug/349072 + +@DPATCH@ +diff -urNad rdiff-backup-1.2.8~/rdiff_backup/Main.py rdiff-backup-1.2.8/rdiff_backup/Main.py +--- rdiff-backup-1.2.8~/rdiff_backup/Main.py 2009-03-16 15:36:21.000000000 +0100 ++++ rdiff-backup-1.2.8/rdiff_backup/Main.py 2010-02-20 11:26:27.000000000 +0100 +@@ -288,7 +288,7 @@ + elif action == "remove-older-than": RemoveOlderThan(rps[0]) + elif action == "restore": Restore(*rps) + elif action == "restore-as-of": Restore(rps[0], rps[1], 1) +- elif action == "test-server": SetConnections.TestConnections() ++ elif action == "test-server": SetConnections.TestConnections(rps) + elif action == "verify": Verify(rps[0]) + else: raise AssertionError("Unknown action " + action) + +diff -urNad rdiff-backup-1.2.8~/rdiff_backup/SetConnections.py rdiff-backup-1.2.8/rdiff_backup/SetConnections.py +--- rdiff-backup-1.2.8~/rdiff_backup/SetConnections.py 2009-03-16 15:36:21.000000000 +0100 ++++ rdiff-backup-1.2.8/rdiff_backup/SetConnections.py 2010-02-20 11:29:43.000000000 +0100 +@@ -241,20 +241,25 @@ + Globals.backup_reader = Globals.isbackup_reader = \ + Globals.backup_writer = Globals.isbackup_writer = None + +-def TestConnections(): ++def TestConnections(rpaths): + """Test connections, printing results""" + if len(Globals.connections) == 1: print "No remote connections specified" + else: +- for i in range(1, len(Globals.connections)): test_connection(i) ++ assert len(Globals.connections) == len(rpaths) + 1 ++ for i in range(1, len(Globals.connections)): ++ test_connection(i, rpaths[i-1]) + +-def test_connection(conn_number): ++def test_connection(conn_number, rp): + """Test connection. conn_number 0 is the local connection""" + print "Testing server started by: ", __conn_remote_cmds[conn_number] + conn = Globals.connections[conn_number] + try: + assert conn.Globals.get('current_time') is None +- assert type(conn.os.listdir('.')) is list + version = conn.Globals.get('version') ++ try: ++ assert type(conn.os.getuid()) is int ++ except AttributeError: # Windows doesn't support os.getuid() ++ assert type(conn.os.listdir(rp.path)) is list + except: + sys.stderr.write("Server tests failed\n") + raise