Merge remote-tracking branch 'origin/next' into thirteen

[people/teissler/ipfire-2.x.git] / config / rootfiles / common / gnupg

diff --git a/config/rootfiles/common/gnupg b/config/rootfiles/common/gnupg
index a8a2160a09defedb04e577db6b2e0190cb1d80cf..9aecc418a3294ec51a8ecff932b9e3a4e9d17dd3 100644 (file)
--- a/config/rootfiles/common/gnupg
+++ b/config/rootfiles/common/gnupg
@@ -1,22 +1,18 @@
-#root/.gnupg
-root/.gnupg/gpg.conf
-root/.gnupg/pubring.gpg
-root/.gnupg/pubring.gpg~
-root/.gnupg/secring.gpg
-root/.gnupg/trustdb.gpg
 usr/bin/gpg
 #usr/bin/gpg-zip
 #usr/bin/gpgsplit
 #usr/bin/gpgv
-#usr/info/gpg.info
-#usr/info/gpgv.info
-#usr/libexec
-#usr/libexec/gnupg
-#usr/man/man1/gpg.1
-#usr/man/man1/gpg.ru.1
-#usr/man/man1/gpgv.1
-#usr/man/man7/gnupg.7
+#usr/lib/gnupg
+usr/lib/gnupg/gpgkeys_curl
+usr/lib/gnupg/gpgkeys_finger
+usr/lib/gnupg/gpgkeys_hkp
+usr/lib/gnupg/gpgkeys_ldap
 #usr/share/gnupg
 #usr/share/gnupg/FAQ
-#usr/share/gnupg/faq.html
 #usr/share/gnupg/options.skel
+#usr/share/info/gnupg1.info
+#usr/share/man/man1/gpg-zip.1
+#usr/share/man/man1/gpg.1
+#usr/share/man/man1/gpg.ru.1
+#usr/share/man/man1/gpgv.1
+#usr/share/man/man7/gnupg.7