The xlockmore copyright is okay, so I'm moving it into the `x11' subdirectory rather than `non-free'. The announcement said that it would be moved to `non-free'.