Gnupg1compat is symlinked gnupg2 with two additional symlinks: gpg->gpg2 and gpgv->gpgv2. Move original gnupg 1.x to gnupg1orig. Set default gnupg1 to gnupg1compat. svn path=/nixpkgs/trunk/; revision=21888
