dh-make-perl cache is broken in oneiric

When trying to use d-m-p in Oneiric I get the following error:

philsf@philsf-workstation:~/doutorado/projetos/trepid/trunk/TRepid-0.9.1$ dh-make-perl -p trepid
Using META.yml
Found: TRepid 0.9.1 (trepid arch=all)
Using cached Contents from Wed Jan 4 16:12:11 2012
Can't use an undefined value as a HASH reference at /usr/share/perl5/Debian/WNPP/Query.pm line 75.

This bug was recently fixed in debian, and the specific patch is available in (also attached):
http://anonscm.debian.org/gitweb/?p=pkg-perl/packages/dh-make-perl.git;a=commit;h=dff932cc4fc852542dd1821449b3e659c46f1a0a

Additionally, if (or when) ubuntu syncs with debian for version 0.74 it will also break because of a change in apt-file from debian that was reverted in ubuntu, which makes dependencies not locatable. Here's a transcript of a short summary of the issue regarding apt-file as discussed in #debian-perl in OFTC:

<gregoa> maybe nhandler (both active in ubuntu and in our group) can help here.
<gregoa> nhandler: short summary: dh-make-perl 0.74 will have a problem in ubuntu because it was adjusted to apt-file 2.5.0 in debian, and ubuntu has reverted this apt-file change (location/name of Contents files)
<gregoa> nhandler: if this difference in apt-file persists, dh-make-perl needs to revert the relevant commits in ubuntu too
<ansgar> Or it needs to look in both locations.

ProblemType: Bug
DistroRelease: Ubuntu 11.10
Package: dh-make-perl 0.73-1
ProcVersionSignature: Ubuntu 3.0.0-14.23-generic 3.0.9
Uname: Linux 3.0.0-14-generic i686
NonfreeKernelModules: nvidia
ApportVersion: 1.23-0ubuntu4
Architecture: i386
Date: Tue Jan 10 19:16:28 2012
InstallationMedia: Ubuntu 10.04 LTS "Lucid Lynx" - Release i386 (20100429)
PackageArchitecture: all
ProcEnviron:
 LANGUAGE=en_US:en
 PATH=(custom, user)
 LANG=pt_BR.utf8
 SHELL=/bin/bash
SourcePackage: dh-make-perl
UpgradeStatus: Upgraded to oneiric on 2011-10-24 (78 days ago)