B3 mixed commit (eg made by an NMUer)
# upstream releases
- -p- special merge, takes contents of debian/ from the
+ -p- anchor merge, takes contents of debian/ from the
/ previous `breakwater' commit and rest from upstream
-/- pseudomerge; contents are identical to