[rdiff-backup-users] Debian's own patches

[Blair Zajac]

Hi Ben,

Debian distributes rdiff-backup containing this patch:

http://lists.gnu.org/archive/html/rdiff-backup-users/2004-06/msg00083.html

It doesn't apply cleanly to 1.1.0, so I'm wondering if it is required 
any more, and if it is, could it be merged into 1.1.1?

Speaking about debian, it also contains the following two patches, which 
I've attached.  Could these also be merged into the next release?

Thanks,
Blair

--
Blair Zajac, Ph.D.
<address@hidden>
Subversion and Orca training and consulting
http://www.orcaware.com/svn/

#!/bin/sh -e
## afs-hardlinks.dpatch by Alec Berryman <address@hidden>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Fixes AFS hard link handling by testing if able to hard link across
## DP: directories.

if [ $# -lt 1 ]; then
    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
    exit 1
fi

[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"

case "$1" in
       -patch) patch $patch_opts -p0 < $0;;
       -unpatch) patch $patch_opts -p0 -R < $0;;
        *)
                echo >&2 "`basename $0`: script expects -patch|-unpatch as 
argument"
                exit 1;;
esac

exit 0

@DPATCH@
--- rdiff_backup/fs_abilities.py.orig   2004-08-30 23:46:15.000000000 -0400
+++ rdiff_backup/fs_abilities.py        2004-08-30 23:49:02.000000000 -0400
@@ -200,9 +200,11 @@
                tmp_rp.delete()
 
        def set_hardlinks(self, testdir):
-               """Set self.hardlinks to true iff hard linked files can be 
made"""
+               """Set self.hardlinks to true if hard linked files can be 
made"""
                hl_source = testdir.append("hardlinked_file1")
-               hl_dest = testdir.append("hardlinked_file2")
+               hl_dir = testdir.append("hl")
+               hl_dir.mkdir()
+               hl_dest = hl_dir.append("hardlinked_file2")
                hl_source.touch()
                try:
                        hl_dest.hardlink(hl_source.path)

#!/bin/sh -e
## no-compress-regexp by Alec Berryman <address@hidden>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Adds several file suffixes not to compress

if [ $# -lt 1 ]; then
    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
    exit 1
fi

[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"

case "$1" in
       -patch) patch $patch_opts -p0 < $0;;
       -unpatch) patch $patch_opts -p0 -R < $0;;
        *)
                echo >&2 "`basename $0`: script expects -patch|-unpatch as 
argument"
                exit 1;;
esac

exit 0

@DPATCH@
--- rdiff_backup/Globals.py.old 2004-09-20 00:12:49.000000000 -0400
+++ rdiff_backup/Globals.py     2004-09-20 00:14:59.000000000 -0400
@@ -166,7 +166,9 @@
 # to .snapshots and .diffs).  The second below will be the
 # compiled version of the first.
 no_compression_regexp_string = "(?i).*\\.(gz|z|bz|bz2|tgz|zip|rpm|deb|" \
-                                               
"jpg|gif|png|jp2|mp3|ogg|avi|wmv|mpeg|mpg|rm|mov|flac|shn)$"
+                               "jpg|jpeg|gif|png|jp2|mp3|ogg|avi|wmv|mpeg|" \
+                               "mpg|rm|mov|flac|shn|pgp|gpg|rz|lzh|zoo|" \
+                               "lharc|rar|arj|asc)$"
 no_compression_regexp = None
 
 # If true, filelists and directory statistics will be split on
--- rdiff-backup.1      2004-09-20 00:18:25.000000000 -0400
+++ new-rdiff-backup.1  2004-09-20 00:38:41.000000000 -0400
@@ -239,8 +239,8 @@
 .TP
 .B "--no-compression-regexp " regexp
 Do not compress increments based on files whose filenames match regexp.
-The default is
-"(?i).*\\.(gz|z|bz|bz2|tgz|zip|rpm|deb|jpg|gif|png|jp2|mp3|ogg|avi|wmv|mpeg|mpg|rm|mov)$"
+The default includes many common audiovisual and archive files, and
+may be found in Globals.py.
 .TP
 .B --no-file-statistics
 This will disable writing to the file_statistics file in the