Undo unnecessary changes to upstream

This undoes changes to the upstream source that have no effect on the
Debian build:
  - Makefile stuff that gets bypassed in our build
  - Changes to comments
  - macro Set_LineNum provides a trailing semicolon

This reduces the diff to the original upstream source and therefore
facilitates converting this package to source format 3.0 (quilt).