% git checkout upstream-dfsg
% git merge 1.2.4
% git rm further-evil.bin # if needed
- % git commit -m "upstream version 1.2.4 DFSG-cleaned"
+ % git commit -m "upstream version 1.2.4 DFSG-cleaned" # if needed
% git tag -s 1.2.4+dfsg
% git checkout master
% # proceed with "Importing the release"