more tinkering with apt patches

move some of the bigger ones to reinplaces or scripts, so that I can
focus on patching other aspects of files without worrying about them
conflicting with the giant patch