Merge lp:~ubuntu-branches/ubuntu/lucid/duplicity/lucid-201105300137 into lp:ubuntu/lucid/duplicity

[James Westby]

The package history in the archive and the history in the bzr branch differ. As the archive is authoritative the history of lp:ubuntu/lucid/duplicity now reflects that and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/lucid/duplicity/lucid-201105300137. A merge should be performed if necessary.

Unmerged revisions

16. By Michael Terry on 2010-01-09

* Merge from debian unstable, remaining changes: (LP: #428206)
  - 02gnupginterface.dpatch: Use system's python-gnupginterface
* fixed ssh backend failure (tried to import local pexpect module)
  (closes: #556095)
* New upstream release (closes: #539903, #420858)
* does no longer depend on python-gnupginterface: upstream
  provides a modified version which is claimed to be incompatible
* does not install a local version of python-pexpect
  anymore (closes: #555359)
* adjusted rules to cater for future python2.6 install
  setup (closes: #547825)
* New upstream release
* lifted standards version
* New upstream release (closes: #536361, #537260, #42858,
  #399371, #388180, #386749 )
* new project homepage
* added notes regarding changed archive-dir behaviour

15. By Michael Terry on 2010-01-09

Merging shared upstream rev into target branch.

=== modified file 'CHANGELOG'
--- CHANGELOG	2010-03-13 21:53:21 +0000
+++ CHANGELOG	2011-05-30 02:01:03 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 New in v0.6.08b (2010/03/11)
 ----------------------------
 Fix bug where encrypted backup without --gpg-options crashes.
@@ -234,6 +235,206 @@
 https://savannah.nongnu.org/patch/?6814
 
 
+=======
+New in v0.6.06 (2009/10/29)
+---------------------------
+Merged in lp:~mterry/duplicity/list-old-chains
+List/keep old signature chains
+
+Applied patches from Kasper Brand that fixed device file handling.
+http://lists.gnu.org/archive/html/duplicity-talk/2009-09/msg00001.html
+
+Merged in lp:~l2g/duplicity/flag-transl-comments which cleared up how
+translation comments should be passed to the translators cleanly now.
+
+Applied 422477; [PATCH] IMAP Backend Error in delete()
+
+Merged in lp:~mterry/duplicity/iterate-warnings
+Add machine codes to various warnings when iterating over source files
+
+Fix problems with unittests under Jaunty.  It appears that redirection
+in os.system() has changed for the worse, so a workaround for now.
+
+Fix problem in restart where there were no manifest entries and no
+remote volumes stored.  We clean out the partial and restart.
+
+Fixed 435975 gpg asks for password in 0.6.05, but not in 0.5.18
+
+
+New in v0.6.05 (2009/08/28)
+---------------------------
+Merged in lp:~l2g/duplicity/test-compat from Larry Gilbert which made
+the testing compatible across more systems.  Also fixed the remaining
+collectionstest bug which was trying to test with no cache present.
+
+Bugs fixed this release:
+407968  GIO backend can't restore
+408059  Failure due to _logger.log failure for content with special
+        characters: TypeError decoding Unicode not supported
+409593  deja-dup (or duplicity) deletes all signatures
+412667  "duplicity remove-older-than" asks for passphrase even though
+        not required
+418170  [PATCH] file names longer then 512 symbols are not supported
+
+
+New in v0.6.04 (2009/08/01)
+---------------------------
+One major and one minor change.  The "No such file or directory" error
+is bad enough that this should be released quickly.  For those of you
+using encryption, this is not a problem, but for those of you that do
+not use encryption (--no-encryption), then this will manifest itself if
+the local cache gets out of sync with the remote store.
+
+Bugs fixed this release:
+405734  duplicity fails to restore files that contain a newline character
+403790  Backup error: No such file or directory
+
+
+New in v0.6.03 (2009/07/29)
+---------------------------
+Lots of small changes and some bug fixes.
+* Restart error handling has been smoothed out a great deal and it
+  "does what is right" in order to keep going.
+* Backends are now optional, if they fail an Info message is put out
+  to notify of the failure and why.
+* There was more work on translations and internationalization.
+Thanks to everyone!
+
+Bugs fixed this release:
+377528  --file-to-restore doesn't work with trailing slash
+394757  Backend imports should be made optional
+398230  Deja-dup backup fails with message: "Unable to locate last file"
+401303  0.6.2 manpage inconsistent wrt. archive-dir/name
+405646  Small i18n error
+405975  duplicity.gpg.gpg_failed() breaks and spews on GnuPG error
+402794  duplicity public-key-only incompatible with gnupg 2.0.11
+
+
+New in v0.6.02 (2009/07/07)
+---------------------------
+Duplicity will now remove any spurious files left in the cache from
+a previous run.  This will keep the metadata cache in sync with the
+remote storage metadata.
+
+Bugs fixed this release:
+394629  Hang on first collection-status
+379386  Fix 'list-current-files' with missing archive dir
+395826  "No such file or directory" when backing up second time
+394627  User-friendly archive dir print
+388699  Manifest mismatch error
+
+
+New in v0.6.01 (2009/07/01)
+---------------------------
+Fixed issues in Checkpoint/Restart:
+* The --name backupname" option was added to allow the
+  user to separate one archive from another.  If not
+  specified, the default is an MD5 hash of the target
+  URL, which should suffice for most uses.
+
+* The archive_dir (cache) is now stored in a standard
+  location, defaulting to ~/.cache/duplicity.  See
+  http://standards.freedesktop.org/basedir-spec/latest/
+
+* The interaction between the --archive-dir option and
+  the --name option allows for four possible results
+  for the location of the archive dir.
+    - neither specified (default)
+      ~/.cache/duplicity/hash-of-url
+    - --archive-dir=~/arch, no --name
+      ~/arch/hash-of-url
+    - no --archive-dir, --name=foo
+      ~/.cache/duplicity/foo
+    - --archive-dir=~/arch, --name=foo
+      ~/arch/foo
+
+* duplicity will now copy needed metadata from the
+  remote store to the local cache as needed.  This
+  means that the first use after upgraded from 0.5.x
+  will have the metadata copied to the local archive
+  dir in order to sync both.
+
+* cleanup will now work correctly with the archive
+  dir and separates the local from the remote files.
+
+Bugs fixed this release:
+* 388034     Unable to backup
+* 378940     python2-6 issue / UTF-8 charset / Ubuntu 9.04
+* 379386     Fix list-current-files w/ missing archive dir
+* 387102     Asynchronous upload not working properly
+* 387218     Make scp/ssh into sftp-only backend
+* 388992     List of Orphaned Files Growing
+* 392905     NoneType object has no attribute 'startswith'
+* 393372     Error creating directory
+* 383412     Add InfoCodes for upload events
+* 383419     Add gio backend
+
+
+New in v0.6.00 (2009/06/08)
+---------------------------
+Checkpoint/Restart capability added.  Checkpoint is
+done at every volume written and Restart is done at
+start of the next volume in the set.  Changes to
+normal operations include a permanent duplicity
+archive-dir at ~/.duplicity to save state.
+
+To accomplish this, the signature and archive files
+in the archive-dir now have three states:
+1) temporary until the first volume has been written,
+2) partial until the final volume has been written and
+   sent to remote storage,
+3) permanent with the same name as always.
+
+Assumptions are made that if a restart is needed, then
+all arguments are the same as before and that no files
+have been removed from the file system between runs.
+
+From now on, the --archive-dir option can be used to
+change the location of the archive dir, but you are
+responsible for moving the files if you change it.
+
+Other fixes:
+Unicode filenames in log messages are now OK.
+
+Fixed problem where Cygwin was returning -1 for the
+hard max open file limit.
+
+
+New in v0.5.18 (2009/05/20)
+---------------------------
+Added support for RackSpace's CloudFiles, cf+http.
+
+Added support for Tahoe-LAFS from the patch,
+patch #6743: Tahoe backend for duplicity
+https://savannah.nongnu.org/patch/?6743
+
+Only half of this bug is fixed but it's still useful.
+bug #21792: pipe call fails with an error OSError:
+            [Errno 24] Too many open files
+https://savannah.nongnu.org/bugs/?21792
+
+Changed from using ulimit external command to
+resource.getrlimit to check open files limit.
+
+
+New in v0.5.17 (2009/05/04)
+---------------------------
+Removed one line of code left from some testing that I
+did that caused a crash when the target dir was empty
+and collection-status was requested.
+
+Moved from using the df command to get temp space
+availability to Python's os.statvfs() call.  Not all
+df commands work the same way.
+
+patch #6813: Making changelist easy to read
+https://savannah.nongnu.org/patch/?6813
+
+patch #6814: Ignore comments in filelists
+https://savannah.nongnu.org/patch/?6814
+
+
+>>>>>>> MERGE-SOURCE
 New in v0.5.16 (2009/04/21)
 ---------------------------
 bug #24825: duplicity warn on insufficient TMPDIR

=== modified file 'Changelog.GNU'
--- Changelog.GNU	2010-03-13 21:53:21 +0000
+++ Changelog.GNU	2011-05-30 02:01:03 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 2010-03-11  Kenneth Loafman  <[e-mail]>
 
 	Manually apply patch from http://bazaar.launchpad.net/~duplicity-team/duplicity/0.7-series/revision/637 which did not make it into 0.6.
@@ -3785,4 +3786,3401 @@
 2002-10-29  bescoto
 
 	Initial checkin
+=======
[phone]  Kenneth Loafman  <[e-mail]>
+
+	lp:~duplicity-team/duplicity/po-updates
+
[phone]  Launchpad Code Hosting  <codehost@crowberry>
+
+	Launchpad automatic translations update.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Merge of lp:~mterry/duplicity/list-old-chains-0.6
+
[phone]  Michael Terry  <[e-mail]>
+
+	merge old-chain signature work from 0.7 branch; keep old sigs around, allow listing them, warn if a too-old listing is requested
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Merged in lp:~duplicity-team/duplicity/po-updates
+
[phone]  Launchpad Code Hosting  <codehost@crowberry>
+
+	Launchpad automatic translations update.
+
[phone]  Launchpad Code Hosting  <codehost@crowberry>
+
+	Launchpad automatic translations update.
+
[phone]  [e-mail]
+
+	Remove .cvsignore
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Remove unused __future__ imports.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Fixed 435975 gpg asks for password in 0.6.05, but not in 0.5.18
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Merge with trunk.
+
[phone]  Michael Terry  <[e-mail]>
+
+	ugh, I'm the worst; add missing import
+
[phone]  Michael Terry  <[e-mail]>
+
+	whoops, use error code 42, not 41 -- that's for par2
+
[phone]  Michael Terry  <[e-mail]>
+
+	add extra information to the 'hostname changed' log message, split it from the 'source dir changed' message
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Merged in lp:~duplicity-team/duplicity/po-updates
+
[phone]  Launchpad Code Hosting  <codehost@crowberry>
+
+	Launchpad automatic translations update.
+
[phone]  Launchpad Code Hosting  <codehost@crowberry>
+
+	Launchpad automatic translations update.
+
[phone]  Launchpad Code Hosting  <codehost@crowberry>
+
+	Launchpad automatic translations update.
+
[phone]  Launchpad Code Hosting  <codehost@crowberry>
+
+	Launchpad automatic translations update.
+
[phone]  Launchpad Code Hosting  <codehost@crowberry>
+
+	Launchpad automatic translations update.
+
[phone]  Launchpad Code Hosting  <codehost@crowberry>
+
+	Launchpad automatic translations update.
+
[phone]  Launchpad Code Hosting  <codehost@crowberry>
+
+	Launchpad automatic translations update.
+
[phone]  Launchpad Code Hosting  <codehost@crowberry>
+
+	Launchpad automatic translations update.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Fix problems with unittests under Jaunty.  It appears that redirection
+	in os.system() has changed for the worse, so a workaround for now.
+	
+	Fix problem in restart where there were no manifest entries and no
+	remote volumes stored.  We clean out the partial and restart.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Merged in lp:~mterry/duplicity/iterate-warnings
+
[phone]  Michael Terry  <[e-mail]>
+
+	add some machine codes to various warnings when iterating over source files
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Merged in lp:~duplicity-team/duplicity/po-updates
+
[phone]  Larry Gilbert  <[e-mail]>
+
+	Additional Portuguese and brand-new Bulgarian translations
+
[phone]  Larry Gilbert  <[e-mail]>
+
+	merge latest 0.6
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Clean up testing run scripts.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	* 422477  [PATCH] IMAP Backend Error in delete()
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Merged in lp:~l2g/duplicity/bug-411375
+
[phone]  Larry Gilbert  <[e-mail]>
+
+	Change message "--cleanup option" to "'cleanup' command"
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Merged in lp:~duplicity-team/duplicity/po-updates
+
[phone]  Larry Gilbert  <[e-mail]>
+
+	Translation of Spanish and Portuguese has begun
+
[phone]  Larry Gilbert  <[e-mail]>
+
+	Updated existing PO files with Rosetta translations
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Merged in lp:~l2g/duplicity/flag-transl-comments which cleared up how\ntranslation comments should be passed to the translators cleanly now.
+
[phone]  Larry Gilbert  <[e-mail]>
+
+	When generating PO[T] files, only use code comments starting with "TRANSL:"
+	for notes to the translators.  "TRANSL:" is filtered out of the POT file
+	with sed after it's generated.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Applied patches from Kasper Brand that fixed device file handling.
+	http://lists.gnu.org/archive/html/duplicity-talk/2009-09/msg00001.html
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Changes for 0.6.05.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Merged in ~l2g/duplicity/test-compat from Larry Gilbert which made
+	the testing compatible across more systems.  Also fixed the remaining
+	collectionstest bug which was trying to test with no cache present.
+
[phone]  Larry Gilbert  <[e-mail]>
+
+	Test separate filesystems using /dev instead of /proc (more widely used)
+
[phone]  Larry Gilbert  <[e-mail]>
+
+	dd on Darwin (and FreeBSD?) doesn't like e.g. "bs=1K", so changed it to "bs=1024"
+
[phone]  Larry Gilbert  <[e-mail]>
+
+	"cp -pR" seems to be a better analogue to "cp -a".  This may not be perfect
+	but it won't hang on a fifo copy like "cp -pr".
+
[phone]  Larry Gilbert  <[e-mail]>
+
+	Got test_get_extraneous working in collectionstests.py
+
[phone]  Larry Gilbert  <[e-mail]>
+
+	Unpacked testfiles.tar.gz on Mac OS X file system and repacked as new file
+
[phone]  Larry Gilbert  <[e-mail]>
+
+	Changed options to 'cp' to be compatible with BSD style yet (hopefully)
+	stay compatible with GNU
+
[phone]  Larry Gilbert  <[e-mail]>
+
+	Took care of some redundancy in tar usage
+
[phone]  Larry Gilbert  <[e-mail]>
+
+	Use bash "command" command to look for Python binaries beyond /usr/bin
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	418170  [PATCH] file names longer then 512 symbols are not supported
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	408059  Failure due to _logger.log failure for content with special characters: TypeError decoding Unicode not supported
+
[phone]  Larry Gilbert  <[e-mail]>
+
+	"remove-older-than" asks for passphrase even though not required; watch for correct internal action name to fix this
+
[phone]  Larry Gilbert  <[e-mail]>
+
+	"remove-older-than" asks for passphrase even though not required; watch for correct internal action name to fix this
+
[phone]  Larry Gilbert  <[e-mail]>
+
+	Typo in remove-older-than may have caused unnecessary passphrase prompts?
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Changes for 0.5.19.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Fix getrlimit usage for Cygwin, which was returning -1 for the hard limit on max open files
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	* ignore unicode() translation errors in log messsages.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	* Make sure 'invalid packet (ctb=14)' from gpg is not a fatal error.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	* On processes that complete before waitpid(), log them and return zero as the process.returned value.  They will have already trapped in the main thread if they returned in error.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	* Copy changes from trunk for duplicity translation.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Comment out Pydev debug startup code.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Merge from trunk.
+
[phone]  Larry Gilbert  <[e-mail]>
+
+	Typo in "remove-older-than" may have caused unnecessary passphrase prompts?
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	* Fixed #409593 deja-dup (or duplicity) deletes all signatures
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Merge GIO changes from trunk.
+
[phone]  Michael Terry  <[e-mail]>
+
+	allow gio backend to restore by setting correct state.  LP: #407968
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Changes for 0.6.04.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Changes for 0.6.04.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Fixed 405734 duplicity fails to restore files that contain a newline character
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Fixed 403790 Backup error: No such file or directory
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Last changes for 0.6.03.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Changes for 0.6.03.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Changes for 0.6.03.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Fixed 402794 duplicity public-key-only incompatible with gnupg 2.0.11.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Fixed 405975 duplicity.gpg.gpg_failed() breaks and spews on GnuPG error.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Fixed 398230 Deja-dup backup fails with message: "Unable to locate last file"
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Fix bug 405646 Small i18n error.
+
[phone]  Larry Gilbert  <[e-mail]>
+
+	Oops, one too many things in usage() were dictionarified
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Minor header comment correction.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Adjust to file renames.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	merge of lp:~l2g/duplicity/doc-update.
+
[phone]  Larry Gilbert  <[e-mail]>
+
+	Sorry... I missed the point being made here...
+
[phone]  Larry Gilbert  <[e-mail]>
+
+	Minor capitalization changes in the manpage
+
[phone]  Larry Gilbert  <[e-mail]>
+
+	CVS-README changed to REPO-README and updated with Launchpad/bzr info
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	merge of lp:~l2g/duplicity/i18n-update-1.
+
[phone]  Larry Gilbert  <[e-mail]>
+
+	Redid dictionary in usage to use a local hash instead of a bunch of local
+	variables, to make things a tad more pleasant.
+
[phone]  Larry Gilbert  <[e-mail]>
+
+	Broke up the usage() help info to simplify translation maintenance.
+	Imported .po files from Launchpad Translation (not sure how necessary
+	they are to have in here, but here they are.)
+
[phone]  Larry Gilbert  <[e-mail]>
+
+	Updated some intltool config info
+
[phone]  Larry Gilbert  <[e-mail]>
+
+	Updated *.po and *.pot files
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Fix restart issues when local manifest does not agree with the contents of the remote system.  In all cases, clean up as needed, and restart the backup at the last known good state.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Refactor to put loop outside of try/except clause.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	BackupSet.delete() now removes both local and remote files.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Make testing into a module.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Capture stderr as well as logger and display stderr with logger only if gpg fails.  Cuts out some of the noise from gpg.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Split restarttest.py from finaltest.py for ease in debugging.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	* fix test config to import backends (now optional).
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	merge of lp:~scode/duplicity/misc.
+
[phone]  Peter Schuller  <[e-mail]>
+
+	* s/pair/tuple/ (method doc fix)
+
[phone]  Peter Schuller  <[e-mail]>
+
+	* when doing the "sleep to make sure we have different current time than last backup":
+	- sleep for 2 seconds instead of 1, since it is an expected case that time may be moving
+	slightly slower as a result of adjtime() and such
+	- assert afterwards that current time really does differ from previous time
+
[phone]  Peter Schuller  <[e-mail]>
+
+	* merge latest trunk
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Update .bzrignore only.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	* fixed 401303 0.6.2 manpage inconsistent wrt. archive-dir/name
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	* fix 377528 --file-to-restore doesn't work with trailing slash
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	* First pass at bug 394757 - Optional Backends
+	https://bugs.launchpad.net/bugs/394757
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	* ignore unicode() translation errors in log messsages.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	* Make sure 'invalid packet (ctb=14)' from gpg is not a fatal error.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	* On processes that complete before waitpid(), log them and return zero as the process.returned value.  They will have already trapped in the main thread if they returned in error.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	* Use correct name of error class ConflictingScheme.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Make Changelog.GNU close to GNU Changelog format.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Changes for 0.6.02.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Another attempt at fixing #394629 Hang on first collection-status.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Fix Bug #395826 "No such file or directory" when backing up second time
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	merge of lp:~scode/duplicity/archive-sync-removelocal and fixes.
+
[phone]  Peter Schuller  <[e-mail]>
+
+	* optimistically try to resolve final issue by passing ParseResult:s sense of what's what to
+	get_suffix() rather than hard-coding based on manifest. not sure if this has other bad side-effects
+	though - will discuss on ML.
+
[phone]  Peter Schuller  <[e-mail]>
+
+	* nuke accidentally added characters in comments - left control is breaking on my keyboard...
+
[phone]  Peter Schuller  <[e-mail]>
+
+	* initial stab (broken): synch both ways; i.e., remove spurious local files in addition to downloading missing ones
+	* problem remaining with determining the correct local name
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Fix bug #394629 Hang on first collection-status
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	merge of lp:~scode/duplicity/ignore-errors
+
[phone]  Peter Schuller  <[e-mail]>
+
+	* support an --ignore-errors command which is intended to mean "try to continue in the face of" errors
+	that might possibly be okay to ignore
+	- intended during restoration to avoid bailing out on errors that are not fatal yet would in fact
+	produce an "incorrect" restoration
+	- for now, only changes behavior on file meta data restoration where I happened to have a problem
+	(I had a +t file which was impossible to restore to +t even though it was possible for it to
+	exist and for me to read it)
+	- be clear in the man page that this is only supposed to be used in case of problems and even then
+	to please contact maintainer if use is needed
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	merge of lp:~scode/duplicity/misc
+
[phone]  Peter Schuller  <[e-mail]>
+
+	* print archive directory in a more readable fashion #394627
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Update ignore list.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Fixes: [Bug 379386] Fix 'list-current-files' with missing archive dir
+
[phone]  Michael Terry  <[e-mail]>
+
+	merge from lp:~mterry/duplicity/po-fixes: reorganize po directory, so that we can start translating in LP
+
[phone]  Michael Terry  <[e-mail]>
+
+	fix po dir layout, update POTFILES.in, add pot file to bzr
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Changes for 0.6.01.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Fixed issues in Checkpoint/Restart:
+	* The --name backupname" option was added to allow the
+	user to separate one archive from another.  If not
+	specified, the default is an MD5 hash of the target
+	URL, which should suffice for most uses.
+	
+	* The archive_dir (cache) is now stored in a standard
+	location, defaulting to ~/.cache/duplicity.  See
+	http://standards.freedesktop.org/basedir-spec/latest/
+	
+	* The interaction between the --archive-dir option and
+	the --name option allows for four possible results
+	for the location of the archive dir.
+	- neither specified (default)
+	~/.cache/duplicity/hash-of-url
+	- --archive-dir=~/arch, no --name
+	~/arch/hash-of-url
+	- no --archive-dir, --name=foo
+	~/.cache/duplicity/foo
+	- --archive-dir=~/arch, --name=foo
+	~/arch/foo
+	
+	* duplicity will now copy needed metadata from the
+	remote store to the local cache as needed.  This
+	means that the first use after upgraded from 0.5.x
+	will have the metadata copied to the local archive
+	dir in order to sync both.
+	
+	* cleanup will now work correctly with the archive
+	dir and separates the local from the remote files.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Fixes bug 392905.  Allow omission of remote file name if the same as the source file name.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	merge of lp:~kenneth-loafman/duplicity/smart-archive-v2
+
[phone]  [e-mail]
+
+	* Change to use XDG_ convention per http://standards.freedesktop.org/basedir-spec/latest/
+
[phone]  [e-mail]
+
+	* Change handling of smart archive dir so both archive and name can be changed.
+
[phone]  Michael Terry  <[e-mail]>
+
+	merge lp:~mterry/duplicity/gio-dist-fix to distribute gio backend
+
[phone]  Michael Terry  <[e-mail]>
+
+	merge from trunk
+
[phone]  Michael Terry  <[e-mail]>
+
+	actually distribute the gio backend
+
[phone]  [e-mail]
+
+	Fix "external file not found" to show command and file names.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	merge of lp:~scode/duplicity/smart-default-archive
+
[phone]  [e-mail]
+
+	Avoid deprecation warning for md5 in Python 2.6.
+
[phone]  Peter Schuller  <[e-mail]>
+
+	* --name affects *expansion*, not default value, of --archive-dir
+
[phone]  Peter Schuller  <[e-mail]>
+
+	* fix a man page mistake from previous merge
+	* remove last remnants of DUPLICITY_ARGS_HASH
+
[phone]  Peter Schuller  <[e-mail]>
+
+	* correct man page to claim hash of backend url rather than has of args
+
[phone]  Peter Schuller  <[e-mail]>
+
+	* figure out which arg is a backend url without actually instantiating a backend
+
[phone]  Peter Schuller  <[e-mail]>
+
+	* make default value to --name be the has of the backend URL specifically, rather than
+	the has of remaining args
+	* outstanding issue: in order to figure out which arg is a backend we call get_backend();
+	must either fix this or feel comfortable that instantiating (and not using) a backend
+	is side-effect free
+
[phone]  Peter Schuller  <[e-mail]>
+
+	* introduce --name parameter to specify symbolic name of a backup
+	* change --archive-dir expansion to look for %DUPLICITY_BACKUP_NAME%
+	* which in turn defaults to the args hash previously used for
+	--archive-dir and %DUPLICITY_ARGS_HASH% expansion
+
[phone]  Peter Schuller  <[e-mail]>
+
+	* merge from trunk
+
[phone]  Peter Schuller  <[e-mail]>
+
+	* support expansion of %DUPLICITY_ARGS_HASH% in --archive-dir value
+	* default to ~/.duplicity/%DUPLICITY_ARGS_HASH$ so that default behavior
+	works well even when the user has multiple backup destinations
+	* update the manpage accordingly
+
[phone]  [e-mail]
+
+	Misc project changes.
+
[phone]  [e-mail]
+
+	If python is run setuid, it's only partway set, so make sure to run with euid/egid of root.
+
[phone]  [e-mail]
+
+	Create testfiles/output in SetUp routine so it will run standalone.
+
[phone]  [e-mail]
+
+	Surround --gio option with try/except so user will not see traceback.
+
[phone]  [e-mail]
+
+	Make GIO tests dependent on presence of gio module.
+
[phone]  [e-mail]
+
+	Fix 'get' command args.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	merge of lp:~cjwatson/duplicity/always-sftp
+
[phone]  Colin Watson  <[e-mail]>
+
+	initial attempt at using only sftp on the client (https://savannah.nongnu.org/bugs/index.php?26464)
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	Add .bzrignore
+
[phone]  Michael Terry  <[e-mail]>
+
+	merge with trunk
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	merge of lp:~scode/duplicity/bug-387102
+
[phone]  Peter Schuller  <[e-mail]>
+
+	* merge lp:~mterry/duplicity/log-upload-events since I created conflicts with my
+	changes
+
[phone]  Peter Schuller  <[e-mail]>
+
+	* s/self.__waiter/self.__failed_waiter/
+
[phone]  Peter Schuller  <[e-mail]>
+
+	* significantly re-design the asynch scheduler to be much simpler; instead of keeping workers
+	and queues, simply launch a thread for each unit of work, blocking when called for by
+	a concurrency limit or a barrier. the old design was a result of initially designing for
+	keeping a persistent set of workers, only to then drop that idea. when dropping that idea,
+	I should have re-done it like this from the start instead of retaining the complexity
+	i introduced for the persistent worker design.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	merge of lp:~scode/duplicity/reasonable-io-blocksize
+
[phone]  Peter Schuller  <[e-mail]>
+
+	* GPGWriteFile: what was previously the minimum block is is now just the block size; meaning
+	the maximum block size used for individual I/O operations, but still the minimum in terms
+	of when to give up on the iteration
+	* GZipWriteFile: similar change, though blocksize handling was a bit different
+
[phone]  [e-mail]
+
+	Fix regression -- add tahoebackend back in.
+
[phone]  Kenneth Loafman  <[e-mail]>
+
+	s/src.name/self.src.name/ in exception handling path
+
[phone]  Peter Schuller  <[e-mail]>
+
+	* s/src.name/self.src.name/ in exception handling path
+
[phone]  Michael Terry  <[e-mail]>
+
+	merge log worker event info codes
+
[phone]  Michael Terry  <[e-mail]>
+
+	add log codes for upload events
+
[phone]  Michael Terry  <[e-mail]>
+
+	Merge GIO branch, supporting the --gio argument
+
[phone]  Michael Terry  <[e-mail]>
+
+	don't be so specific about exceptions we catch
+
[phone]  Michael Terry  <[e-mail]>
+
+	add GIO backend
+
[phone]  Michael Terry  <[e-mail]>
+
+	add info codes for upload events
+
[phone]  [e-mail]
+
+	Fix omitted changes in duplicity manpage.
+
[phone]  loafman
+
+	Changes for 0.6.0.
+
[phone]  loafman
+
+	Some cleanup on the forced assertion test code to allow
+	multiple failures and no traceback for the assert.
+
[phone]  loafman
+
+	Add code for testing of Checkpoint/Restore that I had been doing by hand, both single and multiple failure tests, with verify at the end.
+
[phone]  loafman
+
+	Fix getrlimit usage for Cygwin, which was returning -1 for the hard limit on max open files.
+
[phone]  loafman
+
+	After merge of Checkpoint/Restart.
+
[phone]  loafman
+
+	Checkpoint - Prep for merge of duplicity-cprs.
+
[phone]  loafman
+
+	Allow handling of unicode filenames in log messages.
+
[phone]  loafman
+
+	Changes for 0.5.18.
+
[phone]  loafman
+
+	Changes for 0.5.18.
+
[phone]  loafman
+
+	Correct copyright.
+
[phone]  loafman
+
+	Reset file type preferences.
+
[phone]  loafman
+
+	Changed from using ulimit external command to
+	resource.getrlimit to check open files limit.
+
[phone]  loafman
+
+	patch #6743: Tahoe backend for duplicity
+	https://savannah.nongnu.org/patch/?6743
+
[phone]  loafman
+
+	Only half of this bug is fixed but it's still useful.
+	bug #21792: pipe call fails with an error OSError:
+	[Errno 24] Too many open files
+	https://savannah.nongnu.org/bugs/?21792
+
[phone]  loafman
+
+	Added support for RackSpace's CloudFiles, cf+http.
+
[phone]  loafman
+
+	Add more detail on connection failure.
+
[phone]  loafman
+
+	Added support for RackSpace's CloudFiles, cf+http.
+
[phone]  loafman
+
+	Changes for 0.5.17.
+
[phone]  loafman
+
+	Checkpoint.
+
[phone]  loafman
+
+	The previous revision got the wrong comment, so
+	I cleaned up some code and checked back in.  The
+	correct release comment should be:
+	
+	patch #6814: Ignore comments in filelists
+	https://savannah.nongnu.org/patch/?6814
+
[phone]  loafman
+
+	patch #6813: Making changelist easy to read
+	https://savannah.nongnu.org/patch/?6813
+
[phone]  loafman
+
+	Moved from using the df command to get temp space
+	availability to Python's os.statvfs() call.  Not all df
+	commands work the same way.
+
[phone]  loafman
+
+	I had put in some trial code that I removed incompletely that forced
+	a full backup action.  This removes the last line of that code.
+
[phone]  loafman
+
+	Changes for 0.5.16.
+
[phone]  loafman
+
+	Reduce max_open_files limit needed to 1024, was 2048.
+
[phone]  loafman
+
+	Fix argument list in FatalError call re max open files.
+
[phone]  loafman
+
+	bug #24825: duplicity warn on insufficient TMPDIR
+	space availability and low max open
+	file limits pre-backup.
+	https://savannah.nongnu.org/bugs/?24825
+	
+	bug #25976: Password requested when not needed.
+	https://savannah.nongnu.org/bugs/?25976
+
[phone]  loafman
+
+	Use os.access() check on regular files and dirs only.
+
[phone]  loafman
+
+	Added tilde and variable expansion to the source or
+	target argument that is not a URL.
+
[phone]  loafman
+
+	Remove check for only one $version string.
+
[phone]  loafman
+
+	bug #24825: duplicity warn on insufficient TMPDIR
+	space availability and low max open
+	file limits pre-backup.
+	https://savannah.nongnu.org/bugs/?24825
+
[phone]  loafman
+
+	bug #25976: Password requested when not needed.
+	https://savannah.nongnu.org/bugs/?25976
+
[phone]  loafman
+
+	Make sure gettext is included first.
+	Add variable at top of file for verbosity.
+
[phone]  loafman
+
+	Add some documentation.
+
[phone]  loafman
+
+	Make sure gettext is available by importing first.
+
[phone]  loafman
+
+	Move ssh and imap backend globals to globals.py.
+
[phone]  loafman
+
+	patch #6806: More graceful handling of old
+	--short-filename files
+	https://savannah.nongnu.org/patch/?6806
+
[phone]  loafman
+
+	bug #25594: wrong backup statistics
+	https://savannah.nongnu.org/bugs/?25594
+
[phone]  loafman
+
+	Not needed.
+
[phone]  loafman
+
+	Changes for 0.5.15.
+
[phone]  loafman
+
+	If a file is unreadable due to access rights or other
+	non-fatal errors, put out error message and continue
+	rather than dying messily with a traceback.
+
[phone]  loafman
+
+	Move SystemExit function back to the top and put
+	a large note NOT to move it back down, otherwise,
+	Exception gets invoked instead.
+
[phone]  loafman
+
+	Remove "--restore-dir" from options[].
+	It's not an option and never has been.
+
[phone]  loafman
+
+	Added tilde '~' expansion and variable expansion in the
+	options that require a filename.  You can now have this
+	"--archive-dir=~/ArchDir/$SYSNAME" if you need it.  No
+	expansion is applied to the source or target URL's.
+
[phone]  loafman
+
+	Unit tests were failing for ftp because of the filtering for
+	duplicity-only filenames.  Corrected this and removed
+	the check for the filename in the first element.
+
[phone]  loafman
+
+	If a file is unreadable due to access rights or other non-
+	fatal errors, put out error message and continue.
+
[phone]  loafman
+
+	FTP backend was failing on PureFTPd when the "-x ''"
+	option was removed from the second ncftpls popen, a fix
+	that was implemented due to bug #24741.  This fix does
+	the ls in one pass by extracting either the first or the
+	last entry on the 'ls -l'.  [Standard FTP would be nice!]
+
[phone]  loafman
+
+	Changes for 0.5.14.
+
[phone]  loafman
+
+	Normalized include statements and tried to insure that all
+	duplicity includes were from the duplicity module.
+
[phone]  loafman
+
+	After email voting among known duplicity contributors,
+	the decision was reached to revert to the GPL Version 2
+	license, so with their consensus, duplicity is now under
+	GPL Version 2.
+
[phone]  loafman
+
+	The -vN option has not changed.  Verbosity may also be one
+	of: character [ewnid], or word ['error', 'warning', 'notice',
+	'info', 'debug'].  The default is 4 (Notice).  The options
+	-v4, -vn, and -vnotice are functionally equivalent, as are
+	the mixed-case versions, -vN, -vNotice, -vNOTICE.
+
[phone]  loafman
+
+	The -vN option has not changed.  Verbosity may also be one
+	of: character [ewnid], or word ['error', 'warning', 'notice',
+	'info', 'debug'].  The default is 4 (Notice).  The options
+	-v4, -vn, and -vnotice are functionally equivalent, as are
+	the mixed-case versions, -vN, -vNotice, -vNOTICE.
+
[phone]  loafman
+
+	patch #6790: Add --exclude-if-present
+	https://savannah.nongnu.org/patch/?6790
+
[phone]  loafman
+
+	Clarify recent log entries.
+
[phone]  loafman
+
+	Add '../' to Python path so we find our GnuPGInterface and not another.
+
[phone]  loafman
+
+	Changed from log.Log with numbered log levels to log.Debug,
+	log.Info, log.Notice, log.Warn, log.FatalError as below:
+	0  log.FatalError
+	1  log.Warn
+	2  log.Warn
+	3  log.Notice
+	4  log.Notice
+	5  log.Info
+	6  log.Info
+	7  log.Info
+	8  log.Info
+	9 log.Debug
+	The -vN option has not changed at this point.
+
[phone]  loafman
+
+	Revert to calling NcFTP utilities (ls, get, put) directly
+	rather than scripting ncftp via pexpect.  Move fatal error
+	regarding version 3.2.0 to a warning message since it has
+	been reported that the segfault problem does not occur on
+	most distributions.
+
[phone]  loafman
+
+	Add Changelog.GNU to website and distribution to add a bit of detail
+	showing the CVS changes via rcs2log.  Added dist/mkGNUChangelog.sh.
+
[phone]  loafman
+
+	bug #22908: Don't block gpg-agent
+	https://savannah.nongnu.org/bugs/?22908
+	
+	To fix the above, --use-agent was added as a command line option.
+	When this is specified and asymetric encryption is enabled, then all
+	GnuPG passphrases will come from the gpg-agent or equivalent program
+	and no passphrase prompt will be issued.
+
[phone]  loafman
+
+	Add testing/manual dir.
+
[phone]  loafman
+
+	bug #25976: Signed Backups Now Required
+	https://savannah.nongnu.org/bugs/?25976
+
[phone]  loafman
+
+	patch #6787: import duplicity.GnuPGInterface explicitly
+	https://savannah.nongnu.org/patch/?6787
+
[phone]  loafman
+
+	Project setting changes.
+
[phone]  loafman
+
+	One statement per line.
+	Indent text of error message to code level.
+
[phone]  loafman
+
+	Fixed bug where an extra comma caused a traceback during a warning
+	about unnecessary sig files.  Plus fixed print so the real filename
+	would show up and not a Python object representation.
+
[phone]  loafman
+
+	bug #25787: Usernames with escaped @-sign are not handled properly
+	https://savannah.nongnu.org/bugs/?25787
+
[phone]  loafman
+
+	Adjust log levels so errors show up without verbosity.
+
[phone]  loafman
+
+	BackendException does not cause traceback except when
+	verbosity is at level 9 (debug).
+
[phone]  loafman
+
+	Fix backends so sleep does not occur after last retry.
+
[phone]  loafman
+
+	Add more error detection to FTP backend.
+	
+	Fix backends so sleep does not occur after last retry.
+
[phone]  loafman
+
+	patch #6773: Make user name optional in rsync backend
+	https://savannah.nongnu.org/patch/?6773
+
[phone]  loafman
+
+	bug #25853: duplicity fails with boto passwords coming from ~/.boto
+	https://savannah.nongnu.org/bugs/?25853
+
[phone]  loafman
+
+	GPG errors will no longer cause tracebacks, but will produce a
+	log entry, from gpg, similar to the following:
+	===== Begin GnuPG log =====
+	gpg: BAD0BAD0: skipped: public key not found
+	gpg: [stdin]: encryption failed: public key not found
+	===== End GnuPG log =====
+	This will let the user know what really caused the GPG process
+	to fail, and what really caused errors like 'broken pipe'.
+
[phone]  loafman
+
+	bug #25838: Backup fails / ncftp - remote file already exists
+	https://savannah.nongnu.org/bugs/?25838
+
[phone]  loafman
+
+	Add / modify / repair Epydoc docstrings and format.
+
[phone]  loafman
+
+	One statement per line.
+
[phone]  loafman
+
+	One statement per line.
+
[phone]  loafman
+
+	Changes for 0.5.11.
+
[phone]  loafman
+
+	Bug #333057: GnuPGInterface prints exit statuses incorrectly
+	https://bugs.launchpad.net/bugs/333057
+
[phone]  loafman
+
+	bug #25787: Usernames with @-sign are not handled properly
+	https://savannah.nongnu.org/bugs/?25787
+
[phone]  loafman
+
+	Detabify (was tab-width 8).
+
[phone]  loafman
+
+	Bug #333057: GnuPGInterface prints exit statuses incorrectly
+	https://bugs.launchpad.net/bugs/333057
+
[phone]  loafman
+
+	Fix issue on return from waitpid where the result was shifted left and not right, producing 131072 instead of 2, as it should.
+	
+	Fixed some indent problems that PyDev complained about (Eclipse IDE).
+
[phone]  loafman
+
+	One statement per line.
+
[phone]  loafman
+
+	bug #25696: ncftp error with 0.5.09
+	https://savannah.nongnu.org/bugs/?25696
+
[phone]  loafman
+
+	Also log the quit command.
+
[phone]  loafman
+
+	One statement per line.
+
[phone]  loafman
+
+	bug #15664: When restoring backup: "OverflowError:
+	long int too large to convert to int"
+	https://savannah.nongnu.org/bugs/?15664
+
[phone]  loafman
+
+	One statement per line.
+
[phone]  loafman
+
+	patch #6761: More robust pexpect handling of SSH authentication
+	https://savannah.nongnu.org/patch/?6761
+
[phone]  loafman
+
+	patch #6762: Wrong exit() used for 2.3/2.4 Python
+	https://savannah.nongnu.org/patch/?6762
+
[phone]  loafman
+
+	One statement per line.
+
[phone]  loafman
+
+	Explain new filenames and --time-separator better.
+
[phone]  loafman
+
+	Changes for 0.5.10.
+
[phone]  loafman
+
+	Add deprecation warnings for options affected by old filenames.
+
[phone]  loafman
+
+	bug #19988: Incompatibility to Samba/SMB share
+	https://savannah.nongnu.org/bugs/?19988
+
[phone]  loafman
+
+	One statement per line.
+
[phone]  loafman
+
+	One statement per line.
+
[phone]  loafman
+
+	Module gettext should be imported and installed prior to importing any other modules.  This allows long strings to be translated when put at the module level rather than at the function call level.  See dup_time.py for examples.
+
[phone]  loafman
+
+	One statement per line and other cleanup.
+
[phone]  loafman
+
+	bug #25550: Error codes do not propagate from log to exit status
+	https://savannah.nongnu.org/bugs/?25550
+
[phone]  loafman
+
+	bug #25097: Allow listing files from any time, not just current time
+	https://savannah.nongnu.org/bugs/?25097
+
[phone]  loafman
+
+	Bug #229826 duplicity crashed with ValueError in port()
+	https://bugs.launchpad.net/duplicity/+bug/229826
+
[phone]  loafman
+
+	Changes for 0.5.09.
+
[phone]  loafman
+
+	If tempdir.py is included, but not instantiated, then deleted, it throws an exception,
+	as happens during testing when duplicity main is not used to instantiate tempdir.
+	The fix is to make sure instantiation has happened before calling cleanup().
+
[phone]  loafman
+
+	These are changes to make debugging easier.
+	- Filter ANSI control (bolding) characters from NcFTP responses.
+	- Turn off ad for ncftp server at close of each session.
+
[phone]  loafman
+
+	bug #25530: commandline passwd not working
+	https://savannah.nongnu.org/bugs/?25530
+
[phone]  loafman
+
+	FTP is now driven with pexpect rather than NcFTP utilities.
+	This closes the following bugs:
+	bug #24741: ncftpls -x '' causes failure on Yahoo FTP server
+	bug #23516: duplicity/ncftpget not closing unlinked files, ...
+
[phone]  loafman
+
+	Merge from pexpect_ftp.
+
[phone]  loafman
+
+	Applied retryImap2.patch from bug 25512.
+
[phone]  loafman
+
+	bug #25509: Logic error in imapbackend.py [IMAP_SERVER]
+	https://savannah.nongnu.org/bugs/?25512
+	
+	bug #25512: [Patch] Retry on Imap failure
+	https://savannah.nongnu.org/bugs/?25509
+
[phone]  loafman
+
+	Replace rdiff-backup with duplicity in strings.
+
[phone]  loafman
+
+	Add copyright for author.
+
[phone]  loafman
+
+	Split parsedurl test from backendtest and add test cases.
+
[phone]  loafman
+
+	Add NcFTP 3.2.0 exception clause to dependencies.
+
[phone]  loafman
+
+	Turns out going backwards in the license is not as easy as
+	forwards.  Restoring GPLv3 license until consensus reached.
+
[phone]  loafman
+
+	Add/update copyright statements in all distribution source files
+	and revert duplicity to GPL version 2 license.
+
[phone]  loafman
+
+	Changes for 0.5.07.
+
[phone]  loafman
+
+	Python 2.3 unittest.py tried to call to a test-local variable named
+	'test_id' and failed.  Changed to 'my_test_id' and all is well.
+
[phone]  loafman
+
+	Original fix to disallow use of ncftpput 3.2.0 mistyped the ErrorCode used.
+
[phone]  loafman
+
+	patch #6733: Improve error handling in imapbackend.py
+	https://savannah.nongnu.org/patch/?6733
+
[phone]  loafman
+
+	Add/update copyright statements in all distribution source files
+	and revert duplicity to GPL version 2 license.
+
[phone]  loafman
+
+	patch #6729: New imap backend. Replaces current gmail backend
+	https://savannah.nongnu.org/patch/?6729
+
[phone]  loafman
+
+	bug #25293: IOError: [Errno 22] Invalid argument
+	https://savannah.nongnu.org/bugs/?25293
+
[phone]  loafman
+
+	Modify patch #6730: Fix timing out for SSH backend
+	Do not take out the first line from the return buffer (#4).
+
[phone]  loafman
+
+	patch #6730: Fix timing out for SSH backend
+	https://savannah.nongnu.org/patch/?6730
+
[phone]  loafman
+
+	patch #6729: New imap backend. Replaces current gmail backend
+	https://savannah.nongnu.org/patch/?6729
+
[phone]  loafman
+
+	Removed ref to bug 25331 since the analysis and fix were both wrong.
+	The issue was fixed correctly in bug 25403.
+
[phone]  loafman
+
+	bug #25403: 0.5.06 "manifests not equal because different volume numbers"
+	https://savannah.nongnu.org/bugs/?25403
+
[phone]  loafman
+
+	bug #25403: 0.5.06 "manifests not equal because different volume numbers"
+	https://savannah.nongnu.org/bugs/?25403
+
[phone]  loafman
+
+	One statement per line.
+
[phone]  loafman
+
+	Move alltests list to separate file.
+
[phone]  loafman
+
+	Add coverage output to .cvsignore.
+
[phone]  loafman
+
+	Turn on verbose for unit tests.
+
[phone]  loafman
+
+	Fix backendtest.py so that empty URL's in config.py cause the
+	backend test to be skipped rather than erroring.  Added notes
+	in config.py.tmpl explaining the change.
+
[phone]  loafman
+
+	Make default Python be system default version.
+
[phone]  loafman
+
+	Add Releases directory.
+
[phone]  loafman
+
+	First pass at coverage analysis, collect the data.
+
[phone]  loafman
+
+	Remove LOG entries.  Not needed.
+
[phone]  loafman
+
+	Change to ASCII (-kkv)
+
[phone]  loafman
+
+	Run a single unit test.
+
[phone]  loafman
+
+	Increase default volume size (--volsize) to 25M from 5M.  This
+	reduces the number of volumes to accomodate larger backups.
+
[phone]  loafman
+
+	bug #25379: sys.exit() causes traceback and should not
+	https://savannah.nongnu.org/bugs/index.php?25379
+
[phone]  loafman
+
+	Reworked patch 6701 to list collection one at a time rather than
+	writing all as one huge list.  Was causing memeory problems when
+	the collections got large.
+
[phone]  loafman
+
+	bug #25331: When --archive-dir and --encrypt-key are used together, incremental fails.
+	https://savannah.nongnu.org/bugs/index.php?25331
+
[phone]  loafman
+
+	bug #25331: When --archive-dir and --encrypt-key are used together, incremental fails.
+	https://savannah.nongnu.org/bugs/index.php?25331
+
[phone]  loafman
+
+	Changes for 0.5.06.
+
[phone]  loafman
+
+	Fix illegal macro .PP. by removing extraneous period on end.
+
[phone]  loafman
+
+	NcFTP version 3.2.0 will not work with duplicity since we require the
+	use of both -f and -C options on ncftpput.  3.1.9, 3.2.1+ work fine.
+	I put in error checks for this situation in the FTP backend code.
+
[phone]  loafman
+
+	Noah Spurrier has given us permission to distribute pexpect.py along
+	with duplicity, so this will no longer be an install requirement.
+
[phone]  loafman
+
+	Added loop to run-all-tests.sh to run all tests against all supported
+	versions of Python if available.  Looks for 2.3, 2.4, 2.5, 2.6.
+
[phone]  loafman
+
+	Fix to deprecation warnings about sha and md5 modules.
+	Uses hashlib if available, otherwise original module.
+
[phone]  loafman
+
+	Missed the most basic case, no selection functions.  Fixed.
+
[phone]  loafman
+
+	bug #25230: --include-globbing-filelist only including first entry.
+	https://savannah.nongnu.org/bugs/?25230
+
[phone]  loafman
+
+	sr #106583: document the need to use the --force option
+	https://savannah.nongnu.org/support/?106583
+
[phone]  loafman
+
+	patch #6709: Report correct number of volumes when restoring
+	https://savannah.nongnu.org/patch/?6709
+
[phone]  loafman
+
+	bug #25239: Error during clean, wrong case in duplcicity
+	https://savannah.nongnu.org/bugs/?25239
+
[phone]  loafman
+
+	Changes for 0.5.05.
+
[phone]  loafman
+
+	Add po files back into distribution.
+
[phone]  loafman
+
+	Cosmetic - reformat FatalError calls at end for readability.
+
[phone]  loafman
+
+	Change "test" to "$version".
+
[phone]  loafman
+
+	Build list of .mo files to be installed from po directory.
+
[phone]  loafman
+
+	bug #25194: Duplicity 5.04 requires python-distutils-extra...
+	https://savannah.nongnu.org/bugs/?25194
+
[phone]  loafman
+
+	Use reldate expansion to include release date.
+
[phone]  loafman
+
+	- Use os.path.join() instead of hardcoded strings
+	- Make VersionedCopy replace $reldate as well as $version
+
[phone]  loafman
+
+	Adjust RPM spec file for translations.
+
[phone]  loafman
+
+	Changes for 0.5.04.
+
[phone]  loafman
+
+	patch #6702: handle unknown errnos in robust.py
+	https://savannah.nongnu.org/patch/?6702
+
[phone]  loafman
+
+	patch #6700: Make duplicity translatable
+	https://savannah.nongnu.org/patch/?6700
+	[not in patch - added after unit tests]
+
[phone]  loafman
+
+	patch #6701: Make current-list command machine-readable
+	https://savannah.nongnu.org/patch/?6701
+
[phone]  loafman
+
+	patch #6700: Make duplicity translatable
+	https://savannah.nongnu.org/patch/?6700
+
[phone]  loafman
+
+	GPG was throwing "gpg: [don't know]: invalid packet (ctb=14)" and apparently this is non-fatal.
+	There is a fix for this being rolled into GPG 2.x.
+	http://lists.gnupg.org/pipermail/gnupg-devel/2006-September/023180.html
+	Copied from collections.py.  Fix supplied by Simon Blandford <[e-mail]>
+
[phone]  loafman
+
+	One statement per line.  No other changes.
+
[phone]  loafman
+
+	One statement per line.  No other changes.
+
[phone]  loafman
+
+	Print backend name for each test started.
+
[phone]  loafman
+
+	Remove test for assert on non-existing delete.  Not all backends will raise an exception when the target of a delete does not exist.
+
[phone]  loafman
+
+	Log correct file name in line 67.  Use diff_ropath, not basis_path.
+
[phone]  loafman
+
+	Fix patch applied during Patch #6696.  Applied fixiter.diff.
+
[phone]  loafman
+
+	patch #6697: Always log at least one progress during dry run
+	https://savannah.nongnu.org/patch/?6697
+
[phone]  loafman
+
+	patch #6696: Consolidate get_delta_iter and get_delta_iter_w_sig
+	https://savannah.nongnu.org/patch/?6696
+
[phone]  loafman
+
+	patch #6695: Log filenames
+	https://savannah.nongnu.org/patch/?6695
+
[phone]  loafman
+
+	patch #6694: Log exceptions
+	https://savannah.nongnu.org/patch/?6694
+
[phone]  loafman
+
+	patch #6693: Some FatalError's don't have codes still
+	https://savannah.nongnu.org/patch/?6693
+
[phone]  loafman
+
+	patch #6692: Print collection status in a machine-readable way
+	https://savannah.nongnu.org/patch/?6692
+
[phone]  loafman
+
+	bug #24889: NCFTP cannot deal with some FTP servers
+	https://savannah.nongnu.org/bugs/?24889
+
[phone]  loafman
+
+	bug #25090: Typos and trailing whitespace in duplicity manpage
+	https://savannah.nongnu.org/bugs/?25090
+
[phone]  loafman
+
+	patch #6686: Add error codes for all fatal errors
+	https://savannah.nongnu.org/patch/?6686
+
[phone]  loafman
+
+	patch #6678: Add progress metering
+	https://savannah.nongnu.org/patch/?6678
+
[phone]  loafman
+
+	Changes for 0.5.03.
+
[phone]  loafman
+
+	patch #6676: Raw delta stats aren't right for multivolumes
+	https://savannah.nongnu.org/patch/?6676
+
[phone]  loafman
+
+	patch #6675: Add modelines
+	https://savannah.nongnu.org/patch/?6675
+
[phone]  loafman
+
+	patch #6674: Add --log-* options to man page
+	https://savannah.nongnu.org/patch/?6674
+
[phone]  loafman
+
+	patch #6673: Add --dry-run option
+	https://savannah.nongnu.org/patch/?6673
+
[phone]  loafman
+
+	patch #6672: makedist doesn't ship util.py
+	https://savannah.nongnu.org/patch/?6672
+
[phone]  loafman
+
+	Add log.setup() call to main() to support new logging.
+
[phone]  loafman
+
+	*** empty log message ***
+
[phone]  loafman
+
+	Add log.setup() to support new logging.
+
[phone]  loafman
+
+	Checkpoint 2 prior to 5.03.
+
[phone]  loafman
+
+	patch #6670: Machine Readable Output
+	https://savannah.nongnu.org/patch/?6670
+
[phone]  loafman
+
+	Correct spelling of parsed_url (parsed_urk) in patch #6662.
+
[phone]  loafman
+
+	sr #106534: GMail backups aren't stored in the correct location
+	https://savannah.nongnu.org/support/?106534
+
[phone]  loafman
+
+	sr #106496: put install-from-cvs-notes in CVS-README
+	https://savannah.nongnu.org/support/?106496
+
[phone]  loafman
+
+	Checkpoint prior to 5.03.
+
[phone]  loafman
+
+	patch #6638: correct typo in reporting lack of sufficiently new boto backend
+	https://savannah.nongnu.org/patch/?6638
+
[phone]  loafman
+
+	patch #6642: make ParsedUrl() thread-safe with respect to itself
+	https://savannah.nongnu.org/patch/?6642
+
[phone]  loafman
+
+	patch #6652: improve asynch scheduler (including the synchronous case)
+	https://savannah.nongnu.org/patch/?6652
+
[phone]  loafman
+
+	patch #6662: improve s3 backend error reporting
+	https://savannah.nongnu.org/patch/?6662
+
[phone]  loafman
+
+	patch #6670: Machine Readable Output
+	https://savannah.nongnu.org/patch/?6670
+
[phone]  loafman
+
+	bug #24775: Digest Auth for WebDAV backend
+	https://savannah.nongnu.org/bugs/?24775
+
[phone]  loafman
+
+	bug #24731: Documentation error: "if... if" in remove-older-than paragraph
+	https://savannah.nongnu.org/bugs/?24731
+
[phone]  loafman
+
+	Changes for 0.5.02
+
[phone]  loafman
+
+	patch #6297: Add IMAP/s/gmail support
+	https://savannah.nongnu.org/patch/index.php?6297
+
[phone]  loafman
+
+	patch #6297: Add IMAP/s/gmail support
+	https://savannah.nongnu.org/patch/index.php?6297
+
[phone]  loafman
+
+	Change to one statement per line.
+
[phone]  loafman
+
+	Change use of logger so that gpg logs are always collected.
+	The log is always printed in the case of gpg IO errors.
+	Verbosity level 5 or greater will also print the logs the
+	same as previous versions.
+
[phone]  loafman
+
+	Make one statement per line.  No other changes.
+
[phone]  loafman
+
+	- add -h option for help
+
[phone]  loafman
+
+	bug #24274: asyncscheduler.py missing sys import
+	https://savannah.nongnu.org/bugs/index.php?24274
+
[phone]  loafman
+
+	bug #24260: backend.py missing re import
+	https://savannah.nongnu.org/bugs/index.php?24260
+
[phone]  loafman
+
+	Changes for 0.5.01
+
[phone]  loafman
+
+	Ignore test log file.
+
[phone]  loafman
+
+	Untabify all files.  To compare against previous
+	versions use 'cvs diff -w' or 'diff -w'.
+
[phone]  loafman
+
+	Create target dir (collection) if needed.
+
[phone]  loafman
+
+	Ignore testfiles dir.
+
[phone]  loafman
+
+	Add tests for webdav and webdavs.
+
[phone]  loafman
+
+	bug #24223: WebDAV backend broken in 0.5.00
+	https://savannah.nongnu.org/bugs/index.php?24223
+
[phone]  loafman
+
+	Changes for 0.5.00
+
[phone]  loafman
+
+	Changes for 0.5.00
+
[phone]  loafman
+
+	temp2.tar was a test-created file that had to be present
+	at the beginning of test_tarfile.py.  Removed the need for
+	it to be present and removed the file from CVS.
+
[phone]  loafman
+
+	Changes to get unit tests working again:
+	- resolve circular imports during unit tests
+	- resolve exception error import - now in errors.py
+
[phone]  loafman
+
+	patch #6623: slightly augment tempdir cleanup logging
+	https://savannah.nongnu.org/patch/index.php?6623
+
[phone]  loafman
+
+	No longer needed, see backends dir.
+
[phone]  loafman
+
+	no comment
+
[phone]  loafman
+
+	bug #23988: scp destination fails if no username is specified
+	https://savannah.nongnu.org/bugs/index.php?23988
+
[phone]  loafman
+
+	bug #23985: --no-encryption option does not work in 0.4.12
+	https://savannah.nongnu.org/bugs/index.php?23985
+
[phone]  loafman
+
+	patch #6596: re-organize backend module structure
+	https://savannah.nongnu.org/patch/index.php?6596
+
[phone]  loafman
+
+	patch #6353: Concurrency for volume encryption and upload.
+	https://savannah.nongnu.org/patch/index.php?6353
+
[phone]  loafman
+
+	patch #6589: S3 european bucket support
+	https://savannah.nongnu.org/patch/index.php?6589
+
[phone]  loafman
+
+	Changes for 0.4.12.
+
[phone]  loafman
+
+	bug #23362: Documentation for --version, --time-separator <char>
+	https://savannah.nongnu.org/bugs/index.php?23362
+
[phone]  loafman
+
+	Cosmetic only.
+
[phone]  loafman
+
+	bug #23540: doc bug in man page (environment FTP_PASSWORD)
+	https://savannah.nongnu.org/bugs/?23540
+
[phone]  loafman
+
+	Dan Muresan created a patch that tries to minimize the number of password
+	prompts.  To do so, it sometimes requests a password once without
+	confirmation; if later it turns out that a full backup is needed, the
+	user is prompted for confirmation.
+
[phone]  loafman
+
+	bug #23066: ssh uris with given portnumbers are not handled correctly
+	https://savannah.nongnu.org/bugs/index.php?23066
+
[phone]  loafman
+
+	Fix sort() for Python 2.3
+
[phone]  loafman
+
+	Change back to requiring Python 2.3.
+
[phone]  loafman
+
+	Change requirements back to Python 2.3.
+
[phone]  loafman
+
+	Changes for 0.4.11
+
[phone]  loafman
+
+	Modified to run on Python 2.3.
+
[phone]  loafman
+
+	bug #22826: regressions caused by boto 1.1c
+	https://savannah.nongnu.org/bugs/?22826
+
[phone]  loafman
+
+	Reinstate patch #6340 with a detailed explanation.
+	http://savannah.nongnu.org/patch/index.php?6340
+
[phone]  loafman
+
+	Changes for 0.4.10.
+
[phone]  loafman
+
+	Remove --sign for now.
+
[phone]  loafman
+
+	bug #22728: FTP backend fails on empty directory
+	https://savannah.nongnu.org/bugs/?22728
+
[phone]  loafman
+
+	Fix log.debug to log.Debug
+
[phone]  loafman
+
+	patch #6453: handle absolute urls in webdav backend
+	https://savannah.nongnu.org/patch/index.php?6453
+
[phone]  loafman
+
+	patch #6449: add additional debug level logging
+	https://savannah.nongnu.org/patch/index.php?6449
+
[phone]  loafman
+
+	patch #6403: Restore by overwriting files/directories by using --force option
+	https://savannah.nongnu.org/patch/?6403
+
[phone]  loafman
+
+	Password should be None, not empty string.
+
[phone]  loafman
+
+	Add config for S3 tests.
+
[phone]  loafman
+
+	Reformat to one statement per line.
+
[phone]  loafman
+
+	Fix problem where S3 prefix was appended with 'd'.  This caused
+	a failure in the regression tests.  Unsure where it came from.
+
[phone]  loafman
+
+	patch #6389: Possible Fix for pagefile.sys on Win32 systems
+	https://savannah.nongnu.org/patch/?6389
+
[phone]  loafman
+
+	patch #6380: add additional named logging levels
+	https://savannah.nongnu.org/patch/?6380
+
[phone]  loafman
+
+	patch #6374: Duplicity --tempdir patch documentation.
+	https://savannah.nongnu.org/patch/?6374
+
[phone]  loafman
+
+	patch #6375: Duplicity reports the epoch for a nonexistant last full backup date
+	https://savannah.nongnu.org/patch/?6375
+
[phone]  loafman
+
+	- remove sleep() from dup_time.py - not used.
+	- make one statement per line format change.
+
[phone]  loafman
+
+	Remove testSleeping since sleep() removed from dup_time.py.
+
[phone]  loafman
+
+	Add S3 backend test.
+
[phone]  loafman
+
+	do not store object
+
[phone]  loafman
+
+	Add requirements for source package install.
+
[phone]  loafman
+
+	Changes for 0.4.9.
+
[phone]  loafman
+
+	Add more info on URL formats.
+
[phone]  loafman
+
+	Updated URL Formats in the Help Screen.
+
[phone]  loafman
+
+	Added section URL FORMAT in the duplicity man page.
+
[phone]  loafman
+
+	Make sure to strip extraneous single colon when dealing
+	with non-module URLs.  We provide the colon as needed.
+
[phone]  loafman
+
+	bug #21909: Problematic typo in compare_verbose() method
+	https://savannah.nongnu.org/bugs/index.php?21909
+
[phone]  loafman
+
+	patch #6357: Explicit restore action is missing from the command list,
+	https://savannah.nongnu.org/patch/?6357
+
[phone]  loafman
+
+	patch #6356: Command line option for the temporary directory root.
+	https://savannah.nongnu.org/patch/?6356
+
[phone]  loafman
+
+	Added regression tests for absolute, relative, and
+	module pathing in the rsync scheme.
+
[phone]  loafman
+
+	Fixed rsync URL description text in --help.
+
[phone]  loafman
+
+	Added 2nd patch to bug #21475 that forces all versions of
+	Python to use the fixed urlparse.py.
+	
+	Fixed issue with Pure-FTPd that would always return an empty
+	directory listing and thus force a full backup every time.
+	A side effect of the change is that we now only make one call
+	to ncftpls to get the listing, thereby reducing the overhead
+	on systems with a large number of backup files.
+	
+	bug #21896: Two problems with rsync under 0.4.8 + patch
+	https://savannah.nongnu.org/bugs/index.php?21896
+	
+	patch #6354: S3 staight typo results in a bogus exception
+	https://savannah.nongnu.org/patch/?6354
+
[phone]  loafman
+
+	Fixed so that remove-older-than and remove-all-but-n-full
+	will not request a GPG passphrase.
+
[phone]  loafman
+
+	Fixed regression caused by changeover to new urlparse.py.
+	bug #21475: FTP Usernames that contain '@' are not recognized
+	https://savannah.nongnu.org/bugs/index.php?21475
+
[phone]  loafman
+
+	Changes for 0.4.8.
+
[phone]  loafman
+
+	Format to one statement per line.
+
[phone]  loafman
+
+	Allow pexpect to force the close of the child on sftp
+	calls.  We already do that with scp calls.  This cleans
+	up that exception.
+
[phone]  loafman
+
+	patch #6344: S3 bad bad key key handling
+	http://savannah.nongnu.org/patch/?6344
+
[phone]  loafman
+
+	Replace set_password/phrase with set_environ and
+	clarify meaning in config.py.
+
[phone]  loafman
+
+	Complete description of install using --prefix=.
+
[phone]  loafman
+
+	Fix version of boto needed plus formatting.
+
[phone]  loafman
+
+	patch #6340: S3 short filename regression
+	https://savannah.nongnu.org/patch/?6340
+
[phone]  loafman
+
+	Make sure config.py not checked in.
+
[phone]  loafman
+
+	Initial release.
+
[phone]  loafman
+
+	This test requires a file that no longer exists.
+	Plus, it is unclear what this test is supposed
+	to accomplish.  Tar is tested by the other tests.
+
[phone]  loafman
+
+	First pass at getting tests up to date:
+	-- isolate config in 'config.py' (see config.py.tmpl)
+	-- silence noisy tests as much as possible
+	-- fix code on both sides as needed
+
[phone]  loafman
+
+	Initial release.
+
[phone]  loafman
+
+	Remove 2nd call to dup_time.settimestr() since it overrides
+	the time that may be set by --current-time (used for testing).
+
[phone]  loafman
+
+	Regen dup_time.curtimestr if time-separator changed.
+
[phone]  loafman
+
+	Fixed previous patch that assumed the presence
+	of the user and password in the rsync URL.
+
[phone]  loafman
+
+	Bring tests up to date.
+
[phone]  loafman
+
+	bug #21751: rsync module urls do not work in 0.4.7
+	https://savannah.nongnu.org/bugs/index.php?21751
+	
+	bug #21752: Boto backend needs version 0.9d or later
+	https://savannah.nongnu.org/bugs/index.php?21752
+
[phone]  loafman
+
+	Changes for version 0.4.7.
+
[phone]  loafman
+
+	Change to require Python 2.4 or later.
+
[phone]  loafman
+
+	Formatted list and added tempdir.py and urllib_2_5.py
+	to the released files list.
+
[phone]  loafman
+
+	Fix confusion over patches applied to different versions.
+	Patch #6300 should now be applied completely.
+	
+	Added back munge_password() so entire commandline could
+	be logged without the password showing.
+
[phone]  loafman
+
+	Hole imapbackend till next release.
+
[phone]  loafman
+
+	Hold till next release.
+
[phone]  loafman
+
+	patch #6300: Standard library replacement for ParsedUrl class
+	https://savannah.nongnu.org/patch/?6300
+	
+	I had to fix the ssh/scp scheme to remove the leading '/' in
+	parsed_url.path, otherwise it tried to treat the path as absolute.
+
[phone]  loafman
+
+	Backed out the following patch until bugs fixed...
+	patch #6300: Standard library replacement for ParsedUrl class
+	https://savannah.nongnu.org/patch/?6300
+
[phone]  loafman
+
+	patch #6301: log sftp commands at verbosity 5
+	https://savannah.nongnu.org/patch/?6301
+
[phone]  loafman
+
+	patch #6300: Standard library replacement for ParsedUrl class
+	https://savannah.nongnu.org/patch/?6300
+
[phone]  loafman
+
+	patch #6299: re-design tempfile handling
+	https://savannah.nongnu.org/patch/?6299
+
[phone]  loafman
+
+	Move import of imapbackend to the end of the
+	module.  Circular dependency.  Needs fixing.
+
[phone]  loafman
+
+	Undo regression of bug #21508 contained in
+	patch #6298: URI unquoting patch for FTP backend
+	https://savannah.nongnu.org/patch/?6298
+	
+	Some cosmetic cleanup.
+
[phone]  loafman
+
+	patch #6298: URI unquoting patch for FTP backend
+	https://savannah.nongnu.org/patch/?6298
+
[phone]  loafman
+
+	patch #6297: Add IMAP/s/gmail support
+	https://savannah.nongnu.org/patch/?6297
+	
+	Added 2nd patch for above.
+
[phone]  loafman
+
+	patch #6297: Add IMAP/s/gmail support
+	https://savannah.nongnu.org/patch/?6297
+
[phone]  loafman
+
+	patch #6292: Amazon S3 bucket creation deferral for Duplicity 0.4.6
+	https://savannah.nongnu.org/patch/?6292
+
[phone]  loafman
+
+	bug #21686: NcFTPGet 3.2.0 tempfile incompatibility
+	https://savannah.nongnu.org/bugs/index.php?21686
+
[phone]  loafman
+
+	Applied patch from Eric Hanchrow to fix logging error in
+	botoBackend, and fix delete() in rsyncBackend.
+	
+	bug #21686: NcFTPGet 3.2.0 tempfile incompatibility
+	https://savannah.nongnu.org/bugs/index.php?21686
+
[phone]  loafman
+
+	bug #21673: remove-all-but-n-full wrong arg usage
+	https://savannah.nongnu.org/bugs/index.php?21673
+	
+	patch #6293: [patch] left-over patching from
+	remove-all-but-n-full patch
+	https://savannah.nongnu.org/patch/?6293
+
[phone]  loafman
+
+	more Changes for 0.4.6.
+
[phone]  loafman
+
+	Changes for 0.4.6.
+
[phone]  loafman
+
+	Fixed coding problem where matched_sig_chain could be
+	referenced before it was defined.
+
[phone]  loafman
+
+	https://savannah.nongnu.org/patch/index.php?6291
+	patch #6291: Alternative WebDAV HTTPS patch
+
[phone]  loafman
+
+	https://savannah.nongnu.org/patch/index.php?6289
+	patch #6289: Amazon S3 key prefix patch for Duplicity 0.4.5
+
[phone]  loafman
+
+	https://savannah.nongnu.org/patch/?6284
+	patch #6285: security fix: eliminate use of mktemp()
+
[phone]  loafman
+
+	https://savannah.nongnu.org/bugs/index.php?21651
+	bug #21651, add https support for webdav.
+	
+	https://savannah.nongnu.org/patch/?6284
+	patch #6284: document TMPDIR and friends
+
[phone]  loafman
+
+	https://savannah.nongnu.org/bugs/index.php?21657
+	bug #21657: ncftpls fails to create dir in ver 0.4.5
+
[phone]  loafman
+
+	https://savannah.nongnu.org/bugs/index.php?21651
+	bug #21651, add https support for webdav.
+
[phone]  loafman
+
+	Try, the second.  See comments in the bug tracker.
+	https://savannah.nongnu.org/bugs/index.php?21646
+	bug #21646: --archive-dir causes delete of remote full
+	sigs and orphaned sig files
+
[phone]  loafman
+
+	https://savannah.nongnu.org/bugs/index.php?21651
+	bug #21651, add https support for webdav
+
[phone]  loafman
+
+	Fix release date in 0.4.5.
+
[phone]  loafman
+
+	Changes for 0.4.5.
+
[phone]  loafman
+
+	https://savannah.nongnu.org/bugs/index.php?21646
+	Fix to handling of collections when --archive-dir is used.
+	Prior to this, duplicity would write the full sig files to
+	both local and remote, then delete the remote.  Now, it does
+	not delete the remote full sigs.
+	
+	Applied the following patches from Peter Schuller
+	patch #6279, add command 'remove-all-but-n-full'
+	patch #6280, clarify --archive-dir option
+	patch #6281, --help should print to stdout, not stderr
+	patch #6282, collection-status: output in more consistent order
+
[phone]  loafman
+
+	Changes for version 0.4.4.
+
[phone]  loafman
+
+	Applied a patch from Gregory Hartman to correct handling of DST
+	in time calculations.  This affects backups made the night of
+	a DST time switch.
+
[phone]  loafman
+
+	Cosmetic - Use True and False, not 1 and None.
+
[phone]  loafman
+
+	Fix version checking code in ftpBackend.
+
[phone]  loafman
+
+	Changes to commandline processing to allow non-ambiguous short
+	strings for commands, i.e. 'i', 'inc', 'incr' for 'incremental',
+	'f' for 'full', etc..  A warning message is printed if the short
+	command is not unique.
+
[phone]  loafman
+
+	Changes to ftpBackend to use the login config file rather than
+	putting the username and password on the command line.  This
+	requires the use of NcFTP 3.1.9 or later.
+	
+	Thanks to a patch from Greg Hewgill the Amazon S3 backend now
+	uses --num-retries to retry IO repeatedly if needed.
+
[phone]  loafman
+
+	Changes for 0.4.4.RC4 try 2
+
[phone]  loafman
+
+	Changes for 0.4.4.RC4
+
[phone]  loafman
+
+	Replace with Version 3 GPL text.
+
[phone]  loafman
+
+	Fixed issue in --time-separator where the current time string
+	was being set prior to setting the separator, causing errors
+	when trying to set the --time-separator for Windows systems.
+
[phone]  loafman
+
+	There is a new command line syntax to separate actions and
+	options.  Refer to the new man page for full details.
+
[phone]  loafman
+
+	Correct calling sequence in calls to get_signature_chains().
+
[phone]  loafman
+
+	Fix so that ftpBackend.delete() does not print file list.
+
[phone]  loafman
+
+	Fix so that file mtime is always compared in full seconds.
+
[phone]  loafman
+
+	Changes for 0.4.4.RC3 -- Corrected.
+
[phone]  loafman
+
+	Changes for 0.4.4.RC3.
+
[phone]  loafman
+
+	Add 'patch' dir to ignore list.
+
[phone]  loafman
+
+	Patch from Olivier Croquette to add :port option in FTP.
+
[phone]  loafman
+
+	Patch from Olivier Croquette to add --full-if-older-than=<time>
+	option to force a full backup at <time> rather than incremental.
+
[phone]  loafman
+
+	Patch from Olivier Croquette to add :port option in FTP.
+	
+	Patch from Mitchell Garnaat to get all keys from S3, rather
+	than just the first 1000.
+	
+	Fix to sshBackend to version check for python-pexpect 2.1.
+	
+	Fix one case in ftpBackend where host string was used instead of
+	url_string.  This only affected the creation of the target dir on
+	the remote system, if it did not exist, and only if the user or
+	port needed to be specified.
+
[phone]  loafman
+
+	Changes for 0.4.4.RC2.
+
[phone]  loafman
+
+	Added --timeout <seconds> (default 30) to allow users to change
+	duplicity's network timeout settings.
+	
+	Added --time-separator <char> to allow users to change the time
+	separator from ':' to another character that will work on their
+	system.  HINT: For Windows SMB shares, use --time-separator='_'.
+	NOTE: '-' is not valid as it conflicts with date separator.
+	
+	Changed usage message to separate options and commands.
+
[phone]  loafman
+
+	Add patch from Olivier Croquette to allow user@domain usernames,
+	making ftp://user@[e-mail]/path a valid URL.
+	
+	Added a bit of debug print to sshBackend for --verbosity=9.
+
[phone]  loafman
+
+	Add patch from Alexander Zangerl to suppress the GPG passphrase
+	prompt when a passphrase is not needed.
+	- full and pubkey enc:  doesn't depend on old encrypted info
+	- inc and pubkey enc and archive-dir: need manifest and sigs,
+	which the archive dir contains unencrypted
+	- with encryption disabled
+	- listing files:  needs manifest, but the archive dir has that
+	- collection status:  only looks at a repository
+
[phone]  loafman
+
+	Changes for 0.4.4.RC1.
+
[phone]  loafman
+
+	https://savannah.nongnu.org/patch/index.php?6205
+	Add option --librsync-dir for when its not found.
+
[phone]  loafman
+
+	Bug #21123: duplicity 0.4.3 does not find any backup chains
+	https://savannah.nongnu.org/bugs/?21123
+
[phone]  loafman
+
+	Make tempfiles with useful names.
+
[phone]  loafman
+
+	Fixes manual page and usage msg for rsync url and --remove-older-than.
+
[phone]  loafman
+
+	Fix for Debian bug #228388: old/aborted/offending sig files
+	prohibit any further action.
+
[phone]  loafman
+
+	Fixes manual page and usage msg for rsync url and --remove-older-than.
+
[phone]  loafman
+
+	Do not ask for passphrase when none is needed.
+
[phone]  loafman
+
+	Final patch for Peter Schuller's fix to max read size.
+	The first one was broken (revision previous to this).
+
[phone]  loafman
+
+	Add patch submitted by Peter Schuller which removes the
+	default SSH options that ignored known hosts files and
+	disabled strict host checking.  This patch also handles
+	the authentication failures from these issues.
+
[phone]  loafman
+
+	Fixed so that max read size is 64k, not the
+	volume size which can be quite large.
+
[phone]  loafman
+
+	Fix release date.
+
[phone]  loafman
+
+	Changes for 0.4.3 release.
+
[phone]  loafman
+
+	Removed use of tempfile.TemporaryFile().  This fixes the
+	restore problem on Windows that was due to Python bug
+	1776696 reported on Sourceforge.
+
[phone]  loafman
+
+	Removed hardwired options to use bzip2 compression.
+	
+	Added gpg-options to allow users to add options to
+	the gpg process.
+
[phone]  loafman
+
+	Changed ssh-command to ssh-options to allow users
+	to add options to the scp and sftp commmands.
+	
+	Added gpg-options to allow users to add options to
+	the gpg process.
+
[phone]  loafman
+
+	Move get_password() to Backend class to standardize.
+	
+	Fix problem with ftpBackend to create target directory if needed.
+
[phone]  loafman
+
+	Upgrade to GPL version 3 license.
+
[phone]  loafman
+
+	Do not pass :port part of URL to scp backend.
+	Its taken as the target file and errors out.
+
[phone]  loafman
+
+	Change ssh_command option to be ssh_options.  This adds
+	options to the scp and sftp commands that are used by
+	the ssh backend.
+
[phone]  loafman
+
+	Fixed bug 20764 - unable to use port in ssh backend.
+	https://savannah.nongnu.org/bugs/?20764
+	
+	Change ssh backend to send 'quit' instead of EOF when
+	using sftp.  This allows it to run under cron as long
+	as the password is supplied non-interactively.
+
[phone]  loafman
+
+	Changes for 0.4.3.RC12
+
[phone]  loafman
+
+	Changes for 0.4.3.RC12
+
[phone]  loafman
+
+	Changed the file:, ftp:, and ssh: backends so that
+	the target directory will be created at start.
+	
+	Changed the ftp: backend so that empty target dirs
+	do not error out.
+
[phone]  loafman
+
+	Clean up help list formatting.
+
[phone]  loafman
+
+	Fix index out of range in Bug 20730, triggered when there
+	is only one incremental and no previous in list.
+	https://savannah.nongnu.org/bugs/?20730
+
[phone]  loafman
+
+	- Print warning if pexpect version is less than 2.1.
+	- Fix author and maintainer settings.
+
[phone]  loafman
+
+	Fix environment var name for ssh backend.
+
[phone]  loafman
+
+	Changes for 0.4.3.RC11.
+
[phone]  loafman
+
+	Add --ssh-askpass option.
+
[phone]  loafman
+
+	Duplicity now correctly processes scp URL's of the form:
+	scp://user@host[:port]/
+	where the directory spec is empty.  This fixes a bug where the
+	user could not write into the home directory on the target.
+	
+	The SSH/SCP backend has had an overhaul.  It now requires the
+	python-pexpect module.  Normally this can be obtained from your
+	distro's repository, but if you want, you can download pexpect
+	from http://pexpect.sourceforge.net.
+	
+	The SSH/SCP backend work was done to allow the user to use password
+	authentication rather than public-key.  You may now enter a password,
+	either through the FTP_PASSWORD environment variable, or at the
+	console.  To activate this feature you will need to use the option
+	--ssh-askpass on the command line.  The default is public-key, which
+	does *not* look for a password from either source.
+
[phone]  loafman
+
+	patch #6094, Boto Backend Fixes for RC10
+
[phone]  loafman
+
+	Changes for 0.4.3.RC10
+
[phone]  loafman
+
+	Add support for:
+	--ftp-passive,
+	--ftp-regular,
+	--num-retries
+	
+	Removed -m option on FTP put command.  This means that
+	the remote directory must exist prior to backup.
+	
+	Changed ftpBackend from -f option back to commandline.
+	Various versions of ncftp* interact differently when
+	both -f and commandline options are supplied.
+	
+	The FTP password is munged in all log operations.
+	
+	Added logging of filenames in the bucket when -v9 is
+	used on Amazon S3.
+
[phone]  loafman
+
+	Add support for:
+	--ftp-passive,
+	--ftp-regular,
+	--num-retries
+
[phone]  loafman
+
+	Add descriptions for:
+	--ftp-passive,
+	--ftp-regular,
+	--num-retries
+
[phone]  loafman
+
+	Replace missing comma in argument list.
+
[phone]  loafman
+
+	Changes for 0.4.3.RC9.
+	Drop ftplib.py.
+
[phone]  loafman
+
+	No longer needed.
+
[phone]  loafman
+
+	Changes for 0.4.3.RC9.
+
[phone]  loafman
+
+	Added a commandline option, '--num-retries=<int>', to set the number
+	of retries.  The default is 5.
+
[phone]  loafman
+
+	New S3 backend, Boto, from Eric Evans, replaces bitBucket.  Boto can
+	be obtained from http://code.google.com/p/boto/.  I did not make this
+	a requirement for setup since its not in the normal repositories.
+	
+	New FTP backend from Thorsten Schnebeck that uses ncftp instead of
+	Pythons ftplib.  This seems to be much more solid.  I added the -f
+	option with a secure temp file to contain host, user, and password,
+	rather than having them on the command line.  I also added the -m
+	option to the put command to create the target directory and the -t
+	option to make sure it times out if there is a network problem.
+	
+	The Backend class now contains a popen_persist function that acts like
+	run_command_persist.  Both use the new num_retries global.
+
[phone]  loafman
+
+	Change to a max block size of 2048 bytes for
+	rsync difference buffer.  This may slow things
+	down for truly large files, but will give much
+	smaller deltas on files with numerous small
+	changes, such as database files.
+
[phone]  loafman
+
+	Initial release.
+
[phone]  loafman
+
+	Changes for 0.4.3.RC8
+
[phone]  loafman
+
+	Bug 20039 - Andreas Schildbach: --and--
+	Patch 6030 - Alexander Zangerl <[e-mail]>:
+	Duplicity now uses bzip2 for compression.  This matches the way
+	the Debian distribution handles it.  I'll think about adding an
+	option to override later, if its needed.
+
[phone]  loafman
+
+	Bug 20282 - Thomas Tuttle:
+	An out of range index when checking past history in the backup
+	sets caused a failure when trying to access later.
+	
+	Bug 20149 - dAniel hAhler:
+	dAniel submitted a second patch for this for further cleanup.
+	The new patch prefers the latest intact backup set.
+
[phone]  loafman
+
+	Changes for 0.4.3.RC7
+
[phone]  loafman
+
+	Patch 6029 - Alexander Zangerl <[e-mail]>:
+	http://bugs.debian.org/370206
+	archive-dir together with incremental backup results in crash. the
+	patch is simple, the code in 0.4.2 did attempt to access strings as
+	objects.
+
[phone]  loafman
+
+	Patch 6033 - Alexander Zangerl <[e-mail]>:
+	let's add a --help terse usage message and don't just direct the user
+	to the manual. this should come handy if somebody needs to restore
+	stuff without having the manual available.
+
[phone]  loafman
+
+	Patch 6032 - Alexander Zangerl <[e-mail]>:
+	a new feature patch: i've recently gotten annoyed with having gazillions of
+	5mb files and therefore added a --volsize option to allow the user setting
+	the chunk size. the patch is simple and contains a manpage update as well.
+
[phone]  loafman
+
+	Add -u (unbuffered) to shebang line.
+
[phone]  loafman
+
+	Add stderr.flush() in FatalError().
+
[phone]  loafman
+
+	Bug 20179 - dAniel hAhler: When errors cause login to fail in FTP,
+	reset and try again.
+
[phone]  loafman
+
+	Not needed.
+
[phone]  loafman
+
+	Cosmetic change to force new log.  The log for revision 1.28
+	is not correct.  It should read as follows:
+	
+	Patch 5993 - [e-mail]: Make Amazon S3 backend
+	incrementally more robust for recovery.
+
[phone]  loafman
+
+	Changes for 0.4.3.RC6.
+
[phone]  loafman
+
+	Patch 5998 - Kuang-che Wu: Cache uid and gid lookup to speed
+	operations.
+
[phone]  loafman
+
+	Bug 20419 - dAniel hAhler: When errors cause an incomplete backup set,
+	flag the error with a message, rather than erroring out.  The user
+	then knows to run --cleanup.
+
[phone]  loafman
+
+	Changes for 0.4.3.RC5.
+
[phone]  loafman
+
+	dAniel hAhler submitted a patch to change "Error initializing file
+	foo" (log level 2), where foo was a socket, to "Skipping socket foo"
+	(log level 7).  https://savannah.nongnu.org/patch/?5985
+
[phone]  loafman
+
+	Change logging to flush after every write, unbuffering stdout and
+	stderr, thus producing logs that are coherent.
+
[phone]  loafman
+
+	GnuPG fails when trying to access stdin on an empty passphrase.
+	Changes allow empty passphrase on public-key encryption and now
+	respond gracefully on empty passphrase for symmetric encryption.
+
[phone]  loafman
+
+	Changes for 0.4.3.RC4.
+
[phone]  loafman
+
+	Move catch of NLST errors back to self.error_retry()
+
[phone]  loafman
+
+	More FTP fixes:
+	- clean up error handling
+	- change initial error delay to zero
+	- move catch of NLST errors to self.list()
+
[phone]  loafman
+
+	Changes to release 0.4.3.RC3.
+
[phone]  loafman
+
+	- Fix so that FTP connection/login is closed and
+	reopened when errors 221 or 421 are reported.
+	
+	- Fix grammer in error message.
+
[phone]  loafman
+
+	Changes to release 0.4.3.RC2.
+
[phone]  loafman
+
+	Remove GnuPGInterface.py
+
[phone]  loafman
+
+	Apply patch for bug 19998, ValueError exception.
+
[phone]  loafman
+
+	Added change notices for FTP password and rsync backend.
+
[phone]  loafman
+
+	Fix request password in ftpBackend if environ not set.
+
[phone]  loafman
+
+	- allow connection after 226 in NLST (ProFTPD)
+	- request password in ftpBackend if environ not set
+	- rsyncBackend was using the full URL, now uses server:path
+
[phone]  loafman
+
+	Document changes for 0.4.3.
+
[phone]  loafman
+
+	Do not set FTP to active mode at start of session.
+
[phone]  loafman
+
+	1) WebDAV needs a Depth: 1 header otherwise infinite depth
+	is assumed and may be restricted due to load.
+	
+	2) Used the allprop XML command to get back properties that
+	included the filenames.  Refer to RFC 2518.
+
[phone]  loafman
+
+	Fixes bug:
+	https://savannah.nongnu.org/bugs/?19940
+
[phone]  loafman
+
+	Applied patches:
+	https://savannah.nongnu.org/patch/?5680
+	https://savannah.nongnu.org/patch/?5681
+
[phone]  loafman
+
+	Added patches:
+	https://savannah.nongnu.org/patch/?4486
+	https://savannah.nongnu.org/patch/?5183
+	https://savannah.nongnu.org/patch/?5185
+	https://savannah.nongnu.org/patch/?5412
+	https://savannah.nongnu.org/patch/?5413
+	https://savannah.nongnu.org/patch/?5680
+	https://savannah.nongnu.org/patch/?5681
+	https://savannah.nongnu.org/patch/?5682
+	https://savannah.nongnu.org/patch/?5794
+	https://savannah.nongnu.org/patch/?5830
+	
+	Fixed bugs:
+	https://savannah.nongnu.org/bugs/?2441
+	https://savannah.nongnu.org/bugs/?16711
+	
+	Miscellaneous cosmetic fixes (spelling and spacing).
+
[phone]  jinty
+
+	BitBucketBackend:
+	* if something goes wrong and we need to re-connect, dump the exception
+	on stderr. Be very noisy so that whatever is wrong will be fixed.
+
[phone]  bescoto
+
+	Typo fix for error message
+
[phone]  jinty
+
+	Fix a bug in the bitbucket backend:
+	We need to get a new bits from the new bucket if we re-connect.
+
[phone]  jinty
+
+	Changes to the bitbucket backend:
+	* Update to work with bitbucket 0.3b.
+	* Add some docimentation.
+	* Implement a suggestion by Ben Escoto to move the access and secret keys to
+	environment variables.
+	* Implement a very simplistic error correction mechanisim that will re-connect
+	on an operation failure and re-try the operation. Note that this is just a
+	band-aid for issues that should be resolved at lower levels.
+
[phone]  bescoto
+
+	Removed time_separator entry from changelog when I backed out patch
+
[phone]  bescoto
+
+	Went back to old time_separator, because I realized new way wouldn't
+	handle some cases, and could break backwards compatibility
+
[phone]  bescoto
+
+	Andre Beckedorf's patches for ftp and rsync backends, and time_separator
+
[phone]  bescoto
+
+	Checked in Brian Sutherland's Amazon S3 code
+
[phone]  bescoto
+
+	Added --sftp-command to changelog
+
[phone]  bescoto
+
+	Added --sftp-command option and man page documentation
+
[phone]  bescoto
+
+	Fixed Jiri's name.  Sorry about that :-)
+
[phone]  bescoto
+
+	final changes for version 0.4.2
+
[phone]  bescoto
+
+	Fixes to the scp backend
+
[phone]  bescoto
+
+	Stop --remove-older-than from deleting current chain
+
[phone]  bescoto
+
+	Catch ftp error 450 when listing directory
+
[phone]  bescoto
+
+	cleaned up and documented --collection-status
+
[phone]  bescoto
+
+	asdf's tarfile large uid/gid patch
+
[phone]  bescoto
+
+	Jiri Tyr's scp/sftp patch
+
[phone]  bescoto
+
+	Eric Hanchrow's remove signature patch
+
[phone]  bescoto
+
+	A few minor updates so test pass on my system again
+
[phone]  bescoto
+
+	MDR patch allows signing with different key
+
[phone]  bescoto
+
+	Added note about passphrase confirmation
+
[phone]  bescoto
+
+	When collecting password from user, make type it twice to confirm
+
[phone]  bescoto
+
+	Final changes for 0.4.1
+
[phone]  bescoto
+
+	Updating rpm for Fedora
+
[phone]  bescoto
+
+	Trying to remove...
+
[phone]  bescoto
+
+	Small changes for 0.4.1 and python 2.3
+
[phone]  bescoto
+
+	variable block size, librsync 0.9.6
+
[phone]  bescoto
+
+	Remove large file note now that block size chosen based on file size
+
[phone]  bescoto
+
+	Ported some code from rdiff-backup:  choose sig block based on file
+	length, and work with librsync 0.9.6.
+
[phone]  bescoto
+
+	Mention problem with /proc
+
[phone]  bescoto
+
+	Cache pwd and group files
+
[phone]  bescoto
+
+	Added --version switch, small change to man page
+
[phone]  bescoto
+
+	Sebastian Wilhelmi's update for rsync backend
+
[phone]  bescoto
+
+	Applied Stephen Isard's patch for --exclude-globbing-filelist
+
[phone]  bescoto
+
+	Added mention of rsync backend.
+
[phone]  bescoto
+
+	added rsync contributed by Sebastian Wilhelmi
+
[phone]  bescoto
+
+	Added test and fix for long symlink to long file bug
+
[phone]  bescoto
+
+	Raise error (instead of exiting silently) if no files found to restore
+
[phone]  bescoto
+
+	Added long filenames test
+
[phone]  bescoto
+
+	Added man page info on --short-filenames option
+
[phone]  bescoto
+
+	(version of) Helmut Schneider's patch to display mtimes with list files
+
[phone]  bescoto
+
+	Added --no-encryption option, fixed crash on inc when no changed files
+
[phone]  bescoto
+
+	Added --verify option, tweaked some verbosity levels
+
[phone]  bescoto
+
+	Added compare_verbose and test to path module
+
[phone]  bescoto
+
+	Changed restore procedure.  Now all sets integrated simultaneously.
+
[phone]  bescoto
+
+	Fixed typo in get_ropath
+
[phone]  bescoto
+
+	Added a few options for only doing upload/move/checkin/etc
+
[phone]  bescoto
+
+	Changed way difftars are split between volumes to waste less space
+
[phone]  bescoto
+
+	Slight tweak to base36 code
+
[phone]  bescoto
+
+	Added extra tests for base36 conversion
+
[phone]  bescoto
+
+	Shorted short filenames (use base36)
+
[phone]  bescoto
+
+	Swallow GPG logging output if verbosity 3 or less
+
[phone]  bescoto
+
+	Added --remove-older-than option, changed --current-time behavior
+
[phone]  bescoto
+
+	Added --cleanup option
+
[phone]  bescoto
+
+	Added --force option.
+
[phone]  bescoto
+
+	Added code for finding extraneous and old files
+
[phone]  bescoto
+
+	For ssh, deleted in groups of 10 so command line doesn't overflow
+
[phone]  bescoto
+
+	Fixed a few minor collections bugs, added get_extraneous
+
[phone]  bescoto
+
+	Added note on one pass restores/verifies
+
[phone]  bescoto
+
+	Added --restore-time bug fix note
+
[phone]  bescoto
+
+	Better fix for same (current_time) bug
+
[phone]  bescoto
+
+	Fixed minor bug erasing output dir too early
+
[phone]  bescoto
+
+	Restores now default to current time if restore time not specified
+
[phone]  bescoto
+
+	Added undocumended --collection-status option for testing purposes
+
[phone]  bescoto
+
+	More misc updates for 0.3.0
+
[phone]  bescoto
+
+	Few last minute tweaks to prepare for 0.3.0 release
+
[phone]  bescoto
+
+	Added --ssh-command and --scp-command options
+
[phone]  bescoto
+
+	Fixed time-must-be-int bug with --short-filenames, added test
+
[phone]  bescoto
+
+	Various bugfixes so ftp backend passes final test
+
[phone]  bescoto
+
+	Added --short-filenames option
+
[phone]  bescoto
+
+	Added ftp backend support
+
[phone]  bescoto
+
+	Added man page entry for --file-to-restore option
+
[phone]  bescoto
+
+	Added statistics reporting after successful backup
+
[phone]  bescoto
+
+	Added --list-current-files option
+
[phone]  bescoto
+
+	Make CVS more friendly; don't depend on src symlink
+
[phone]  bescoto
+
+	Updated documentation on new globbing options
+
[phone]  bescoto
+
+	Fixed bug & added test when root was reg file, not dir
+
[phone]  bescoto
+
+	Added --include/exclude-globbing-filelist options
+
[phone]  bescoto
+
+	Fixed tar '..' security bug
+
[phone]  bescoto
+
+	Added 2 test cases: neg mtimes, missing u/gnames
+	
+	Now check to make sure these files aren't spuriously marked as
+	changed.
+
[phone]  bescoto
+
+	Fixed dumb st_time/st_mtime typo
+
[phone]  bescoto
+
+	Updated with new web page/mailing list information.
+
[phone]  bescoto
+
+	Added full GPL statement in source files at request of Jaime Villate
+	of the Savannah site.  Also updated address of FSF.
+
[phone]  bescoto
+
+	Initial checkin
+>>>>>>> MERGE-SOURCE
 

=== modified file 'debian/changelog'
--- debian/changelog	2010-03-14 18:42:41 +0000
+++ debian/changelog	2011-05-30 02:01:03 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 duplicity (0.6.08b-0ubuntu2) lucid; urgency=low
 
   * debian/patches/01pexpect.dpatch: Whoops, fix this up to apply to latest
@@ -96,6 +97,79 @@
 
  -- Andreas Moog <[e-mail]>  Wed, 29 Apr 2009 14:02:39 +0200
 
+=======
+duplicity (0.6.06-2ubuntu1) lucid; urgency=low
+
+  * Merge from debian unstable, remaining changes: (LP: #428206)
+    - 02gnupginterface.dpatch: Use system's python-gnupginterface
+
+ -- Michael Terry <[e-mail]>  Fri, 08 Jan 2010 22:06:29 -0500
+
+duplicity (0.6.06-2) unstable; urgency=high
+
+  * fixed ssh backend failure (tried to import local pexpect module)
+    (closes: #556095)
+
+ -- Alexander Zangerl <[e-mail]>  Mon, 16 Nov 2009 04:48:45 +1000
+
+duplicity (0.6.06-1) unstable; urgency=low
+
+  * New upstream release (closes: #539903, #420858)
+  * does no longer depend on python-gnupginterface: upstream
+    provides a modified version which is claimed to be incompatible
+  * does not install a local version of python-pexpect 
+    anymore (closes: #555359)
+    
+ -- Alexander Zangerl <[e-mail]>  Fri, 13 Nov 2009 07:30:49 +1000
+
+duplicity (0.6.05-2) unstable; urgency=low
+
+  * adjusted rules to cater for future python2.6 install
+    setup (closes: #547825)
+
+ -- Alexander Zangerl <[e-mail]>  Fri, 25 Sep 2009 11:05:38 +1000
+
+duplicity (0.6.05-1) unstable; urgency=low
+
+  * New upstream release
+  * lifted standards version
+
+ -- Alexander Zangerl <[e-mail]>  Sun, 20 Sep 2009 10:46:40 +1000
+
+duplicity (0.6.04-1) unstable; urgency=low
+
+  * New upstream release (closes: #536361, #537260, #42858, 
+    #399371, #388180, #386749 )
+  * new project homepage
+  * added notes regarding changed archive-dir behaviour
+
+ -- Alexander Zangerl <[e-mail]>  Wed, 12 Aug 2009 12:34:01 +1000
+ 
+duplicity (0.5.18-0ubuntu1) karmic; urgency=low
+
+  * New upstream release (LP: #390666)
+  * Fixes LP: #368062 and LP: #379648
+
+ -- Michael Terry <[e-mail]>  Mon, 22 Jun 2009 09:28:19 -0400
+
+duplicity (0.5.16-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes: (LP: #369224)
+    - debian/rules:
+      + add --install-layout=deb to setup.py
+      + s/site-packages/*-packages/
+      + don't use package provided GnuPGInterface
+        - debian uses it because of debian bug #509415, which is fixed in
+          ubuntu. (See bug 333057 on LP)
+    - debian/patches
+      + add 01_use_python_gnupginterface.dpatch
+        - use GnuPGInterface provided by python-gnupginterface
+  * Fixes at least:
+    - use of ssh with given portnumber (LP: #259076)
+
+ -- Andreas Moog <[e-mail]>  Wed, 29 Apr 2009 14:02:39 +0200
+
+>>>>>>> MERGE-SOURCE
 duplicity (0.5.16-1) unstable; urgency=low
 
   * New upstream release (closes: #524786)

=== modified file 'debian/patches/01pexpect.dpatch' (properties changed: -x to +x)
--- debian/patches/01pexpect.dpatch	2010-03-14 18:42:41 +0000
+++ debian/patches/01pexpect.dpatch	2011-05-30 02:01:03 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 #! /bin/sh /usr/share/dpatch/dpatch-run
 ## 01pexpect.dpatch by  <[e-mail]>
 ##
@@ -17,3 +18,24 @@
  from duplicity.errors import * #@UnusedWildImport
  
  class SSHBackend(duplicity.backend.Backend):
+=======
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 01pexpect.dpatch by  <[e-mail]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: import global pexpect module, not a local one (#556095)
+
+@DPATCH@
+diff -urNad duplicity-0.6.06~/src/backends/sshbackend.py duplicity-0.6.06/src/backends/sshbackend.py
+--- duplicity-0.6.06~/src/backends/sshbackend.py	2009-10-30 06:51:44.000000000 +1000
++++ duplicity-0.6.06/src/backends/sshbackend.py	2009-11-16 04:46:37.259920543 +1000
+@@ -31,7 +31,7 @@
+ import duplicity.backend
+ from duplicity import globals
+ from duplicity import log
+-from duplicity import pexpect
++import pexpect
+ from duplicity.errors import *
+ 
+ class SSHBackend(duplicity.backend.Backend):
+>>>>>>> MERGE-SOURCE

=== modified file 'debian/patches/02gnupginterface.dpatch' (properties changed: -x to +x)
=== modified file 'duplicity'
--- duplicity	2010-03-13 21:53:21 +0000
+++ duplicity	2011-05-30 02:01:03 +0000
@@ -2,7 +2,11 @@
 # -*- Mode:Python; indent-tabs-mode:nil; tab-width:4 -*-
 #
 # duplicity -- Encrypted bandwidth efficient backup
+<<<<<<< TREE
 # Version 0.6.08b released March 11, 2010
+=======
+# Version 0.6.06 released October 29, 2009
+>>>>>>> MERGE-SOURCE
 #
 # Copyright 2002 Ben Escoto <[e-mail]>
 # Copyright 2007 Kenneth Loafman <[e-mail]>
@@ -1020,6 +1024,7 @@
                              "Use 'ulimit -n 1024' or higher to correct.\n") % (maxopen,),
                              log.ErrorCode.maxopen_too_low)
 
+<<<<<<< TREE
 def log_startup_parms(verbosity=log.INFO):
     """
     log Python, duplicity, and system versions
@@ -1089,11 +1094,83 @@
         self.last_index = vi.end_index
         self.last_block = vi.end_block
 
+=======
+def log_startup_parms(verbosity=log.INFO):
+    """
+    log Python, duplicity, and system versions
+    """
+    log.Log('=' * 80, verbosity)
+    log.Log("duplicity 0.6.06 (October 29, 2009)", verbosity)
+    log.Log("Args: %s" % (' '.join(sys.argv),), verbosity)
+    log.Log(' '.join(platform.uname()), verbosity)
+    log.Log("%s %s" % (sys.executable or sys.platform, sys.version), verbosity)
+    log.Log('=' * 80, verbosity)
+
+
+class Restart:
+    """
+    Class to aid in restart of inc or full backup.
+    Instance in globals.restart if restart in progress.
+    """
+    def __init__(self, last_backup):
+        self.type = None
+        self.start_time = None
+        self.end_time = None
+        self.start_vol = None
+        self.last_index = None
+        self.last_block = None
+        self.last_backup = last_backup
+        self.setParms(last_backup)
+
+    def setParms(self, last_backup):
+        if last_backup.time:
+            self.type = "full"
+            self.time = last_backup.time
+        else:
+            self.type = "inc"
+            self.end_time = last_backup.end_time
+            self.start_time = last_backup.start_time
+        self.start_vol = len(last_backup)
+
+    def checkManifest(self, mf):
+        mf_len = len(mf.volume_info_dict)
+        if (mf_len != self.start_vol) or not (mf_len and self.start_vol):
+            if self.start_vol == 0:
+                # upload of 1st vol failed, clean and restart
+                log.Notice(_("RESTART: The first volume failed to upload before termination.\n"
+                             "         Restart is impossible...starting backup from beginning."))
+                self.last_backup.delete()
+                os.execve(sys.argv[0], sys.argv[1:], os.environ)
+            elif mf_len - self.start_vol > 0:
+                # upload of N vols failed, fix manifest and restart
+                log.Notice(_("RESTART: Volumes %d to %d failed to upload before termination.\n"
+                             "         Restarting backup at volume %d.") %
+                             (self.start_vol + 1, mf_len, self.start_vol + 1))
+                for vol in range(self.start_vol + 1, mf_len + 1):
+                    mf.del_volume_info(vol)
+                self.setLastSaved(mf)
+            else:
+                # this is an 'impossible' state, remove last partial and restart
+                log.Notice(_("RESTART: Impossible backup state: manifest has %d vols, remote has %d vols.\n"
+                             "         Restart is impossible ... duplicity will clean off the last partial\n"
+                             "         backup then restart the backup from the beginning.") %
+                             (mf_len, self.start_vol))
+                self.last_backup.delete()
+                os.execve(sys.argv[0], sys.argv[1:], os.environ)
+
+
+    def setLastSaved(self, mf):
+        vi = mf.volume_info_dict[self.start_vol]
+        self.last_index = vi.end_index
+        self.last_block = vi.end_block
+
+>>>>>>> MERGE-SOURCE
 
 def main():
     """
     Start/end here
     """
+<<<<<<< TREE
     # The following is for starting remote debugging in Eclipse with Pydev Extensions.
     # Adjust the path to your location and version of Eclipse and Pydev.  Comment out
     # to run normally, or this process will hang at pydevd.settrace() waiting for the
@@ -1112,11 +1189,32 @@
         os.setgid(os.getegid())
 
     # set the current time strings (make it available for command line processing)
+=======
+    # The following is for starting remote debugging in Eclipse with Pydev Extensions.
+    # Adjust the path to your location and version of Eclipse and Pydev.  Comment out
+    # to run normally, or this process will hang at pydevd.settrace() waiting for the
+    # remote debugger to start.
+#    pysrc = "/home/ken/eclipse3.4/plugins/org.python.pydev.debug_1.5.0.1251989166/pysrc/"
+#    if os.path.isdir(pysrc):
+#        sys.path.append(pysrc)
+#        import pydevd
+#        pydevd.settrace()
+
+    # if python is run setuid, it's only partway set,
+    # so make sure to run with euid/egid of root
+    if os.geteuid() == 0:
+        # make sure uid/gid match euid/egid
+        os.setuid(os.geteuid())
+        os.setgid(os.getegid())
+
+    # set the current time strings
+>>>>>>> MERGE-SOURCE
     dup_time.setcurtime()
 
     # determine what action we're performing and process command line
     action = commandline.ProcessCommandLine(sys.argv[1:])
 
+<<<<<<< TREE
     # set the current time strings again now that we have time separator
     dup_time.setcurtime()
 
@@ -1127,6 +1225,15 @@
     log_startup_parms(log.INFO)
 
     # check for disk space and available file handles
+=======
+    # get the passphrase if we need to based on action/options
+    globals.gpg_profile.passphrase = get_passphrase(1, action)
+
+    # log some debugging status info
+    log_startup_parms(log.INFO)
+
+    # check for disk space and available file handles
+>>>>>>> MERGE-SOURCE
     check_resources(action)
 
     # check archive synch with remote, fix if needed

=== modified file 'duplicity.1'
--- duplicity.1	2010-03-13 21:53:21 +0000
+++ duplicity.1	2011-05-30 02:01:03 +0000
@@ -1,4 +1,8 @@
+<<<<<<< TREE
 .TH DUPLICITY 1 "March 11, 2010" "Version 0.6.08b" "User Manuals" \"  -*- nroff -*-
+=======
+.TH DUPLICITY 1 "October 29, 2009" "Version 0.6.06" "User Manuals" \"  -*- nroff -*-
+>>>>>>> MERGE-SOURCE
 
 .SH NAME
 duplicity \- Encrypted backup using rsync algorithm
@@ -214,6 +218,7 @@
 
 .TP
 .BI "--archive-dir " path
+<<<<<<< TREE
 The archive directory.
 .B NOTE:
 This option changed in 0.6.0.  The archive directory is now necessary
@@ -261,6 +266,55 @@
 --archive-dir=/arch, --name=foo
  /arch/foo
 .RE
+=======
+The archive directory.
+.B NOTE:
+This option changed in 0.6.0.  The archive directory is now necessary
+in order to manage persistence for current and future enhancements.
+As such, this option is now used only to change the location of the
+archive directory.  The archive directory should
+.B not
+be deleted, or duplicity will have to recreate it from
+the remote repository (which may require decrypting the backup contents).
+
+When backing up or restoring, this option specifies that the local
+archive directory is to be created in
+.IR path .
+If the archive directory is not specified, the default will be to
+create the archive directory in
+.IR ~/.cache/duplicity/ .
+
+The archive directory can be shared between backups to multiple targets,
+because a subdirectory of the archive dir is used for individual backups (see 
+.B --name
+).
+
+The combination of archive directory and backup name must be unique 
+in order to separate the data of different backups.
+
+The interaction between the 
+.B --archive-dir 
+and the 
+.B --name 
+options allows for four possible combinations for the location of the archive dir:
+
+.RS
+.IP 1.
+neither specified (default)
+ ~/.cache/duplicity/\c
+.IR hash-of-url
+.IP 2.
+--archive-dir=/arch, no --name
+ /arch/\c
+.IR hash-of-url
+.IP 3.
+no --archive-dir, --name=foo
+ ~/.cache/duplicity/foo
+.IP 4.
+--archive-dir=/arch, --name=foo
+ /arch/foo
+.RE
+>>>>>>> MERGE-SOURCE
 
 .TP
 .BI "--asynchronous-upload "

=== modified file 'po/bg/bg.po'
--- po/bg/bg.po	2010-03-15 20:52:56 +0000
+++ po/bg/bg.po	2011-05-30 02:01:03 +0000
@@ -1,3 +1,4 @@
+<<<<<<< TREE
 # Bulgarian translation for duplicity
 # Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
 # This file is distributed under the same license as the duplicity package.
@@ -1278,3 +1279,1285 @@
 
 #~ msgid "No signature data found, unable to list files."
 #~ msgstr "Не е възможно да се покажат файловете, защото не беше намерен архив."
+=======
+# Bulgarian translation for duplicity
+# Copyright (c) 2009 Rosetta Contributors and Canonical Ltd 2009
+# This file is distributed under the same license as the duplicity package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2009.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: duplicity\n"
+"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"POT-Creation-Date: 2009-09-15 06:36-0500\n"
+"PO-Revision-Date: 2009-09-25 16:09+0000\n"
+"Last-Translator: Kenneth Loafman <[e-mail]>\n"
+"Language-Team: Bulgarian <[e-mail]>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"X-Launchpad-Export-Date: 2009-09-30 06:45+0000\n"
+"X-Generator: Launchpad (build Unknown)\n"
+
+#: ../duplicity-bin:191
+#, python-format
+msgid ""
+"Unable to locate last file %s and block %d in backup set.\n"
+"Attempting restart on the next file %s."
+msgstr ""
+"Последния архивиран файл %s (блок %d) липсва.\n"
+"Ще бъде направен опит за рестартиране на операцията от следващия файл %s."
+
+#: ../duplicity-bin:197
+#, python-format
+msgid ""
+"Unable to locate last file %s and block %d in backup set.\n"
+"There are no more files to be backed up."
+msgstr ""
+"Последния архивиран файл %s (блок %d) липсва.\n"
+"Няма други файлове за архивиране."
+
+#: ../duplicity-bin:443
+msgid ""
+"Fatal Error: Unable to start incremental backup.  Old signatures not found "
+"and incremental specified"
+msgstr ""
+"Фатална грешка: Не е възможно да започне допълващо архивиране, защото не "
+"съществува предишен пълен архив."
+
+#: ../duplicity-bin:447
+msgid "No signatures found, switching to full backup."
+msgstr "Не съществува предишен архив. Ще се създане нов пълен архив."
+
+#: ../duplicity-bin:461
+msgid "Backup Statistics"
+msgstr "Статистика:"
+
+#: ../duplicity-bin:515
+msgid "No signature data found, unable to list files."
+msgstr "Не е възможно да се покажат файловете, защото не беше намерен архив."
+
+#: ../duplicity-bin:544
+#, python-format
+msgid "%s not found in archive, no files restored."
+msgstr "Файла %s не беше намерен в архива."
+
+#: ../duplicity-bin:548
+msgid "No files found in archive - nothing restored."
+msgstr "В архива няма файлове нищо не беше възстановено."
+
+#: ../duplicity-bin:581
+#, python-format
+msgid "Processed volume %d of %d"
+msgstr "Обработен част %d от %d"
+
+#: ../duplicity-bin:621
+#, python-format
+msgid "Invalid data - %s hash mismatch:"
+msgstr "Грешни данни - %s контролната сума е грешна."
+
+#: ../duplicity-bin:622
+#, python-format
+msgid "Calculated hash: %s"
+msgstr "Изчислена контролна сума: %s"
+
+#: ../duplicity-bin:623
+#, python-format
+msgid "Manifest hash: %s"
+msgstr "Контролна сума на манифеста %s"
+
+#: ../duplicity-bin:640
+#, python-format
+msgid "Volume was signed by key %s, not %s"
+msgstr "Архивният файл е подписан с ключ %s, а не с %s"
+
+#: ../duplicity-bin:670
+#, python-format
+msgid "Verify complete: %s, %s."
+msgstr "Проверката завършена: %s, %s"
+
+#: ../duplicity-bin:671
+#, python-format
+msgid "%d file compared"
+msgid_plural "%d files compared"
+msgstr[0] "%d файлът е сравнен"
+msgstr[1] "%d файловете са сравнени"
+
+#: ../duplicity-bin:673
+#, python-format
+msgid "%d difference found"
+msgid_plural "%d differences found"
+msgstr[0] "намерена е %d разлика"
+msgstr[1] "намерени са %d разлики"
+
+#: ../duplicity-bin:692
+msgid "No extraneous files found, nothing deleted in cleanup."
+msgstr ""
+"Не бяха намерени излишни файлове, нищо не беше изтрито по време на "
+"почистването."
+
+#: ../duplicity-bin:697
+msgid "Deleting this file from backend:"
+msgid_plural "Deleting these files from backend:"
+msgstr[0] "Файлът ще бъде изтрит:"
+msgstr[1] "Файловете ще бъдат изтрити:"
+
+#: ../duplicity-bin:706
+msgid "Found the following file to delete:"
+msgid_plural "Found the following files to delete:"
+msgstr[0] "Открит е следният файл за изтриване:"
+msgstr[1] "Открит са следните файлове за изтриване:"
+
+#: ../duplicity-bin:710
+msgid "Run duplicity again with the --force option to actually delete."
+msgstr ""
+"Стартирайте duplicity отново с опция --force, за да се изпълни реалното "
+"изтриване на файлове."
+
+#: ../duplicity-bin:749
+msgid "There are backup set(s) at time(s):"
+msgstr "Има архивни копия от дати:"
+
+#: ../duplicity-bin:751
+msgid "Which can't be deleted because newer sets depend on them."
+msgstr ""
+"Които не могат да бъдат изтрити защото по-нови архиви зависят от тях."
+
+#: ../duplicity-bin:755
+msgid ""
+"Current active backup chain is older than specified time.  However, it will "
+"not be deleted.  To remove all your backups, manually purge the repository."
+msgstr ""
+"Текущото архивно копие е по-старо от специфицираното време, но то няма да "
+"бъде изтрито. Ако желаете да изтриете всички съществуващи архиви трябва да "
+"го направите ръчно."
+
+#: ../duplicity-bin:761
+msgid "No old backup sets found, nothing deleted."
+msgstr "Не бяха открити стари архивни копия, нищо не беше изтрито."
+
+#: ../duplicity-bin:764
+msgid "Deleting backup set at time:"
+msgid_plural "Deleting backup sets at times:"
+msgstr[0] "Изтриване на архивно копие от дата:"
+msgstr[1] "Изтриване на архивни копия от дати:"
+
+#: ../duplicity-bin:776
+msgid "Found old backup set at the following time:"
+msgid_plural "Found old backup sets at the following times:"
+msgstr[0] "Намерено е старо архивно копие от следната дата:"
+msgstr[1] "Намерени са стари архивни копия от следните дати:"
+
+#: ../duplicity-bin:780
+msgid "Rerun command with --force option to actually delete."
+msgstr ""
+"Моля изпълнете командата с опция --force, за да бъдат изтрити файловете."
+
+#: ../duplicity-bin:863
+#, python-format
+msgid "Deleting local %s (not authoritative at backend)."
+msgstr ""
+"Изтрива се локалния файла %s, който не съществува в отдалечения архив."
+
+#: ../duplicity-bin:888 ../duplicity/dup_temp.py:239
+#, python-format
+msgid "Failed to read %s: %s"
+msgstr "Грешка при четене на %s: %s"
+
+#: ../duplicity-bin:899
+#, python-format
+msgid "Copying %s to local cache."
+msgstr "Копира се %s в локалния кеш."
+
+#: ../duplicity-bin:943
+msgid "Local and Remote metadata are synchronized, no sync needed."
+msgstr ""
+"Локалните и отдалечените мета данни са еднакви, няма нужда от синхронизиране."
+
+#: ../duplicity-bin:948
+msgid "Synchronizing remote metadata to local cache..."
+msgstr "Синхронизиране на локалния кеш с отдалечения..."
+
+#: ../duplicity-bin:955
+msgid "Sync would copy the following from remote to local:"
+msgstr ""
+"Синхронизирането ще копира следните файлове от отдалечения архив в локалния "
+"кеш:"
+
+#: ../duplicity-bin:958
+msgid "Sync would remove the following spurious local files:"
+msgstr "Синхронизирането ще премахне следните невалидни локални файлове:"
+
+#: ../duplicity-bin:1001
+msgid "Unable to get free space on temp."
+msgstr ""
+"Не е възможно да се изчисли свободното място във временната директория."
+
+#: ../duplicity-bin:1009
+#, python-format
+msgid "Temp space has %d available, backup needs approx %d."
+msgstr ""
+"Във временната директория има %d свободно място, за операцията е необходимо "
+"приблизително %d. Моля освободете необходимото място."
+
+#: ../duplicity-bin:1012
+#, python-format
+msgid "Temp has %d available, backup will use approx %d."
+msgstr ""
+"Във временната директория има %d свободно място, за операцията е необходимо "
+"приблизително %d. Моля освободете необходимото място."
+
+#: ../duplicity-bin:1020
+msgid "Unable to get max open files."
+msgstr ""
+"Не е възможно да се определи колко файла могат да бъдат отворени "
+"едновременно."
+
+#: ../duplicity-bin:1024
+#, python-format
+msgid ""
+"Max open files of %s is too low, should be >= 1024.\n"
+"Use 'ulimit -n 1024' or higher to correct.\n"
+msgstr ""
+"Могат да бъдат отворени най-много %s файла едновременно това е прекалено "
+"малко желателно е да бъдат поне 1024.\n"
+"Изпълнете командата 'ulimit -n 1024' или повече.\n"
+
+#: ../duplicity-bin:1070
+msgid ""
+"RESTART: The first volume failed to upload before termination.\n"
+"         Restart is impossible...starting backup from beginning."
+msgstr ""
+"Рестартиране на операцията: Първия файл от архива не беше качен преди "
+"спирането на прогарамата. \n"
+"        Не е възможно да се продължи от предишната позиция. Операцията ще "
+"започне от начало."
+
+#: ../duplicity-bin:1076
+#, python-format
+msgid ""
+"RESTART: Volumes %d to %d failed to upload before termination.\n"
+"         Restarting backup at volume %d."
+msgstr ""
+
+#: ../duplicity-bin:1084
+#, python-format
+msgid ""
+"RESTART: Impossible backup state: manifest has %d vols, remote has %d vols.\n"
+"         Restart is impossible ... duplicity will clean off the last "
+"partial\n"
+"         backup then restart the backup from the beginning."
+msgstr ""
+
+#: ../duplicity-bin:1162
+#, python-format
+msgid "Last %s backup left a partial set, restarting."
+msgstr "Предишният опит %s остави частично резервно копие. Рестартиране."
+
+#: ../duplicity-bin:1166
+#, python-format
+msgid "Cleaning up previous partial %s backup set, restarting."
+msgstr "Премахване на предишното частично резервно копие %s и рестартиране."
+
+#: ../duplicity-bin:1177
+msgid "Last full backup date:"
+msgstr "Дата на последното пълно резервно копие:"
+
+#: ../duplicity-bin:1179
+msgid "Last full backup date: none"
+msgstr "Дата на последното пълно резервно копие: Не съществува"
+
+#: ../duplicity-bin:1181
+msgid "Last full backup is too old, forcing full backup"
+msgstr ""
+"Последното пълно резервно копие е прекалено старо. Ще бъде направено пълно "
+"резервно копие."
+
+#: ../duplicity-bin:1255
+#, python-format
+msgid "GPG error detail: %s"
+msgstr ""
+
+#: ../duplicity-bin:1264
+#, python-format
+msgid "User error detail: %s"
+msgstr ""
+
+#: ../duplicity-bin:1273
+#, python-format
+msgid "Backend error detail: %s"
+msgstr ""
+
+#: ../duplicity/asyncscheduler.py:69
+#, python-format
+msgid "instantiating at concurrency %d"
+msgstr "Ще бъдат изпълнявани %d конкурентни операции."
+
+#: ../duplicity/asyncscheduler.py:96
+msgid "inserting barrier"
+msgstr ""
+
+#: ../duplicity/asyncscheduler.py:145
+msgid "running task synchronously (asynchronicity disabled)"
+msgstr "Асинхронното изпълнение е забранено. Изпълняване синхронно"
+
+#: ../duplicity/asyncscheduler.py:151
+msgid "scheduling task for asynchronous execution"
+msgstr "Добавяна на асинхронна задача."
+
+#: ../duplicity/asyncscheduler.py:181
+msgid "task completed successfully"
+msgstr "задачата приключи успешно"
+
+#: ../duplicity/asyncscheduler.py:192
+msgid ""
+"a previously scheduled task has failed; propagating the result immediately"
+msgstr ""
+
+#: ../duplicity/asyncscheduler.py:215 ../duplicity/asyncscheduler.py:236
+#, python-format
+msgid "active workers = %d"
+msgstr "активни задачи = %d"
+
+#: ../duplicity/asyncscheduler.py:256
+#, python-format
+msgid "task execution done (success: %s)"
+msgstr "задачата приключи успешно %s"
+
+#: ../duplicity/backend.py:370
+#, python-format
+msgid "Running '%s'"
+msgstr "Изпълнение на '%s'"
+
+#: ../duplicity/backend.py:384
+#, python-format
+msgid "Running '%s' (attempt #%d)"
+msgid_plural "Running '%s' (attempt #%d)"
+msgstr[0] "Изпълнение на '%s'  (опит #%d)"
+msgstr[1] "Изпълнение на '%s' (опит #%d)"
+
+#: ../duplicity/backend.py:389 ../duplicity/backend.py:430
+#, python-format
+msgid "Running '%s' failed (attempt #%d)"
+msgid_plural "Running '%s' failed (attempt #%d)"
+msgstr[0] "Изпълнението на '%s' се провали (опит #%d)"
+msgstr[1] "Изпълнението на '%s' се провали (опит #%d)"
+
+#: ../duplicity/backend.py:392 ../duplicity/backend.py:433
+#, python-format
+msgid "Giving up trying to execute '%s' after %d attempt"
+msgid_plural "Giving up trying to execute '%s' after %d attempts"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../duplicity/backend.py:403 ../duplicity/backend.py:420
+#, python-format
+msgid "Reading results of '%s'"
+msgstr ""
+
+#: ../duplicity/collections.py:176
+msgid "Fatal Error: No manifests found for most recent backup"
+msgstr ""
+
+#: ../duplicity/collections.py:185
+msgid ""
+"Fatal Error: Remote manifest does not match local one.  Either the remote "
+"backup set or the local archive directory has been corrupted."
+msgstr ""
+
+#: ../duplicity/collections.py:193
+msgid "Fatal Error: Neither remote nor local manifest is readable."
+msgstr ""
+
+#: ../duplicity/collections.py:299
+msgid "Preferring Backupset over previous one!"
+msgstr ""
+
+#: ../duplicity/collections.py:302
+#, python-format
+msgid "Ignoring incremental Backupset (start_time: %s; needed: %s)"
+msgstr ""
+
+#: ../duplicity/collections.py:307
+#, python-format
+msgid "Added incremental Backupset (start_time: %s / end_time: %s)"
+msgstr ""
+
+#: ../duplicity/collections.py:373
+msgid "Chain start time: "
+msgstr ""
+
+#: ../duplicity/collections.py:374
+msgid "Chain end time: "
+msgstr ""
+
+#: ../duplicity/collections.py:375
+#, python-format
+msgid "Number of contained backup sets: %d"
+msgstr "Брой на наличните архивни копия: %d"
+
+#: ../duplicity/collections.py:377
+#, python-format
+msgid "Total number of contained volumes: %d"
+msgstr "Общ брой на наличните архивни файлове: %d"
+
+#: ../duplicity/collections.py:379
+msgid "Type of backup set:"
+msgstr ""
+
+#: ../duplicity/collections.py:379
+msgid "Time:"
+msgstr "Време:"
+
+#: ../duplicity/collections.py:379
+msgid "Num volumes:"
+msgstr ""
+
+#: ../duplicity/collections.py:383
+msgid "Full"
+msgstr "Пълно"
+
+#: ../duplicity/collections.py:386
+msgid "Incremental"
+msgstr "Последователно"
+
+#: ../duplicity/collections.py:446
+msgid "local"
+msgstr "локално"
+
+#: ../duplicity/collections.py:448
+msgid "remote"
+msgstr "отдалечено"
+
+#: ../duplicity/collections.py:600
+msgid "Collection Status"
+msgstr "Състояние на колекцията от архивни копия"
+
+#: ../duplicity/collections.py:602
+#, python-format
+msgid "Connecting with backend: %s"
+msgstr ""
+
+#: ../duplicity/collections.py:604
+#, python-format
+msgid "Archive dir: %s"
+msgstr ""
+
+#: ../duplicity/collections.py:607
+#, python-format
+msgid "Found %d backup chain without signatures."
+msgid_plural "Found %d backup chains without signatures."
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../duplicity/collections.py:612
+#, python-format
+msgid "Signature-less chain %d of %d:"
+msgstr ""
+
+#: ../duplicity/collections.py:618
+msgid "Found a complete backup chain with matching signature chain:"
+msgstr ""
+
+#: ../duplicity/collections.py:622
+msgid "No backup chains with active signatures found"
+msgstr ""
+
+#: ../duplicity/collections.py:625
+#, python-format
+msgid "Also found %d backup set not part of any chain,"
+msgid_plural "Also found %d backup sets not part of any chain,"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../duplicity/collections.py:629
+#, python-format
+msgid "and %d incomplete backup set."
+msgid_plural "and %d incomplete backup sets."
+msgstr[0] ""
+msgstr[1] ""
+
+#. "cleanup" is a hard-coded command, so do not translate it
+#: ../duplicity/collections.py:634
+msgid ""
+"These may be deleted by running duplicity with the \"cleanup\" command."
+msgstr ""
+
+#: ../duplicity/collections.py:637
+msgid "No orphaned or incomplete backup sets found."
+msgstr ""
+
+#: ../duplicity/collections.py:653
+#, python-format
+msgid "%d file exists on backend"
+msgid_plural "%d files exist on backend"
+msgstr[0] "%d файл съществува в отдалечения архив"
+msgstr[1] "%d файла съществуват в отдалечения архив"
+
+#: ../duplicity/collections.py:660
+#, python-format
+msgid "%d file exists in cache"
+msgid_plural "%d files exist in cache"
+msgstr[0] "%d файл съществува в локалния кеш"
+msgstr[1] "%d файла съществуват в локалния кеш"
+
+#: ../duplicity/collections.py:712
+msgid ""
+"Warning, discarding last backup set, because of missing signature file."
+msgstr ""
+
+#: ../duplicity/collections.py:745
+msgid "Warning, found the following local orphaned signature file:"
+msgid_plural "Warning, found the following local orphaned signature files:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../duplicity/collections.py:754
+msgid "Warning, found the following remote orphaned signature file:"
+msgid_plural "Warning, found the following remote orphaned signature files:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../duplicity/collections.py:764
+msgid "Warning, found an unnecessary signature chain"
+msgid_plural "Warning, found unnecessary signature chains"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../duplicity/collections.py:772
+msgid "Warning, found signatures but no corresponding backup files"
+msgstr ""
+
+#: ../duplicity/collections.py:776
+msgid ""
+"Warning, found incomplete backup sets, probably left from aborted session"
+msgstr ""
+
+#: ../duplicity/collections.py:780
+msgid "Warning, found the following orphaned backup file:"
+msgid_plural "Warning, found the following orphaned backup files:"
+msgstr[0] ""
+msgstr[1] ""
+
+#: ../duplicity/collections.py:798
+#, python-format
+msgid "Extracting backup chains from list of files: %s"
+msgstr ""
+
+#: ../duplicity/collections.py:808
+#, python-format
+msgid "File %s is part of known set"
+msgstr ""
+
+#: ../duplicity/collections.py:811
+#, python-format
+msgid "File %s is not part of a known set; creating new set"
+msgstr ""
+
+#: ../duplicity/collections.py:816
+#, python-format
+msgid "Ignoring file (rejected by backup set) '%s'"
+msgstr ""
+
+#: ../duplicity/collections.py:829
+#, python-format
+msgid "Found backup chain %s"
+msgstr ""
+
+#: ../duplicity/collections.py:834
+#, python-format
+msgid "Added set %s to pre-existing chain %s"
+msgstr ""
+
+#: ../duplicity/collections.py:838
+#, python-format
+msgid "Found orphaned set %s"
+msgstr ""
+
+#: ../duplicity/commandline.py:125
+#, python-format
+msgid ""
+"Warning: Option %s is pending deprecation and will be removed in a future "
+"release.\n"
+"Use of default filenames is strongly suggested."
+msgstr ""
+
+#: ../duplicity/commandline.py:176
+#, python-format
+msgid "Error opening file %s"
+msgstr ""
+
+#: ../duplicity/commandline.py:288
+msgid "Unable to load gio module"
+msgstr ""
+
+#: ../duplicity/commandline.py:383
+msgid ""
+"running in 'ignore errors' mode due to --ignore-errors; please re-consider "
+"if this was not intended"
+msgstr ""
+
+#: ../duplicity/commandline.py:423
+#, python-format
+msgid "Using archive dir: %s"
+msgstr ""
+
+#: ../duplicity/commandline.py:424
+#, python-format
+msgid "Using backup name: %s"
+msgstr ""
+
+#: ../duplicity/commandline.py:431
+#, python-format
+msgid "Command line error: %s"
+msgstr ""
+
+#: ../duplicity/commandline.py:432
+msgid "Enter 'duplicity --help' for help screen."
+msgstr ""
+
+#. Used in usage help to represent a Unix-style path name. Example:
+#. rsync://user[:password]@other_host[:port]//absolute_path
+#: ../duplicity/commandline.py:445
+msgid "absolute_path"
+msgstr ""
+
+#. Used in usage help. Example:
+#. tahoe://alias/some_dir
+#: ../duplicity/commandline.py:449
+msgid "alias"
+msgstr ""
+
+#. Used in usage help (noun)
+#: ../duplicity/commandline.py:452
+msgid "backup name"
+msgstr ""
+
+#. Used in help to represent a "bucket name" for Amazon Web
+#. Services' Simple Storage Service (S3). Example:
+#. s3://other.host/bucket_name[/prefix]
+#: ../duplicity/commandline.py:457
+msgid "bucket_name"
+msgstr ""
+
+#. abbreviation for "character" (noun)
+#: ../duplicity/commandline.py:460
+msgid "char"
+msgstr ""
+
+#. noun
+#: ../duplicity/commandline.py:463
+msgid "command"
+msgstr ""
+
+#. Used in usage help to represent the name of a container in
+#. Amazon Web Services' Cloudfront. Example:
+#. cf+http://container_name
+#: ../duplicity/commandline.py:468
+msgid "container_name"
+msgstr ""
+
+#. noun
+#: ../duplicity/commandline.py:471
+msgid "count"
+msgstr ""
+
+#. Used in usage help to represent the name of a file directory
+#: ../duplicity/commandline.py:474
+msgid "directory"
+msgstr ""
+
+#. Used in usage help to represent the name of a file. Example:
+#. --log-file <filename>
+#: ../duplicity/commandline.py:478
+msgid "filename"
+msgstr ""
+
+#. Used in usage help to represent an ID for a GnuPG key. Example:
+#. --encrypt-key <gpg_key_id>
+#: ../duplicity/commandline.py:482
+msgid "gpg-key-id"
+msgstr ""
+
+#. Used in usage help, e.g. to represent the name of a code
+#. module. Example:
+#. rsync://user[:password]@other.host[:port]::/module/some_dir
+#: ../duplicity/commandline.py:487
+msgid "module"
+msgstr ""
+
+#. Used in usage help to represent a desired number of
+#. something. Example:
+#. --num-retries <number>
+#: ../duplicity/commandline.py:492
+msgid "number"
+msgstr ""
+
+#. Used in usage help. (Should be consistent with the "Options:"
+#. header.) Example:
+#. duplicity [full|incremental] [options] source_dir target_url
+#: ../duplicity/commandline.py:497
+msgid "options"
+msgstr ""
+
+#. Used in usage help to represent an internet hostname. Example:
+#. ftp://user[:password]@other.host[:port]/some_dir
+#: ../duplicity/commandline.py:501
+msgid "other.host"
+msgstr ""
+
+#. Used in usage help. Example:
+#. ftp://user[:password]@other.host[:port]/some_dir
+#: ../duplicity/commandline.py:505
+msgid "password"
+msgstr ""
+
+#. Used in usage help to represent a Unix-style path name. Example:
+#. --archive-dir <path>
+#: ../duplicity/commandline.py:509
+msgid "path"
+msgstr ""
+
+#. Used in usage help to represent a TCP port number. Example:
+#. ftp://user[:password]@other.host[:port]/some_dir
+#: ../duplicity/commandline.py:513
+msgid "port"
+msgstr ""
+
+#. Used in usage help. This represents a string to be used as a
+#. prefix to names for backup files created by Duplicity. Example:
+#. s3://other.host/bucket_name[/prefix]
+#: ../duplicity/commandline.py:518
+msgid "prefix"
+msgstr ""
+
+#. Used in usage help to represent a Unix-style path name. Example:
+#. rsync://user[:password]@other.host[:port]/relative_path
+#: ../duplicity/commandline.py:522
+msgid "relative_path"
+msgstr ""
+
+#. Used in usage help. Example:
+#. --timeout <seconds>
+#: ../duplicity/commandline.py:526
+msgid "seconds"
+msgstr ""
+
+#. Used in usage help to represent a "glob" style pattern for
+#. matching one or more files, as described in the documentation.
+#. Example:
+#. --exclude <shell_pattern>
+#: ../duplicity/commandline.py:532
+msgid "shell_pattern"
+msgstr ""
+
+#. Used in usage help to represent the name of a single file
+#. directory or a Unix-style path to a directory. Example:
+#. file:///some_dir
+#: ../duplicity/commandline.py:537
+msgid "some_dir"
+msgstr ""
+
+#. Used in usage help to represent the name of a single file
+#. directory or a Unix-style path to a directory where files will be
+#. coming FROM. Example:
+#. duplicity [full|incremental] [options] source_dir target_url
+#: ../duplicity/commandline.py:543
+msgid "source_dir"
+msgstr ""
+
+#. Used in usage help to represent a URL files will be coming
+#. FROM. Example:
+#. duplicity [restore] [options] source_url target_dir
+#: ../duplicity/commandline.py:548
+msgid "source_url"
+msgstr ""
+
+#. Used in usage help to represent the name of a single file
+#. directory or a Unix-style path to a directory. where files will be
+#. going TO. Example:
+#. duplicity [restore] [options] source_url target_dir
+#: ../duplicity/commandline.py:554
+msgid "target_dir"
+msgstr ""
+
+#. Used in usage help to represent a URL files will be going TO.
+#. Example:
+#. duplicity [full|incremental] [options] source_dir target_url
+#: ../duplicity/commandline.py:559
+msgid "target_url"
+msgstr ""
+
+#. Used in usage help to represent a time spec for a previous
+#. point in time, as described in the documentation. Example:
+#. duplicity remove-older-than time [options] target_url
+#: ../duplicity/commandline.py:564
+msgid "time"
+msgstr ""
+
+#. Used in usage help to represent a user name (i.e. login).
+#. Example:
+#. ftp://user[:password]@other.host[:port]/some_dir
+#: ../duplicity/commandline.py:569
+msgid "user"
+msgstr ""
+
+#: ../duplicity/commandline.py:571
+#, python-format
+msgid "duplicity version %s running on %s."
+msgstr ""
+
+#. Header in usage help
+#: ../duplicity/commandline.py:575
+msgid "Usage:"
+msgstr ""
+
+#. Header in usage help
+#: ../duplicity/commandline.py:588
+msgid "Backends and their URL formats:"
+msgstr ""
+
+#. Header in usage help
+#: ../duplicity/commandline.py:608
+msgid "Commands:"
+msgstr ""
+
+#. Header in usage help
+#: ../duplicity/commandline.py:622
+msgid "Options:"
+msgstr ""
+
+#. In this portion of the usage instructions, "[ewnid]" indicates which
+#. characters are permitted (e, w, n, i, or d); the brackets imply their own
+#. meaning in regex; i.e., only one of the characters is allowed in an instance.
+#: ../duplicity/commandline.py:676
+msgid ""
+"    Verbosity must be one of: digit [0-9], character [ewnid],\n"
+"    or word ['error', 'warning', 'notice', 'info', 'debug'].\n"
+"    The default is 4 (Notice).  It is strongly recommended\n"
+"    that verbosity level is set at 2 (Warning) or higher.\n"
+msgstr ""
+
+#: ../duplicity/commandline.py:702
+#, python-format
+msgid ""
+"Specified archive directory '%s' does not exist, or is not a directory"
+msgstr ""
+
+#: ../duplicity/commandline.py:711
+#, python-format
+msgid ""
+"Sign key should be an 8 character hex string, like 'AA0E73D2'.\n"
+"Received '%s' instead."
+msgstr ""
+
+#: ../duplicity/commandline.py:769
+#, python-format
+msgid ""
+"Restore destination directory %s already exists.\n"
+"Will not overwrite."
+msgstr ""
+
+#: ../duplicity/commandline.py:774
+#, python-format
+msgid "Verify directory %s does not exist"
+msgstr ""
+
+#: ../duplicity/commandline.py:780
+#, python-format
+msgid "Backup source directory %s does not exist."
+msgstr ""
+
+#: ../duplicity/commandline.py:855
+#, python-format
+msgid ""
+"Bad URL '%s'.\n"
+"Examples of URL strings are \"scp://[e-mail]:1234/path\" and\n"
+"\"file:///usr/local\".  See the man page for more information."
+msgstr ""
+
+#: ../duplicity/commandline.py:880
+msgid "Main action: "
+msgstr ""
+
+#: ../duplicity/diffdir.py:105
+#, python-format
+msgid "Error %s getting delta for %s"
+msgstr ""
+
+#: ../duplicity/diffdir.py:119
+#, python-format
+msgid "Getting delta of %s and %s"
+msgstr ""
+
+#: ../duplicity/diffdir.py:164
+#, python-format
+msgid "A %s"
+msgstr ""
+
+#: ../duplicity/diffdir.py:171
+#, python-format
+msgid "M %s"
+msgstr ""
+
+#: ../duplicity/diffdir.py:193
+#, python-format
+msgid "Comparing %s and %s"
+msgstr ""
+
+#: ../duplicity/diffdir.py:199
+#, python-format
+msgid "D %s"
+msgstr ""
+
+#: ../duplicity/dup_time.py:48
+#, python-format
+msgid ""
+"Bad interval string \"%s\"\n"
+"\n"
+"Intervals are specified like 2Y (2 years) or 2h30m (2.5 hours).  The\n"
+"allowed special characters are s, m, h, D, W, M, and Y.  See the man\n"
+"page for more information."
+msgstr ""
+
+#: ../duplicity/dup_time.py:54
+#, python-format
+msgid ""
+"Bad time string \"%s\"\n"
+"\n"
+"The acceptible time strings are intervals (like \"3D64s\"), w3-datetime\n"
+"strings, like \"2002-04-26T04:22:01-07:00\" (strings like\n"
+"\"2002-04-26T04:22:01\" are also acceptable - duplicity will use the\n"
+"current time zone), or ordinary dates like 2/4/1997 or 2001-04-23\n"
+"(various combinations are acceptable, but the month always precedes\n"
+"the day)."
+msgstr ""
+
+#: ../duplicity/lazy.py:326
+#, python-format
+msgid "Warning: oldindex %s >= newindex %s"
+msgstr ""
+
+#: ../duplicity/lazy.py:401
+#, python-format
+msgid "Error '%s' processing %s"
+msgstr ""
+
+#: ../duplicity/lazy.py:409
+#, python-format
+msgid "Skipping %s because of previous error"
+msgstr ""
+
+#: ../duplicity/manifest.py:86
+#, python-format
+msgid ""
+"Fatal Error: Backup source host has changed.\n"
+"Current hostname: %s\n"
+"Previous hostname: %s"
+msgstr ""
+
+#: ../duplicity/manifest.py:91
+#, python-format
+msgid ""
+"Fatal Error: Backup source directory has changed.\n"
+"Current directory: %s\n"
+"Previous directory: %s"
+msgstr ""
+
+#: ../duplicity/manifest.py:98
+msgid ""
+"Aborting because you may have accidentally tried to backup two different "
+"data sets to the same remote location, or using the same archive directory.  "
+"If this is not a mistake, use the --allow-source-mismatch switch to avoid "
+"seeing this message"
+msgstr ""
+
+#: ../duplicity/manifest.py:193
+msgid "Manifests not equal because different volume numbers"
+msgstr ""
+
+#: ../duplicity/manifest.py:198
+msgid "Manifests not equal because volume lists differ"
+msgstr ""
+
+#: ../duplicity/manifest.py:203