update to 2.30.1

This switches to the gnome-2.30 release branch

pkgsrc note: temporarily add a dependency on libgnome-keyring which
was split out of the old gnome-keyring pkg, so that client pkgs
get the same as before

1 files changed, 31 insertions, 47 deletions

diff --git a/security/gnome-keyring/PLIST b/security/gnome-keyring/PLIST
index 860987ca821..f607a0b20aa 100644
--- a/security/gnome-keyring/PLIST
+++ b/security/gnome-keyring/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.22 2009/12/15 14:07:22 wiz Exp $
+@comment $NetBSD: PLIST,v 1.23 2010/06/11 13:45:50 drochner Exp $
 bin/gnome-keyring
 bin/gnome-keyring-daemon
 include/gcr/gcr-certificate-basics-widget.h
@@ -7,10 +7,8 @@ include/gcr/gcr-certificate.h
 include/gcr/gcr-importer.h
 include/gcr/gcr-parser.h
 include/gcr/gcr-types.h
+include/gcr/gcr-unlock-options-widget.h
 include/gcr/gcr.h
-include/gnome-keyring-1/gnome-keyring-memory.h
-include/gnome-keyring-1/gnome-keyring-result.h
-include/gnome-keyring-1/gnome-keyring.h
 include/gp11/gp11.h
 include/gp11/pkcs11.h
 include/gp11/pkcs11g.h
@@ -19,30 +17,38 @@ lib/gnome-keyring/devel/gck-ssh-store-standalone.la
 lib/gnome-keyring/devel/gck-user-store-standalone.la
 lib/gnome-keyring/gnome-keyring-pkcs11.la
 lib/gnome-keyring/standalone/gck-roots-store-standalone.la
+lib/gnome-keyring/standalone/gck-secret-store-standalone.la
 lib/libgcr.la
-lib/libgnome-keyring.la
 lib/libgp11.la
 lib/pkgconfig/gcr-0.pc
-lib/pkgconfig/gnome-keyring-1.pc
 lib/pkgconfig/gp11-0.pc
 lib/security/pam_gnome_keyring.la
-libexec/gnome-keyring-ask
+libexec/gnome-keyring-prompt
 share/dbus-1/services/org.gnome.keyring.service
 share/gconf/schemas/gnome-keyring.schemas
 share/gcr/ui/gcr-certificate-basics-widget.ui
 share/gcr/ui/gcr-import-dialog.ui
-share/gnome/autostart/gnome-keyring-daemon.desktop
-share/gtk-doc/html/gcr/GcrCertificateBasicsWidget.html
-share/gtk-doc/html/gcr/GcrCertificateDetailsWidget.html
-share/gtk-doc/html/gcr/GcrImporter.html
-share/gtk-doc/html/gcr/GcrParser.html
-share/gtk-doc/html/gcr/GcrSimpleCertificate.html
+share/gcr/ui/gcr-unlock-options-widget.ui
+share/gnome-keyring/introspect/introspect-collection.xml
+share/gnome-keyring/introspect/introspect-item.xml
+share/gnome-keyring/introspect/introspect-prompt.xml
+share/gnome-keyring/introspect/introspect-service.xml
+share/gnome-keyring/introspect/introspect-session.xml
+share/gnome-keyring/ui/gkd-prompt.ui
+share/gnome/autostart/gnome-keyring-pkcs11.desktop
+share/gnome/autostart/gnome-keyring-secrets.desktop
+share/gnome/autostart/gnome-keyring-ssh.desktop
 share/gtk-doc/html/gcr/ch01.html
-share/gtk-doc/html/gcr/gcr-GcrImportDialog.html
-share/gtk-doc/html/gcr/gcr-GcrTokenManager.html
-share/gtk-doc/html/gcr/gcr-GcrXxx.html
-share/gtk-doc/html/gcr/gcr-gcr-certificate.html
+share/gtk-doc/html/gcr/gcr-GcrCertificate.html
+share/gtk-doc/html/gcr/gcr-gcr-certificate-basics-widget.html
+share/gtk-doc/html/gcr/gcr-gcr-certificate-details-widget.html
+share/gtk-doc/html/gcr/gcr-gcr-import-dialog.html
+share/gtk-doc/html/gcr/gcr-gcr-importer.html
+share/gtk-doc/html/gcr/gcr-gcr-initializer.html
+share/gtk-doc/html/gcr/gcr-gcr-parser.html
+share/gtk-doc/html/gcr/gcr-gcr-simple-certificate.html
 share/gtk-doc/html/gcr/gcr-gcr-types.html
+share/gtk-doc/html/gcr/gcr-gcr-xxx.html
 share/gtk-doc/html/gcr/gcr.devhelp
 share/gtk-doc/html/gcr/gcr.devhelp2
 share/gtk-doc/html/gcr/home.png
@@ -52,37 +58,15 @@ share/gtk-doc/html/gcr/left.png
 share/gtk-doc/html/gcr/right.png
 share/gtk-doc/html/gcr/style.css
 share/gtk-doc/html/gcr/up.png
-share/gtk-doc/html/gnome-keyring/ch01.html
-share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-acl.html
-share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-attributes.html
-share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-daemon.html
-share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-find.html
-share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-item-info.html
-share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-items.html
-share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-keyrings.html
-share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-memory.html
-share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-misc.html
-share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-network.html
-share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-password.html
-share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-result.html
-share/gtk-doc/html/gnome-keyring/gnome-keyring.devhelp
-share/gtk-doc/html/gnome-keyring/gnome-keyring.devhelp2
-share/gtk-doc/html/gnome-keyring/home.png
-share/gtk-doc/html/gnome-keyring/index.html
-share/gtk-doc/html/gnome-keyring/index.sgml
-share/gtk-doc/html/gnome-keyring/left.png
-share/gtk-doc/html/gnome-keyring/right.png
-share/gtk-doc/html/gnome-keyring/style.css
-share/gtk-doc/html/gnome-keyring/up.png
+share/gtk-doc/html/gp11/GP11Module.html
+share/gtk-doc/html/gp11/GP11Object.html
+share/gtk-doc/html/gp11/GP11Session.html
+share/gtk-doc/html/gp11/GP11Slot.html
 share/gtk-doc/html/gp11/ch01.html
-share/gtk-doc/html/gp11/gp11-gp11-attribute.html
-share/gtk-doc/html/gp11/gp11-gp11-attributes.html
-share/gtk-doc/html/gp11/gp11-gp11-error.html
-share/gtk-doc/html/gp11/gp11-gp11-misc.html
-share/gtk-doc/html/gp11/gp11-gp11-module.html
-share/gtk-doc/html/gp11/gp11-gp11-object.html
-share/gtk-doc/html/gp11/gp11-gp11-session.html
-share/gtk-doc/html/gp11/gp11-gp11-slot.html
+share/gtk-doc/html/gp11/gp11-Errors.html
+share/gtk-doc/html/gp11/gp11-GP11Attribute.html
+share/gtk-doc/html/gp11/gp11-GP11Attributes.html
+share/gtk-doc/html/gp11/gp11-Miscellaneous-Functions.html
 share/gtk-doc/html/gp11/gp11.devhelp
 share/gtk-doc/html/gp11/gp11.devhelp2
 share/gtk-doc/html/gp11/home.png