Fix mapdepends to full dependency lines and also include Pre-Depends.