Fri Jun 11 13:45:50 2010 UTC ()
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


(drochner)
diff -r1.52 -r1.53 pkgsrc/security/gnome-keyring/Makefile
diff -r1.22 -r1.23 pkgsrc/security/gnome-keyring/PLIST
diff -r1.13 -r1.14 pkgsrc/security/gnome-keyring/buildlink3.mk
diff -r1.36 -r1.37 pkgsrc/security/gnome-keyring/distinfo
diff -r1.1 -r0 pkgsrc/security/gnome-keyring/patches/patch-ac
diff -r1.6 -r1.7 pkgsrc/security/gnome-keyring/patches/patch-ad
diff -r1.2 -r1.3 pkgsrc/security/gnome-keyring/patches/patch-ae
cvs diff -r1.52 -r1.53 pkgsrc/security/gnome-keyring/Makefile (expand / switch to unified diff)

--- pkgsrc/security/gnome-keyring/Makefile 2009/12/15 14:52:03 1.52
+++ pkgsrc/security/gnome-keyring/Makefile 2010/06/11 13:45:50 1.53
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: Makefile,v 1.52 2009/12/15 14:52:03 drochner Exp $ 1# $NetBSD: Makefile,v 1.53 2010/06/11 13:45:50 drochner Exp $
2 2
3DISTNAME= gnome-keyring-2.28.2 3DISTNAME= gnome-keyring-2.30.1
4CATEGORIES= security gnome 4CATEGORIES= security gnome
5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-keyring/2.28/} 5MASTER_SITES= ${MASTER_SITE_GNOME:=sources/gnome-keyring/2.30/}
6EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= http://www.gnome.org/ 9HOMEPAGE= http://www.gnome.org/
10COMMENT= GNOME password and secret manager 10COMMENT= GNOME password and secret manager
11 11
12PKG_DESTDIR_SUPPORT= user-destdir 12PKG_DESTDIR_SUPPORT= user-destdir
13 13
14USE_TOOLS+= gmake intltool msgfmt pkg-config 14USE_TOOLS+= gmake intltool msgfmt pkg-config
15GNU_CONFIGURE= YES 15GNU_CONFIGURE= YES
16USE_LIBTOOL= YES 16USE_LIBTOOL= YES
17USE_PKGLOCALEDIR= YES 17USE_PKGLOCALEDIR= YES
18 18
@@ -30,22 +30,27 @@ CFLAGS.HPUX+= -DMAP_ANON=MAP_ANONYMOUS @@ -30,22 +30,27 @@ CFLAGS.HPUX+= -DMAP_ANON=MAP_ANONYMOUS
30CFLAGS.NetBSD+= -DNO_STATIC_MODULES 30CFLAGS.NetBSD+= -DNO_STATIC_MODULES
31 31
32# Workaround for Upstream Bug#562310. 32# Workaround for Upstream Bug#562310.
33# for more detail, see also PR#41475. 33# for more detail, see also PR#41475.
34TOOLS_NOOP+= gtkdoc-rebase 34TOOLS_NOOP+= gtkdoc-rebase
35 35
36.include "../../mk/dlopen.buildlink3.mk" 36.include "../../mk/dlopen.buildlink3.mk"
37 37
38BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*} 38BUILDLINK_TRANSFORM+= opt:-ldl:${BUILDLINK_LDADD.dl:M*}
39 39
40BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.0 40BUILDLINK_API_DEPENDS.glib2+= glib2>=2.6.0
41BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0 41BUILDLINK_API_DEPENDS.gtk2+= gtk2+>=2.6.0
42 42
 43# XXX not necessary technically, just for transition,
 44# can be removed when all dependant pkgs are switched to
 45# libgnome-keyring if the library is needed
 46.include "../../security/libgnome-keyring/buildlink3.mk"
 47
43.include "../../devel/GConf/schemas.mk" 48.include "../../devel/GConf/schemas.mk"
44.include "../../devel/gettext-lib/buildlink3.mk" 49.include "../../devel/gettext-lib/buildlink3.mk"
45.include "../../devel/glib2/buildlink3.mk" 50.include "../../devel/glib2/buildlink3.mk"
46.include "../../security/libgcrypt/buildlink3.mk" 51.include "../../security/libgcrypt/buildlink3.mk"
47.include "../../security/libtasn1/buildlink3.mk" 52.include "../../security/libtasn1/buildlink3.mk"
48.include "../../sysutils/dbus/buildlink3.mk" 53.include "../../sysutils/dbus/buildlink3.mk"
49.include "../../x11/gtk2/buildlink3.mk" 54.include "../../x11/gtk2/buildlink3.mk"
50.include "../../mk/pam.buildlink3.mk" 55.include "../../mk/pam.buildlink3.mk"
51.include "../../mk/bsd.pkg.mk" 56.include "../../mk/bsd.pkg.mk"
cvs diff -r1.22 -r1.23 pkgsrc/security/gnome-keyring/PLIST (expand / switch to unified diff)

--- pkgsrc/security/gnome-keyring/PLIST 2009/12/15 14:07:22 1.22
+++ pkgsrc/security/gnome-keyring/PLIST 2010/06/11 13:45:50 1.23
@@ -1,98 +1,82 @@ @@ -1,98 +1,82 @@
1@comment $NetBSD: PLIST,v 1.22 2009/12/15 14:07:22 wiz Exp $ 1@comment $NetBSD: PLIST,v 1.23 2010/06/11 13:45:50 drochner Exp $
2bin/gnome-keyring 2bin/gnome-keyring
3bin/gnome-keyring-daemon 3bin/gnome-keyring-daemon
4include/gcr/gcr-certificate-basics-widget.h 4include/gcr/gcr-certificate-basics-widget.h
5include/gcr/gcr-certificate-details-widget.h 5include/gcr/gcr-certificate-details-widget.h
6include/gcr/gcr-certificate.h 6include/gcr/gcr-certificate.h
7include/gcr/gcr-importer.h 7include/gcr/gcr-importer.h
8include/gcr/gcr-parser.h 8include/gcr/gcr-parser.h
9include/gcr/gcr-types.h 9include/gcr/gcr-types.h
 10include/gcr/gcr-unlock-options-widget.h
10include/gcr/gcr.h 11include/gcr/gcr.h
11include/gnome-keyring-1/gnome-keyring-memory.h 
12include/gnome-keyring-1/gnome-keyring-result.h 
13include/gnome-keyring-1/gnome-keyring.h 
14include/gp11/gp11.h 12include/gp11/gp11.h
15include/gp11/pkcs11.h 13include/gp11/pkcs11.h
16include/gp11/pkcs11g.h 14include/gp11/pkcs11g.h
17include/gp11/pkcs11n.h 15include/gp11/pkcs11n.h
18lib/gnome-keyring/devel/gck-ssh-store-standalone.la 16lib/gnome-keyring/devel/gck-ssh-store-standalone.la
19lib/gnome-keyring/devel/gck-user-store-standalone.la 17lib/gnome-keyring/devel/gck-user-store-standalone.la
20lib/gnome-keyring/gnome-keyring-pkcs11.la 18lib/gnome-keyring/gnome-keyring-pkcs11.la
21lib/gnome-keyring/standalone/gck-roots-store-standalone.la 19lib/gnome-keyring/standalone/gck-roots-store-standalone.la
 20lib/gnome-keyring/standalone/gck-secret-store-standalone.la
22lib/libgcr.la 21lib/libgcr.la
23lib/libgnome-keyring.la 
24lib/libgp11.la 22lib/libgp11.la
25lib/pkgconfig/gcr-0.pc 23lib/pkgconfig/gcr-0.pc
26lib/pkgconfig/gnome-keyring-1.pc 
27lib/pkgconfig/gp11-0.pc 24lib/pkgconfig/gp11-0.pc
28lib/security/pam_gnome_keyring.la 25lib/security/pam_gnome_keyring.la
29libexec/gnome-keyring-ask 26libexec/gnome-keyring-prompt
30share/dbus-1/services/org.gnome.keyring.service 27share/dbus-1/services/org.gnome.keyring.service
31share/gconf/schemas/gnome-keyring.schemas 28share/gconf/schemas/gnome-keyring.schemas
32share/gcr/ui/gcr-certificate-basics-widget.ui 29share/gcr/ui/gcr-certificate-basics-widget.ui
33share/gcr/ui/gcr-import-dialog.ui 30share/gcr/ui/gcr-import-dialog.ui
34share/gnome/autostart/gnome-keyring-daemon.desktop 31share/gcr/ui/gcr-unlock-options-widget.ui
35share/gtk-doc/html/gcr/GcrCertificateBasicsWidget.html 32share/gnome-keyring/introspect/introspect-collection.xml
36share/gtk-doc/html/gcr/GcrCertificateDetailsWidget.html 33share/gnome-keyring/introspect/introspect-item.xml
37share/gtk-doc/html/gcr/GcrImporter.html 34share/gnome-keyring/introspect/introspect-prompt.xml
38share/gtk-doc/html/gcr/GcrParser.html 35share/gnome-keyring/introspect/introspect-service.xml
39share/gtk-doc/html/gcr/GcrSimpleCertificate.html 36share/gnome-keyring/introspect/introspect-session.xml
 37share/gnome-keyring/ui/gkd-prompt.ui
 38share/gnome/autostart/gnome-keyring-pkcs11.desktop
 39share/gnome/autostart/gnome-keyring-secrets.desktop
 40share/gnome/autostart/gnome-keyring-ssh.desktop
40share/gtk-doc/html/gcr/ch01.html 41share/gtk-doc/html/gcr/ch01.html
41share/gtk-doc/html/gcr/gcr-GcrImportDialog.html 42share/gtk-doc/html/gcr/gcr-GcrCertificate.html
42share/gtk-doc/html/gcr/gcr-GcrTokenManager.html 43share/gtk-doc/html/gcr/gcr-gcr-certificate-basics-widget.html
43share/gtk-doc/html/gcr/gcr-GcrXxx.html 44share/gtk-doc/html/gcr/gcr-gcr-certificate-details-widget.html
44share/gtk-doc/html/gcr/gcr-gcr-certificate.html 45share/gtk-doc/html/gcr/gcr-gcr-import-dialog.html
 46share/gtk-doc/html/gcr/gcr-gcr-importer.html
 47share/gtk-doc/html/gcr/gcr-gcr-initializer.html
 48share/gtk-doc/html/gcr/gcr-gcr-parser.html
 49share/gtk-doc/html/gcr/gcr-gcr-simple-certificate.html
45share/gtk-doc/html/gcr/gcr-gcr-types.html 50share/gtk-doc/html/gcr/gcr-gcr-types.html
 51share/gtk-doc/html/gcr/gcr-gcr-xxx.html
46share/gtk-doc/html/gcr/gcr.devhelp 52share/gtk-doc/html/gcr/gcr.devhelp
47share/gtk-doc/html/gcr/gcr.devhelp2 53share/gtk-doc/html/gcr/gcr.devhelp2
48share/gtk-doc/html/gcr/home.png 54share/gtk-doc/html/gcr/home.png
49share/gtk-doc/html/gcr/index.html 55share/gtk-doc/html/gcr/index.html
50share/gtk-doc/html/gcr/index.sgml 56share/gtk-doc/html/gcr/index.sgml
51share/gtk-doc/html/gcr/left.png 57share/gtk-doc/html/gcr/left.png
52share/gtk-doc/html/gcr/right.png 58share/gtk-doc/html/gcr/right.png
53share/gtk-doc/html/gcr/style.css 59share/gtk-doc/html/gcr/style.css
54share/gtk-doc/html/gcr/up.png 60share/gtk-doc/html/gcr/up.png
55share/gtk-doc/html/gnome-keyring/ch01.html 61share/gtk-doc/html/gp11/GP11Module.html
56share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-acl.html 62share/gtk-doc/html/gp11/GP11Object.html
57share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-attributes.html 63share/gtk-doc/html/gp11/GP11Session.html
58share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-daemon.html 64share/gtk-doc/html/gp11/GP11Slot.html
59share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-find.html 
60share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-item-info.html 
61share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-items.html 
62share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-keyrings.html 
63share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-memory.html 
64share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-misc.html 
65share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-network.html 
66share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-password.html 
67share/gtk-doc/html/gnome-keyring/gnome-keyring-gnome-keyring-result.html 
68share/gtk-doc/html/gnome-keyring/gnome-keyring.devhelp 
69share/gtk-doc/html/gnome-keyring/gnome-keyring.devhelp2 
70share/gtk-doc/html/gnome-keyring/home.png 
71share/gtk-doc/html/gnome-keyring/index.html 
72share/gtk-doc/html/gnome-keyring/index.sgml 
73share/gtk-doc/html/gnome-keyring/left.png 
74share/gtk-doc/html/gnome-keyring/right.png 
75share/gtk-doc/html/gnome-keyring/style.css 
76share/gtk-doc/html/gnome-keyring/up.png 
77share/gtk-doc/html/gp11/ch01.html 65share/gtk-doc/html/gp11/ch01.html
78share/gtk-doc/html/gp11/gp11-gp11-attribute.html 66share/gtk-doc/html/gp11/gp11-Errors.html
79share/gtk-doc/html/gp11/gp11-gp11-attributes.html 67share/gtk-doc/html/gp11/gp11-GP11Attribute.html
80share/gtk-doc/html/gp11/gp11-gp11-error.html 68share/gtk-doc/html/gp11/gp11-GP11Attributes.html
81share/gtk-doc/html/gp11/gp11-gp11-misc.html 69share/gtk-doc/html/gp11/gp11-Miscellaneous-Functions.html
82share/gtk-doc/html/gp11/gp11-gp11-module.html 
83share/gtk-doc/html/gp11/gp11-gp11-object.html 
84share/gtk-doc/html/gp11/gp11-gp11-session.html 
85share/gtk-doc/html/gp11/gp11-gp11-slot.html 
86share/gtk-doc/html/gp11/gp11.devhelp 70share/gtk-doc/html/gp11/gp11.devhelp
87share/gtk-doc/html/gp11/gp11.devhelp2 71share/gtk-doc/html/gp11/gp11.devhelp2
88share/gtk-doc/html/gp11/home.png 72share/gtk-doc/html/gp11/home.png
89share/gtk-doc/html/gp11/index.html 73share/gtk-doc/html/gp11/index.html
90share/gtk-doc/html/gp11/index.sgml 74share/gtk-doc/html/gp11/index.sgml
91share/gtk-doc/html/gp11/left.png 75share/gtk-doc/html/gp11/left.png
92share/gtk-doc/html/gp11/right.png 76share/gtk-doc/html/gp11/right.png
93share/gtk-doc/html/gp11/style.css 77share/gtk-doc/html/gp11/style.css
94share/gtk-doc/html/gp11/up.png 78share/gtk-doc/html/gp11/up.png
95share/locale/ar/LC_MESSAGES/gnome-keyring.mo 79share/locale/ar/LC_MESSAGES/gnome-keyring.mo
96share/locale/as/LC_MESSAGES/gnome-keyring.mo 80share/locale/as/LC_MESSAGES/gnome-keyring.mo
97share/locale/ast/LC_MESSAGES/gnome-keyring.mo 81share/locale/ast/LC_MESSAGES/gnome-keyring.mo
98share/locale/az/LC_MESSAGES/gnome-keyring.mo 82share/locale/az/LC_MESSAGES/gnome-keyring.mo
cvs diff -r1.13 -r1.14 pkgsrc/security/gnome-keyring/Attic/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/security/gnome-keyring/Attic/buildlink3.mk 2009/08/26 19:56:58 1.13
+++ pkgsrc/security/gnome-keyring/Attic/buildlink3.mk 2010/06/11 13:45:50 1.14
@@ -1,18 +1,21 @@ @@ -1,18 +1,21 @@
1# $NetBSD: buildlink3.mk,v 1.13 2009/08/26 19:56:58 sno Exp $ 1# $NetBSD: buildlink3.mk,v 1.14 2010/06/11 13:45:50 drochner Exp $
2 2
3BUILDLINK_TREE+= gnome-keyring 3BUILDLINK_TREE+= gnome-keyring
4 4
5.if !defined(GNOME_KEYRING_BUILDLINK3_MK) 5.if !defined(GNOME_KEYRING_BUILDLINK3_MK)
6GNOME_KEYRING_BUILDLINK3_MK:= 6GNOME_KEYRING_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.gnome-keyring+= gnome-keyring>=0.4.0 8BUILDLINK_API_DEPENDS.gnome-keyring+= gnome-keyring>=0.4.0
9BUILDLINK_ABI_DEPENDS.gnome-keyring?= gnome-keyring>=2.26.3nb1 9BUILDLINK_ABI_DEPENDS.gnome-keyring?= gnome-keyring>=2.26.3nb1
10BUILDLINK_PKGSRCDIR.gnome-keyring?= ../../security/gnome-keyring 10BUILDLINK_PKGSRCDIR.gnome-keyring?= ../../security/gnome-keyring
11 11
 12# XXX see Makefile
 13.include "../../security/libgnome-keyring/buildlink3.mk"
 14
12.include "../../devel/gettext-lib/buildlink3.mk" 15.include "../../devel/gettext-lib/buildlink3.mk"
13.include "../../devel/glib2/buildlink3.mk" 16.include "../../devel/glib2/buildlink3.mk"
14.include "../../sysutils/dbus/buildlink3.mk" 17.include "../../sysutils/dbus/buildlink3.mk"
15.include "../../x11/gtk2/buildlink3.mk" 18.include "../../x11/gtk2/buildlink3.mk"
16.endif # GNOME_KEYRING_BUILDLINK3_MK 19.endif # GNOME_KEYRING_BUILDLINK3_MK
17 20
18BUILDLINK_TREE+= -gnome-keyring 21BUILDLINK_TREE+= -gnome-keyring
cvs diff -r1.36 -r1.37 pkgsrc/security/gnome-keyring/distinfo (expand / switch to unified diff)

--- pkgsrc/security/gnome-keyring/distinfo 2009/12/15 14:07:22 1.36
+++ pkgsrc/security/gnome-keyring/distinfo 2010/06/11 13:45:50 1.37
@@ -1,10 +1,9 @@ @@ -1,10 +1,9 @@
1$NetBSD: distinfo,v 1.36 2009/12/15 14:07:22 wiz Exp $ 1$NetBSD: distinfo,v 1.37 2010/06/11 13:45:50 drochner Exp $
2 2
3SHA1 (gnome-keyring-2.28.2.tar.bz2) = 099146a0cb3c03683cfc3fe3caaddf5dff00acf8 3SHA1 (gnome-keyring-2.30.1.tar.bz2) = bf7623d8a2bc9013a8109e1e433d0a45e9dd759b
4RMD160 (gnome-keyring-2.28.2.tar.bz2) = 0e09c7274c4c4ea037bc7eb4ff8edaaca53f04f0 4RMD160 (gnome-keyring-2.30.1.tar.bz2) = 70ec1c3e033fbd6ab71bd411750c136ee2e701d1
5Size (gnome-keyring-2.28.2.tar.bz2) = 3009480 bytes 5Size (gnome-keyring-2.30.1.tar.bz2) = 1593050 bytes
6SHA1 (patch-ac) = 550b4ebfdf9ae7653d0174e6857e32c8453f2ca7 6SHA1 (patch-ad) = d49bc78227646b3de3c357cd0f1e90cd38862ee4
7SHA1 (patch-ad) = df4a9a69ca9262066daf2272869ce63471c15bd3 7SHA1 (patch-ae) = e89399e9f179fd4f7e33abbe5b9f26fa54fae849
8SHA1 (patch-ae) = f3e972fb377476b2fef00e8d8416f8adbd0192de 
9SHA1 (patch-af) = 03f4ff07a7b9830dbc5c228efb4d971adfe85d89 8SHA1 (patch-af) = 03f4ff07a7b9830dbc5c228efb4d971adfe85d89
10SHA1 (patch-ag) = 4b6f5510124c58613c5b8ce8782f913cca43a570 9SHA1 (patch-ag) = 4b6f5510124c58613c5b8ce8782f913cca43a570
File Deleted: pkgsrc/security/gnome-keyring/patches/Attic/patch-ac
cvs diff -r1.6 -r1.7 pkgsrc/security/gnome-keyring/patches/Attic/patch-ad (expand / switch to unified diff)

--- pkgsrc/security/gnome-keyring/patches/Attic/patch-ad 2009/03/15 18:14:24 1.6
+++ pkgsrc/security/gnome-keyring/patches/Attic/patch-ad 2010/06/11 13:45:50 1.7
@@ -1,12 +1,21 @@ @@ -1,12 +1,21 @@
1$NetBSD: patch-ad,v 1.6 2009/03/15 18:14:24 jmcneill Exp $ 1$NetBSD: patch-ad,v 1.7 2010/06/11 13:45:50 drochner Exp $
2 2
3--- egg/egg-unix-credentials.c.orig 2009-01-17 18:08:46.000000000 -0500 3--- egg/egg-unix-credentials.c.orig 2009-12-15 04:00:09.000000000 +0000
4+++ egg/egg-unix-credentials.c 4+++ egg/egg-unix-credentials.c
5@@ -130,7 +130,6 @@ egg_unix_credentials_read (int sock, pid 5@@ -127,7 +127,6 @@ egg_unix_credentials_read (int sock, pid
6 cred = (struct sockcred *) CMSG_DATA (&cmsg.hdr); 6 cred = (struct sockcred *) CMSG_DATA (&cmsg.hdr);
7 *pid = 0; 7 *pid = 0;
8 *uid = cred->sc_euid; 8 *uid = cred->sc_euid;
9- set_local_creds(sock, 0); 9- set_local_creds(sock, 0);
10 #elif defined(HAVE_GETPEEREID) /* OpenBSD */ 10 #elif defined(HAVE_GETPEEREID) /* OpenBSD */
11 uid_t euid; 11 uid_t euid;
12 gid_t egid; 12 gid_t egid;
 13@@ -215,7 +214,7 @@ egg_unix_credentials_setup (int sock)
 14 #if defined(LOCAL_CREDS) && !defined(HAVE_CMSGCRED)
 15 int val = 1;
 16 if (setsockopt (sock, 0, LOCAL_CREDS, &val, sizeof (val)) < 0) {
 17- fprintf (stderr, "unable to set LOCAL_CREDS socket option on fd %d\n", fd);
 18+ fprintf (stderr, "unable to set LOCAL_CREDS socket option on fd %d\n", sock);
 19 retval = -1;
 20 }
 21 #endif
cvs diff -r1.2 -r1.3 pkgsrc/security/gnome-keyring/patches/Attic/patch-ae (expand / switch to unified diff)

--- pkgsrc/security/gnome-keyring/patches/Attic/patch-ae 2009/04/16 19:35:29 1.2
+++ pkgsrc/security/gnome-keyring/patches/Attic/patch-ae 2010/06/11 13:45:50 1.3
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-ae,v 1.2 2009/04/16 19:35:29 drochner Exp $ 1$NetBSD: patch-ae,v 1.3 2010/06/11 13:45:50 drochner Exp $
2 2
3--- daemon/Makefile.in.orig 2009-04-12 16:12:50.000000000 +0200 3--- daemon/Makefile.in.orig 2010-04-26 19:47:36.000000000 +0000
4+++ daemon/Makefile.in 4+++ daemon/Makefile.in
5@@ -346,7 +346,7 @@ service_in_files = org.gnome.keyring.ser 5@@ -418,7 +418,7 @@ desktop_in_files = \
6 service_DATA = $(service_in_files:.service.in=.service) 6 gnome-keyring-secrets.desktop.in \
7 service_PATH = $(VALGRIND_RUN)$(bindir) 7 gnome-keyring-ssh.desktop.in
8 desktop_in_files = gnome-keyring-daemon.desktop.in 8
9-desktopdir = $(sysconfdir)/xdg/autostart 9-desktopdir = $(sysconfdir)/xdg/autostart
10+desktopdir = $(PREFIX)/share/gnome/autostart 10+desktopdir = $(PREFIX)/share/gnome/autostart
11 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) 11 desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
12 all: all-recursive 12 all: all-recursive
13  13