Remove s_conf.c based patches, as they are unnecessary.
Remove some more .orig files.
Change revisions to 15000 and version number to 1.5