Fri Apr 25 04:02:23 2008 UTC ()
Patch data/Makefile.in not to install share/xsessions/gnome.desktop;
this conflicts with the file gdm installs.  Given that gdm has always
done this and that gdm's file uses dbus, let's keep the status quo for now.

Thanks to jmcneill@ for reporting this.


(bjs)
diff -r1.20 -r1.21 pkgsrc/x11/gnome-session/PLIST
diff -r1.35 -r1.36 pkgsrc/x11/gnome-session/distinfo
diff -r0 -r1.11 pkgsrc/x11/gnome-session/patches/patch-ac
cvs diff -r1.20 -r1.21 pkgsrc/x11/gnome-session/PLIST (expand / switch to unified diff)

--- pkgsrc/x11/gnome-session/PLIST 2008/04/15 18:06:15 1.20
+++ pkgsrc/x11/gnome-session/PLIST 2008/04/25 04:02:23 1.21
@@ -1,14 +1,14 @@ @@ -1,14 +1,14 @@
1@comment $NetBSD: PLIST,v 1.20 2008/04/15 18:06:15 drochner Exp $ 1@comment $NetBSD: PLIST,v 1.21 2008/04/25 04:02:23 bjs Exp $
2bin/gnome-session 2bin/gnome-session
3bin/gnome-session-properties 3bin/gnome-session-properties
4bin/gnome-session-remove 4bin/gnome-session-remove
5bin/gnome-session-save 5bin/gnome-session-save
6bin/gnome-wm 6bin/gnome-wm
7man/man1/gnome-session-save.1 7man/man1/gnome-session-save.1
8man/man1/gnome-session.1 8man/man1/gnome-session.1
9man/man1/gnome-wm.1 9man/man1/gnome-wm.1
10man/man1/session-properties.1 10man/man1/session-properties.1
11man/man5/default.session.5 11man/man5/default.session.5
12share/applications/session-properties.desktop 12share/applications/session-properties.desktop
13share/gconf/schemas/gnome-session.schemas 13share/gconf/schemas/gnome-session.schemas
14share/gnome/default.session 14share/gnome/default.session
@@ -95,25 +95,24 @@ share/locale/te/LC_MESSAGES/gnome-sessio @@ -95,25 +95,24 @@ share/locale/te/LC_MESSAGES/gnome-sessio
95share/locale/th/LC_MESSAGES/gnome-session-2.0.mo 95share/locale/th/LC_MESSAGES/gnome-session-2.0.mo
96share/locale/tk/LC_MESSAGES/gnome-session-2.0.mo 96share/locale/tk/LC_MESSAGES/gnome-session-2.0.mo
97share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo 97share/locale/tr/LC_MESSAGES/gnome-session-2.0.mo
98share/locale/uk/LC_MESSAGES/gnome-session-2.0.mo 98share/locale/uk/LC_MESSAGES/gnome-session-2.0.mo
99share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo 99share/locale/vi/LC_MESSAGES/gnome-session-2.0.mo
100share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo 100share/locale/wa/LC_MESSAGES/gnome-session-2.0.mo
101share/locale/xh/LC_MESSAGES/gnome-session-2.0.mo 101share/locale/xh/LC_MESSAGES/gnome-session-2.0.mo
102share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo 102share/locale/zh_CN/LC_MESSAGES/gnome-session-2.0.mo
103share/locale/zh_HK/LC_MESSAGES/gnome-session-2.0.mo 103share/locale/zh_HK/LC_MESSAGES/gnome-session-2.0.mo
104share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo 104share/locale/zh_TW/LC_MESSAGES/gnome-session-2.0.mo
105share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo 105share/locale/zu/LC_MESSAGES/gnome-session-2.0.mo
106share/pixmaps/splash/gnome-splash-orig.png 106share/pixmaps/splash/gnome-splash-orig.png
107share/pixmaps/splash/gnome-splash.png 107share/pixmaps/splash/gnome-splash.png
108share/xsessions/gnome.desktop 
109@dirrm share/pixmaps/splash 108@dirrm share/pixmaps/splash
110@comment in xdg-dirs: @dirrm share/pixmaps 109@comment in xdg-dirs: @dirrm share/pixmaps
111@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps 110@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/scalable/apps
112@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps 111@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/32x32/apps
113@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24/apps 112@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/24x24/apps
114@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps 113@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/22x22/apps
115@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps 114@comment in hicolor-icon-theme: @dirrm share/icons/hicolor/16x16/apps
116@comment in hicolor-icon-theme: @dirrm share/icons/hicolor 115@comment in hicolor-icon-theme: @dirrm share/icons/hicolor
117@comment in gnome2-dirs: @dirrm share/gnome 116@comment in gnome2-dirs: @dirrm share/gnome
118@comment in GConf: @dirrm share/gconf/schemas 117@comment in GConf: @dirrm share/gconf/schemas
119@comment in xdg-dirs: @dirrm share/applications 118@comment in xdg-dirs: @dirrm share/applications
cvs diff -r1.35 -r1.36 pkgsrc/x11/gnome-session/distinfo (expand / switch to unified diff)

--- pkgsrc/x11/gnome-session/distinfo 2008/04/15 18:06:15 1.35
+++ pkgsrc/x11/gnome-session/distinfo 2008/04/25 04:02:23 1.36
@@ -1,10 +1,11 @@ @@ -1,10 +1,11 @@
1$NetBSD: distinfo,v 1.35 2008/04/15 18:06:15 drochner Exp $ 1$NetBSD: distinfo,v 1.36 2008/04/25 04:02:23 bjs Exp $
2 2
3SHA1 (gnome-session-2.22.1.1.tar.bz2) = 54ba733ec8c8530a1f9c03b9f11d66bf3e666163 3SHA1 (gnome-session-2.22.1.1.tar.bz2) = 54ba733ec8c8530a1f9c03b9f11d66bf3e666163
4RMD160 (gnome-session-2.22.1.1.tar.bz2) = 0d8b26f95cee389e8aefd05251e16b7cd3703aa3 4RMD160 (gnome-session-2.22.1.1.tar.bz2) = 0d8b26f95cee389e8aefd05251e16b7cd3703aa3
5Size (gnome-session-2.22.1.1.tar.bz2) = 773504 bytes 5Size (gnome-session-2.22.1.1.tar.bz2) = 773504 bytes
6SHA1 (gnome-splash-2.16.0.png) = 0d321be84c5668a2c0fecb494edc820d6b74ee9d 6SHA1 (gnome-splash-2.16.0.png) = 0d321be84c5668a2c0fecb494edc820d6b74ee9d
7RMD160 (gnome-splash-2.16.0.png) = 28667abaaef6ac20dde9f4101554a5043b4f9c96 7RMD160 (gnome-splash-2.16.0.png) = 28667abaaef6ac20dde9f4101554a5043b4f9c96
8Size (gnome-splash-2.16.0.png) = 36601 bytes 8Size (gnome-splash-2.16.0.png) = 36601 bytes
9SHA1 (patch-aa) = 7cb4092f21ee08b7e7248df2cff677b678da22ec 9SHA1 (patch-aa) = 7cb4092f21ee08b7e7248df2cff677b678da22ec
10SHA1 (patch-ab) = b274bbe433151383ee0f2117dd2fb5746920be75 10SHA1 (patch-ab) = b274bbe433151383ee0f2117dd2fb5746920be75
 11SHA1 (patch-ac) = 35cc0f0982cb8ed711a4ebc45d2e9570725cbf95
File Added: pkgsrc/x11/gnome-session/patches/Attic/patch-ac
$NetBSD: patch-ac,v 1.11 2008/04/25 04:02:23 bjs Exp $

--- data/Makefile.in.orig	2008-04-10 10:34:02.000000000 -0400
+++ data/Makefile.in
@@ -628,8 +628,8 @@ info: info-recursive
 info-am:
 
 install-data-am: install-data-local install-defaultDATA \
-	install-pixmapDATA install-schemasDATA install-settingsDATA \
-	install-xsessionDATA
+	install-pixmapDATA install-schemasDATA install-settingsDATA
+#	install-xsessionDATA
 
 install-dvi: install-dvi-recursive