Update: mentors.debian.net seems to allow re-uploads, so I fixed two issues I wrote about in previous message. Updated diff can be found here at http://paste.ubuntu.com/800258/.