diff -u libtest-portability-files-perl-0.05/debian/control libtest-portability-files-perl-0.05/debian/control
--- libtest-portability-files-perl-0.05/debian/control
+++ libtest-portability-files-perl-0.05/debian/control
@@ -1,10 +1,10 @@
 Source: libtest-portability-files-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 7)
+Build-Depends: debhelper (>= 7.0.8), quilt (>= 0.46-7)
 Build-Depends-Indep: perl (>= 5.6.0-12), libtest-pod-perl, libtest-pod-coverage-perl
 Maintainer: Debian Perl Group <pkg-perl-maintainers@lists.alioth.debian.org>
-Uploaders: Peter Pentchev <roam@ringlet.net>
+Uploaders: Peter Pentchev <roam@ringlet.net>, Jonathan Yu <frequency@cpan.org>
 Standards-Version: 3.8.1
 Homepage: http://search.cpan.org/dist/Test-Portability-Files/
 Vcs-Svn: svn://svn.debian.org/pkg-perl/trunk/libtest-portability-files-perl/
diff -u libtest-portability-files-perl-0.05/debian/watch libtest-portability-files-perl-0.05/debian/watch
--- libtest-portability-files-perl-0.05/debian/watch
+++ libtest-portability-files-perl-0.05/debian/watch
@@ -2 +2 @@
-http://search.cpan.org/dist/Test-Portability-Files/   .*/Test-Portability-Files-v?(\d[\d_.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$
+http://search.cpan.org/dist/Test-Portability-Files/   .*/Test-Portability-Files-v?(\d[\d.-]+)\.(?:tar(?:\.gz|\.bz2)?|tgz|zip)$
diff -u libtest-portability-files-perl-0.05/debian/changelog libtest-portability-files-perl-0.05/debian/changelog
--- libtest-portability-files-perl-0.05/debian/changelog
+++ libtest-portability-files-perl-0.05/debian/changelog
@@ -1,3 +1,18 @@
+libtest-portability-files-perl (0.05-2) unstable; urgency=low
+
+  [ Jonathan Yu ]
+  * Applied a patch from Chris Dolan (RT#21631) to fix issue with setting
+    tests to false.
+
+  [ Nathan Handler ]
+  * debian/watch: Update to ignore development releases.
+
+  [ Damyan Ivanov ]
+  * Add debian/README.source to document quilt usage, as required by
+    Debian Policy since 3.8.0.
+
+ -- Jonathan Yu <frequency@cpan.org>  Sun, 14 Jun 2009 15:17:52 -0400
+
 libtest-portability-files-perl (0.05-1) unstable; urgency=low
 
   * Initial Release. (Closes: #519771)
diff -u libtest-portability-files-perl-0.05/debian/rules libtest-portability-files-perl-0.05/debian/rules
--- libtest-portability-files-perl-0.05/debian/rules
+++ libtest-portability-files-perl-0.05/debian/rules
@@ -2,4 +2,3 @@
-# debhelper rules for building the Test::Portability::Files Perl module
 
 %:
-	dh $@
+	dh --with quilt $@
only in patch2:
unchanged:
--- libtest-portability-files-perl-0.05.orig/debian/README.source
+++ libtest-portability-files-perl-0.05/debian/README.source
@@ -0,0 +1,5 @@
+This package uses quilt to manage all modifications to the upstream
+source.  Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.
only in patch2:
unchanged:
--- libtest-portability-files-perl-0.05.orig/debian/patches/negative_options.patch
+++ libtest-portability-files-perl-0.05/debian/patches/negative_options.patch
@@ -0,0 +1,27 @@
+Author: Chris Dolan <cdolan@cpan.org>
+Applied-By: Jonathan Yu <frequency@cpan.org>
+Debian-Specific: no
+Bug: http://rt.cpan.org/Public/Bug/Display.html?id=21631
+Description: Fix negative options (setting test to false)
+ Test::Portability::Files has had a problem (since its last release circa 2006)
+ with turning off tests. While you do get the choice of enabling tests, you
+ cannot disable tests -- thus leaving you with a superset of the defaults +
+ whatever extra tests you have enabled.
+--- a/lib/Test/Portability/Files.pm
++++ b/lib/Test/Portability/Files.pm
+@@ -276,12 +276,12 @@
+ sub options {
+     my %opts = @_;
+     for my $test (keys %tests) {
+-        $tests{$test} = $opts{"test_$test"} if $opts{"test_$test"}
++        $tests{$test} = $opts{"test_$test"} if exists $opts{"test_$test"}
+     }
+     for my $opt (keys %options) {
+-        $options{$opt} = $opts{$opt} if $opts{$opt}
++        $options{$opt} = $opts{$opt} if exists $opts{$opt}
+     }
+-    @tests{keys %tests} = (1)x(keys %tests) if $opts{all_tests};
++    @tests{keys %tests} = (1)x(keys %tests) if exists $opts{all_tests};
+ }
+ 
+ =item C<test_name_portability()>
only in patch2:
unchanged:
--- libtest-portability-files-perl-0.05.orig/debian/patches/series
+++ libtest-portability-files-perl-0.05/debian/patches/series
@@ -0,0 +1 @@
+negative_options.patch