svn path=/nixpkgs/trunk/; revision=24357
Also add gnupg1-compatibility symlinks to gnupg2. Most packages should be able to use gnupg2 instead of gnupg1. svn path=/nixpkgs/trunk/; revision=21883