Subject: Collected Debian patches for afs-admin-tools
Author: Russ Allbery <rra@debian.org>

Since I am also upstream for this package, there will normally not be any
patches to apply to the upstream source.  However, occasionally I'll pull
up specific upstream commits prior to making an upstream release.  When
this happens, this patch will collect all of those modifications.

I use Git to maintain both the upstream source and the Debian packages,
and generating individual patches rather than using git cherry-pick takes
extra work for no gain.  Since I'm also upstream, there's no need to
separate the patches for later upstream submission.  Hence, I take this
approach with a unified patch when it's necessary.

For full commit history and separated commits, see the upstream Git
repsitory.
--- afs-admin-tools-2.0.orig/mvto
+++ afs-admin-tools-2.0/mvto
@@ -10,6 +10,9 @@ our $VERSION = '2.0 (2013-01-15)';
 # replication pattern of a volume differs from what you want it to be and
 # correct it.
 #
+# "The greater thing in this world is not so much where we stand as in what
+# direction we are going." -- Oliver Wendell Holmes, Jr.
+#
 # Written by Russ Allbery <rra@stanford.edu>
 # Based on code by Neil Crellin <neilc@stanford.edu>
 # Copyright 1998, 1999, 2001, 2003, 2004, 2005, 2006, 2011, 2013
--- afs-admin-tools-2.0.orig/frak
+++ afs-admin-tools-2.0/frak
@@ -9,6 +9,9 @@ our $VERSION = '2.0 (2013-01-15)';
 # of the differences so that you can see exactly what will be changed when the
 # volume is released.
 #
+# "Don't be a _little_ paranoid; worry about everything, or let it all go."
+#                                      -- James Alan Gardner, _Trapped_
+#
 # Written by Neil Crellin <neilc@stanford.edu>
 # Updated by Russ Allbery <rra@stanford.edu>
 # Copyright 1998, 1999, 2004, 2011, 2013
@@ -866,6 +869,10 @@ be complete paths unless B<-m> is given.
 relative to the root of the tree specified by the path given on the
 command line.
 
+The name B<frak> comes from the swear word used in I<Battlestar
+Galactica>, which should give you some ideas about the origin of this
+program.
+
 =head1 OPTIONS
 
 =over 4
@@ -1067,4 +1074,7 @@ This script is part of the afs-admin-too
 version is available from the afs-admin-tools web page at
 L<http://www.eyrie.org/~eagle/software/afs-admin-tools/>.
 
+B<bundle>, for the B<--change-dir> feature, is available from
+L<http://www.eyrie.org/~eagle/software/bundle/>.
+
 =cut
--- afs-admin-tools-2.0.orig/volnuke
+++ afs-admin-tools-2.0/volnuke
@@ -9,6 +9,11 @@ our $VERSION = '2.0 (2013-01-15)';
 # replication points.  If the volume is replicated, it also checks to be sure
 # that none of the replicas have been accessed.
 #
+# "These had really struck terror into the hearts of everyone who had
+# encountered them -- in most cases, however, the terror was extremely
+# short-lived, as was the person experiencing the terror."
+#                       -- Douglas Adams, _Life, the Universe, and Everything_
+#
 # Written by Russ Allbery <rra@stanford.edu>
 # Copyright 2002, 2003, 2004, 2010, 2011, 2013
 #     The Board of Trustees of the Leland Stanford Junior University
--- afs-admin-tools-2.0.orig/README
+++ afs-admin-tools-2.0/README
@@ -1,6 +1,5 @@
                        afs-admin-tools release 2.0
                       (utilities for AFS management)
-
               Maintained by Russ Allbery <rra@stanford.edu>
 
   These programs are free software; you may redistribute them and/or
@@ -83,11 +82,12 @@ REQUIREMENTS
   later.  They require the AFS client binaries be available in either some
   standard locations (in /usr or /usr/local) or on the PATH.
 
-  frak requires Stat::lsMode, available from CPAN.  mvto and volnuke
+  frak requires Stat::lsMode, available from CPAN, and prefers to have a
+  diff program that supports -u (such as GNU diff).  mvto and volnuke
   require Date::Parse, available as part of the TimeDate distribution on
   CPAN.  volcreate-logs requires AFS::Utils (part of the AFS Perl module
-  suite) and an aklog binary if run with a ticket cache specified on the
-  command line.
+  suite), an aklog binary if run with a ticket cache specified on the
+  command line, and a local sendmail command if told to mail reports.
 
   To run the full test suite, Test::More is required (part of Perl since
   5.6.2).  It also makes use of additional Perl modules for some tests.
