Update for new upstream location and new upstream release. (Closes: #728138)
Adapt copyright and watch file to new upstream location.
drop override as the bug behind it is fixed