Poor man's merge of 7.4.1+dfsg-0.1.

Since I used the script to make my upstream tree and .orig.tar.gz in
the first place, I don't need to do that again, and it would be a
hassle to import the repacked source tree used in this version of the
package, so I'm just importing the changelog entries and the shebang
change.