--- libpgp-sign-perl-0.20.orig/debian/copyright
+++ libpgp-sign-perl-0.20/debian/copyright
@@ -11,7 +11,7 @@
 
 Copyright:
 
-    Copyright 1997, 1998, 1999, 2000, 2002, 2004 Russ Allbery
+    Copyright 1997, 1998, 1999, 2000, 2002, 2004, 2007 Russ Allbery
     <rra@stanford.edu>.  This program is free software; you may
     redistribute it and/or modify it under the same terms as Perl itself.
 
--- libpgp-sign-perl-0.20.orig/debian/rules
+++ libpgp-sign-perl-0.20/debian/rules
@@ -19,21 +19,22 @@
 TMP     = $(CURDIR)/debian/$(PACKAGE)
 PERL   ?= /usr/bin/perl
 
-build: build-stamp
+build: build-arch build-indep
+build-arch:
+build-indep: build-stamp
 build-stamp:
 	dh_testdir
-	$(PERL) Makefile.PL INSTALLDIRS=vendor PGP=/usr/bin/gpg
+	$(PERL) Makefile.PL PGP=/usr/bin/gpg INSTALLDIRS=vendor
 	$(MAKE)
 	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
-ifeq (Makefile,$(wildcard Makefile))
-	$(MAKE) distclean
-endif
+	rm -f build-stamp install-stamp
+	[ ! -f Makefile ] || $(MAKE) distclean
 	rm -f data/trustdb.gpg
-	dh_clean build-stamp install-stamp
+	dh_clean
 
 install: install-stamp
 install-stamp: build-stamp
@@ -42,10 +43,13 @@
 	dh_clean
 	$(MAKE) test
 	$(MAKE) install DESTDIR=$(TMP) PREFIX=/usr
-	rmdir --ignore-fail-on-non-empty --parents $(TMP)/usr/lib/perl5
+	[ ! -d $(TMP)/usr/lib/perl5 ] \
+	    || rmdir --ignore-fail-on-non-empty --parents $(TMP)/usr/lib/perl5
 	touch install-stamp
 
-binary-indep: build install
+binary: binary-arch binary-indep
+binary-arch:
+binary-indep: build-stamp install-stamp
 	dh_testdir
 	dh_testroot
 	dh_installdocs README TODO
@@ -60,6 +64,5 @@
 	dh_md5sums
 	dh_builddeb
 
-binary-arch:
-binary: binary-arch binary-indep
-.PHONY: build clean binary-arch binary-indep binary
+.PHONY: binary binary-arch binary-indep build build-arch build-indep clean
+.PHONY: install
--- libpgp-sign-perl-0.20.orig/debian/compat
+++ libpgp-sign-perl-0.20/debian/compat
@@ -1 +1 @@
-4
+5
--- libpgp-sign-perl-0.20.orig/debian/control
+++ libpgp-sign-perl-0.20/debian/control
@@ -1,10 +1,11 @@
 Source: libpgp-sign-perl
 Section: perl
 Priority: optional
-Build-Depends: debhelper (>= 4.0.2)
+Build-Depends: debhelper (>= 5)
 Build-Depends-Indep: perl (>= 5.8.0-7), gnupg
 Maintainer: Russ Allbery <rra@debian.org>
-Standards-Version: 3.6.2
+Standards-Version: 3.7.3
+Homepage: http://www.eyrie.org/~eagle/software/pgp-sign/
 
 Package: libpgp-sign-perl
 Architecture: all
@@ -14,6 +15,3 @@
  Other PGP implementations are also supported with run-time configuration.
  Secret key passphrases are passed via a pipe, and no temporary files are
  required for signature generation (but are for signature verification).
- .
-  Homepage: http://www.eyrie.org/~eagle/software/pgp-sign/
-
--- libpgp-sign-perl-0.20.orig/debian/changelog
+++ libpgp-sign-perl-0.20/debian/changelog
@@ -1,3 +1,30 @@
+libpgp-sign-perl (0.20-3) unstable; urgency=low
+
+  * Use a better way of removing empty directories created by
+    ExtUtils::MakeMaker.
+
+ -- Russ Allbery <rra@debian.org>  Mon, 18 Feb 2008 12:46:56 -0800
+
+libpgp-sign-perl (0.20-2) unstable; urgency=low
+
+  * Tell Makefile.PL not to create /usr/lib/perl5 and remove the rmdir,
+    which fails with Perl 5.10.
+  * Move Homepage into a real control header.
+  * Update standards version to 3.7.3 (no changes required).
+
+ -- Russ Allbery <rra@debian.org>  Sat, 29 Dec 2007 16:11:50 -0800
+
+libpgp-sign-perl (0.20-1) unstable; urgency=low
+
+  * New upstream version.
+  * Use a better way of running make distclean.
+  * Remove stamp files at the start of the clean rule.
+  * Add build-arch and build-indep targets, just in case.
+  * Update standards version to 3.7.2 (no changes required).
+  * Update debhelper compatibility level to V5.
+
+ -- Russ Allbery <rra@debian.org>  Fri, 27 Apr 2007 21:04:51 -0700
+
 libpgp-sign-perl (0.19-4) unstable; urgency=low
 
   * Providing binary-arch in debian/rules is required by Policy even if
--- libpgp-sign-perl-0.20.orig/debian/watch
+++ libpgp-sign-perl-0.20/debian/watch
@@ -0,0 +1,8 @@
+# watch -- Rules for uscan to find new upstream versions.
+# $Id: watch 162 2005-06-10 22:46:47Z eagle $
+#
+# I don't use this personally since I'm also the upstream maintainer, but
+# it's included for the benefit of automated package analysis systems.
+
+version=3
+http://archives.eyrie.org/software/modules/PGP-Sign-(.*)\.tar\.gz