diff -Nru pdumpfs-1.3/debian/changelog pdumpfs-1.3/debian/changelog --- pdumpfs-1.3/debian/changelog 2012-04-26 10:42:44.000000000 +0000 +++ pdumpfs-1.3/debian/changelog 2012-04-27 12:12:40.000000000 +0000 @@ -1,8 +1,8 @@ -pdumpfs (1.3-3+ppa4.1) oneiric; urgency=low +pdumpfs (1.3-3+ppa4.2) oneiric; urgency=low * - -- Sawa (ikoinoba) Sun, 27 Nov 2011 00:51:11 +0900 + -- Sawa (ikoinoba) Fri, 27 Apr 2012 20:32:06 +0900 pdumpfs (1.3-3) unstable; urgency=low diff -Nru pdumpfs-1.3/debian/patches/support_ruby1.9.diff pdumpfs-1.3/debian/patches/support_ruby1.9.diff --- pdumpfs-1.3/debian/patches/support_ruby1.9.diff 2012-04-26 10:26:16.000000000 +0000 +++ pdumpfs-1.3/debian/patches/support_ruby1.9.diff 2012-04-27 11:25:17.000000000 +0000 @@ -1,6 +1,12 @@ diff -uNr pdumpfs-1.3.orig/pdumpfs.in pdumpfs-1.3/pdumpfs.in --- pdumpfs-1.3.orig/pdumpfs.in 2004-12-21 11:43:12.000000000 +0900 -+++ pdumpfs-1.3/pdumpfs.in 2012-04-26 19:25:33.950002824 +0900 ++++ pdumpfs-1.3/pdumpfs.in 2012-04-27 20:25:05.937325714 +0900 +@@ -1,4 +1,4 @@ +-#! /usr/bin/env ruby ++#!/usr/bin/env ruby + # + # pdumpfs - a daily backup system similar to Plan9's dumpfs. + # @@ -48,21 +48,21 @@ # @@ -45,7 +51,24 @@ drive = File.expand_path(path)[0..2] buff = "\0" * 1024 -@@ -868,7 +868,7 @@ +@@ -807,12 +807,14 @@ + end + + def exclude? (path) ++ if @patterns.find {|pattern| pattern.match(path) } ++ return true ++ end ++ + stat = File.lstat(path) + + if @size >= 0 and stat.file? and stat.size >= @size + return true +- elsif @patterns.find {|pattern| pattern.match(path) } +- return true + elsif stat.file? and + @globs.find {|glob| File.fnmatch(glob, File.basename(path)) } + return true +@@ -868,7 +870,7 @@ today = File.join(dest, datedir(start_time), base) File.umask(0077) @@ -54,7 +77,7 @@ if latest update_snapshot(src, latest, today) else -@@ -1018,7 +1018,7 @@ +@@ -1018,7 +1020,7 @@ case type when "directory" @@ -63,7 +86,16 @@ when "unchanged" File.force_link(latest, today) when "updated" -@@ -1089,7 +1089,7 @@ +@@ -1052,7 +1054,7 @@ + + Find.find(src) do |s| # path of the source file + if @matcher.exclude?(s) +- if File.lstat(s).directory? then Find.prune() else next end ++ if FileTest.directory?(s) then Find.prune() else next end + end + r = make_relative_path(s, src) + l = File.join(latest, r) # path of the latest snapshot +@@ -1089,7 +1091,7 @@ case type when "directory"