[ Michael Terry ]
* Merge from debian unstable (LP: #373388), remaining changes:
  - debian/control.in: Add patch as a dependency
  - debian/copyright: Update email address of maintainer
  - debian/patches/only-ignore-fully-blank-changes.patch
* debian/patches/escape-paths.patch:
  - Removed, fixed upstream.

[ James Westby ]
* debian/patches/fix-fr-help-makefile.patch
  - Removed as the directory now exists.
* Added patch tags to the remaining Ubuntu patch.