Nama - merging an upstream version with git

[Joel Roth <joelz@pobox.com>]

After watching Damyan's termcast/IRC presentation this
morning, I thought I'd try to merge an upstream version 
of Nama.

I followed the Debian Perl Git Guide[1].

To be able to use ssh, I ended up just wiping out
my ~/.ssh/known_hosts file. (Couldn't figure out
how to replace outdated keys.)

The steps I used were:

gbp-clone --all --pristine-tar ssh://git.debian.org/git/pkg-perl/packages/nama.git
uscan
git fetch origin upstream:upstream pristine-tar:pristine-tar
git-import-orig --pristine-tar ../nama_1.076.orig.tar.gz

I resolved the merge conflicts and committed (git commit)

Once again, I'm finding that I'm getting weird results
due to quilt patches being left in an applied state
after building.

Also, I have some confusing stuff in an auto-created
patch debian-changes-1.076.

I'd rather not maintain patches, would prefer
to make the fixes upstream and release another
version.

For now, I would appreciate a review to help decide
what needs done.

Thanks



1. http://pkg-perl.alioth.debian.org/git.html
-- 
Joel Roth