[Lunar-commits] CVS: moonbase/gnome2-core/gdm BUILD, 1.10,
1.11 DETAILS, 1.14, 1.15 Default, 1.5, 1.6 POST_INSTALL, 1.3,
1.4 gdm.conf, 1.5, 1.6 gnomerc, 1.3, 1.4
Nick Hudson
nhudson at lunar-linux.org
Fri Apr 9 15:08:53 GMT 2004
Update of /var/cvs/lunar/moonbase/gnome2-core/gdm
In directory dbguin.lunar-linux.org:/tmp/cvs-serv12930/gdm
Modified Files:
BUILD DETAILS Default POST_INSTALL gdm.conf gnomerc
Log Message:
Updating to Gnome 2.6.0 Desktop Release, I have to say that cvs merging is alot easier to do than moving the files over by hand. Now go get yourself a 40 and do some updating!
Index: BUILD
===================================================================
RCS file: /var/cvs/lunar/moonbase/gnome2-core/gdm/BUILD,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- BUILD 24 Dec 2003 14:41:07 -0000 1.10
+++ BUILD 9 Apr 2004 15:08:21 -0000 1.11
@@ -12,13 +12,13 @@
LDFLAGS="$LDFLAGS -L/usr/X11R6/lib"
- patch_it $SOURCE_CACHE/$SOURCE2 1 &&
-
./configure --build=$BUILD \
- --prefix=/usr \
+ --prefix=${GNOME26_PREFIX:-/usr} \
--with-xinerama=yes \
--sysconfdir=/etc/X11 \
--localstatedir=/var \
+ --infodir=${GNOME26_PREFIX:-/usr}/share/info \
+ --mandir=${GNOME26_PREFIX:-/usr}/share/man \
$OPTS &&
sedit 's#$(LINK)#$(LINK) $(LIBS)#' daemon/Makefile &&
Index: DETAILS
===================================================================
RCS file: /var/cvs/lunar/moonbase/gnome2-core/gdm/DETAILS,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- DETAILS 19 Oct 2003 04:10:24 -0000 1.14
+++ DETAILS 9 Apr 2004 15:08:21 -0000 1.15
@@ -1,19 +1,16 @@
MODULE=gdm
- VERSION=2.4.4.5
- SOURCE=gdm-$VERSION.tar.bz2
- SOURCE2=$MODULE-pam-config-fix.patch
-SOURCE_DIRECTORY=$BUILD_DIRECTORY/gdm-$VERSION
- SOURCE_URL[0]=$GNOME_URL/sources/gdm/2.4/$SOURCE
- SOURCE_VFY=md5:eae456b3a59154e55d69263aad5e8a54
- SOURCE2_URL[0]=$PATCH_URL/$SOURCE2
- SOURCE2_VFY=md5:931153c30c910389f70e09e26f8a89f2
+ VERSION=2.6.0.0
+ SOURCE=$MODULE-$VERSION.tar.bz2
+SOURCE_DIRECTORY=$BUILD_DIRECTORY/$MODULE-$VERSION
+ SOURCE_URL[0]=$GNOME_URL/sources/$MODULE/2.6/$SOURCE
+ SOURCE_VFY=md5:3dbf4074a4ec78627a5d099d30126d45
WEB_SITE=http://www.gnome.org
ENTERED=20020716
- UPDATED=20031018
+ UPDATED=20040409
SHORT="The Gnome Display Manager is a re-implementation of the well known xdm program"
cat << EOF
The Gnome Display Manager is a re-implementation of the well known xdm
-program. gdm 2.2 implements all significant features required for
+program. gdm 2.5 implements all significant features required for
managing local and remote displays.
gdm daemon:
Index: Default
===================================================================
RCS file: /var/cvs/lunar/moonbase/gnome2-core/gdm/Default,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- Default 20 Jan 2004 23:37:25 -0000 1.5
+++ Default 9 Apr 2004 15:08:21 -0000 1.6
@@ -6,8 +6,6 @@
#
# Note that output goes into the .xsession-errors file for easy debugging
#
-export PATH=$PATH:/opt/lunar/gnome/2.4/bin
-
XSETROOT=`which xsetroot 2>/dev/null`
if [ x$XSETROOT != x ] ; then
$XSETROOT -cursor_name left_ptr -solid "#363047"
Index: POST_INSTALL
===================================================================
RCS file: /var/cvs/lunar/moonbase/gnome2-core/gdm/POST_INSTALL,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- POST_INSTALL 19 Oct 2003 12:06:23 -0000 1.3
+++ POST_INSTALL 9 Apr 2004 15:08:21 -0000 1.4
@@ -3,6 +3,4 @@
if module_installed gnome-session; then lin -c gnome-session; fi
if module_installed gnome-desktop; then lin -c gnome-desktop; fi
-echo "You might want to add /opt/lunar/gnome/2.4/bin to your /etc/profile"
-echo "for now till we can find a better way of doing this. If for some"
-echo "reason you still cant login recompile gnome-session and gnome-desktop"
+
Index: gdm.conf
===================================================================
RCS file: /var/cvs/lunar/moonbase/gnome2-core/gdm/gdm.conf,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- gdm.conf 23 Oct 2003 17:09:03 -0000 1.5
+++ gdm.conf 9 Apr 2004 15:08:21 -0000 1.6
@@ -32,22 +32,22 @@
AlwaysRestartServer=true
# The gdm configuration program that is run from the login screen, you should
# probably leave this alone
-Configurator=/opt/lunar/gnome/2.4/bin/gdmsetup
-GnomeDefaultSession=/opt/lunar/gnome/2.4/share/gnome/default.session
+Configurator=/usr/bin/gdmsetup
+GnomeDefaultSession=/usr/share/gnome/default.session
# The chooser program. Must output the chosen host on stdout, probably you
# should leave this alone
-Chooser=/opt/lunar/gnome/2.4/bin/gdmchooser
+Chooser=/usr/bin/gdmchooser
# Default path to set. The profile scripts will likely override this
-DefaultPath=/usr/local/bin:/opt/lunar/gnome/2.4/bin:/usr/local/bin:/usr/X11R6/bin:/usr/bin:/bin
+DefaultPath=/usr/local/bin:/usr/bin:/usr/local/bin:/usr/X11R6/bin:/usr/bin:/bin
# Default path for root. The profile scripts will likely override this
-RootPath=/sbin:/opt/lunar/gnome/2.4/bin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin
+RootPath=/sbin:/usr/bin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/local/bin
DisplayInitDir=/etc/X11/gdm/Init
# Greeter for local (non-xdmcp) logins. Change gdmlogin to gdmgreeter to
# get the new graphical greeter.
-Greeter=/opt/lunar/gnome/2.4/bin/gdmgreeter
+Greeter=/usr/bin/gdmgreeter
# Greeter for xdmcp logins, usually you want a less graphically intensive
# greeter here so it's better to leave this with gdmlogin
-RemoteGreeter=/opt/lunar/gnome/2.4/bin/gdmlogin
+RemoteGreeter=/usr/bin/gdmlogin
# User and group that gdm should run as. Probably should be gdm and gdm and
# you should create these user and group. Anyone found running this as
# someone too privilaged will get a kick in the ass. This should have
@@ -153,7 +153,7 @@
# The 'theme'. By default we're using the default gtk theme
# Of course assuming that gtk got installed in the same prefix,
# if not change this.
-GtkRC=/opt/lunar/gnome/2.4/share/themes/Default/gtk/gtkrc
+GtkRC=/usr/share/themes/Default/gtk/gtkrc
# Maximum size of an icon, larger icons are scaled down
MaxIconWidth=128
MaxIconHeight=128
@@ -167,21 +167,21 @@
# standard greeter as it is not yet enabled in the graphical greeter.
Browser=false
# The default picture in the browser
-DefaultFace=/opt/lunar/gnome/2.4/share/pixmaps/nobody.png
+DefaultFace=/usr/share/pixmaps/nobody.png
# These are things excluded from the face browser, not from logging in
Exclude=bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,gdm,postgres,pvm,rpm
# As an alternative to the above this is the minimum uid to show
MinimalUID=100
# If user or user.png exists in this dir it will be used as his picture
-GlobalFaceDir=/opt/lunar/gnome/2.4/share/faces/
+GlobalFaceDir=/usr/share/faces/
# Icon we use
-Icon=/opt/lunar/gnome/2.4/share/pixmaps/gdm.png
+Icon=/usr/share/pixmaps/gdm.png
# File which contains the locale we show to the user. Likely you want to use
# the one shipped with gdm and edit it. It is not a standard locale.alias file,
# although gdm will be able to read a standard locale.alias file as well.
LocaleFile=/etc/X11/gdm/locale.alias
# Logo shown in the standard greeter
-Logo=/opt/lunar/gnome/2.4/share/pixmaps/gdm-foot-logo.png
+Logo=/usr/share/pixmaps/gdm-foot-logo.png
# The standard greeter should shake if a user entered the wrong username or
# password. Kind of cool looking
Quiver=true
@@ -233,15 +233,15 @@
# These two keys are for the new greeter. Circles is the standard
# shipped theme
GraphicalTheme=circles
-GraphicalThemeDir=/opt/lunar/gnome/2.4/share/gdm/themes/
+GraphicalThemeDir=/usr/share/gdm/themes/
# The chooser is what's displayed when a user wants an indirect XDMCP
# session
[chooser]
# Default image for hosts
-DefaultHostImg=/opt/lunar/gnome/2.4/share/pixmaps/nohost.png
+DefaultHostImg=/usr/share/pixmaps/nohost.png
# Directory with host images, they are named by the hosts: host or host.png
-HostImageDir=/opt/lunar/gnome/2.4/share/hosts/
+HostImageDir=/usr/share/hosts/
# Time we scan for hosts (well only the time we tell the user we are
# scanning actually)
ScanTime=3
Index: gnomerc
===================================================================
RCS file: /var/cvs/lunar/moonbase/gnome2-core/gdm/gnomerc,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- gnomerc 7 Oct 2003 04:02:44 -0000 1.3
+++ gnomerc 9 Apr 2004 15:08:21 -0000 1.4
@@ -1,6 +1,6 @@
startssh=
sshagent=/usr/bin/ssh-agent
-gnomesession=/opt/lunar/gnome/2.4/bin/gnome-session
+gnomesession=/usr/bin/gnome-session
if [ -x $sshagent -a -z "$SSH_AUTH_SOCK" ]; then
startssh=yes
More information about the Lunar-commits
mailing list