Note: the page-margins patch is NOT actually upstream in the snapshot that is currently imported. It is in the latest one though. I am respinning the package with the fixed tarball.