summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--NEWS13
-rw-r--r--config/Makefile.am10
-rw-r--r--configure.in2
4 files changed, 25 insertions, 9 deletions
diff --git a/ChangeLog b/ChangeLog
index 72b168ea..2960c56f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Tue Jun 10 16:54:04 2003 George Lebl <jirka@5z.com>
+
+ * Release 2.4.2.95
+
+ * config/Makefile.am: dist fixes
+
Tue Jun 10 16:47:59 2003 George Lebl <jirka@5z.com>
* daemon/slave.c: Fix the session setup, and get rid of the quoting
@@ -55,7 +61,8 @@ Mon Jun 09 17:01:27 2003 George Lebl <jirka@5z.com>
Also store preferences such as last session and language in .dmrc.
The session desktops are now in /etc/X11/dm/Sessions since they can
be shared by kdm as well in the future. The setup needs a bit
- more tuning I think and it's not all tested.
+ more tuning I think and it's not all tested. Also remove the
+ GNOME chooser session stuff while I was at it.
Mon Jun 09 Brian Cameron <Brian.Cameron@Sun.COM>
diff --git a/NEWS b/NEWS
index 75eb653d..d0d70918 100644
--- a/NEWS
+++ b/NEWS
@@ -1,12 +1,14 @@
Ahh news...
-2.4.2.x stuff:
+2.4.2.95 stuff:
- Completely new session setup, born out of discussions with Oswald
Buddenhagen, the KDM maintainer, which will bring about common session
setup for both GDM and KDM. We now basically have a common
/etc/X11/dm/Sessions directory where there are .desktop files are stored
which describe sessions and these will be shared among KDM and GDM.
+ Among other things this also makes the face browser default to using
+ ~/.face and the per user saved info is in ~/.dmrc
- The greeter.dtd is updated and there is theme creation documentation
(Brian Cameron, Aidan Butler, me)
@@ -50,6 +52,9 @@ Ahh news...
and so that was removed. This way hopefully we should work with some more
pam setups, such as smartcard ones. Fixes issues from #106537
+- The GNOME session chooser stuff is removed since it wasn't working all
+ right anyway and was kind of icky.
+
- The F10 menu in the graphical greeter is nicer.
- When you doubleclick on the radiobutton in graphical greeter Actions
@@ -117,7 +122,11 @@ Ahh news...
- Solaris fixes (Brian Cameron, Niall Power)
- Translation updates, language additions and such (Danilo Aegan,
- Guntupalli Karunakar, Abel Cheung, me)
+ Guntupalli Karunakar, Abel Cheung, me, Christian Rose, Christophe Merlet,
+ Jordi Mallach, Christian Neumair, Miroslav Trmac, Pablo Gonzalo del Campo,
+ Hasbullah Bin Pit, Vincent van Adrighem, Evandro Fernandes Giovanini,
+ David Barzilay, Lucas 'Basurero' Vieites, Duarte Loreto, Kostas Papadimas,
+ KAMAGASAKO Masatoshi, Dmitry G. Mastrukov)
2.4.1.4 stuff:
diff --git a/config/Makefile.am b/config/Makefile.am
index 722680d2..aa851245 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -38,7 +38,7 @@ install-data-hook: gdm.conf Xsession gnome.desktop Default.desktop Default PostS
$(mkinstalldirs) $(DESTDIR)$(confdir); \
chmod 755 $(DESTDIR)$(confdir); \
fi
- -if cmp -s $(DESTDIR)$(confdir)/gdm.conf $(DESTDIR)$(confdir)/factory-gdm.conf 2>&1 /dev/null ; then \
+ -if cmp -s $(DESTDIR)$(confdir)/gdm.conf $(DESTDIR)$(confdir)/factory-gdm.conf > /dev/null 2>&1 ; then \
cp -f $(DESTDIR)$(confdir)/gdm.conf $(DESTDIR)$(confdir)/gdm.conf.orig; \
$(INSTALL_DATA) gdm.conf $(DESTDIR)$(confdir)/gdm.conf; \
fi
@@ -48,7 +48,7 @@ install-data-hook: gdm.conf Xsession gnome.desktop Default.desktop Default PostS
$(INSTALL_DATA) gdm.conf $(DESTDIR)$(confdir)/factory-gdm.conf
$(INSTALL_SCRIPT) $(srcdir)/XKeepsCrashing $(DESTDIR)$(confdir)/XKeepsCrashing
- $(INSTALL_SCRIPT) $(srcdir)/Xsession $(DESTDIR)$(confdir)/Xsession
+ $(INSTALL_SCRIPT) Xsession $(DESTDIR)$(confdir)/Xsession
-if test -f $(DESTDIR)$(localedir)/locale.alias; then \
cp -f $(DESTDIR)$(localedir)/locale.alias $(DESTDIR)$(localedir)/locale.alias.orig; \
@@ -77,7 +77,7 @@ install-data-hook: gdm.conf Xsession gnome.desktop Default.desktop Default PostS
-if test -f $(DESTDIR)$(initdir)/Default; then \
cp -f $(DESTDIR)$(initdir)/Default $(DESTDIR)$(initdir)/Default.orig; \
fi
- $(INSTALL_SCRIPT) $(srcdir)/Default $(DESTDIR)$(initdir)/Default
+ $(INSTALL_SCRIPT) Default $(DESTDIR)$(initdir)/Default
if test '!' -d $(DESTDIR)$(postlogindir); then \
$(mkinstalldirs) $(DESTDIR)$(postlogindir); \
@@ -92,7 +92,7 @@ install-data-hook: gdm.conf Xsession gnome.desktop Default.desktop Default PostS
-if test -f $(DESTDIR)$(predir)/Default; then \
cp -f $(DESTDIR)$(predir)/Default $(DESTDIR)$(predir)/Default.orig; \
fi
- $(INSTALL_SCRIPT) $(srcdir)/PreSession $(DESTDIR)$(predir)/Default
+ $(INSTALL_SCRIPT) PreSession $(DESTDIR)$(predir)/Default
if test '!' -d $(DESTDIR)$(postdir); then \
$(mkinstalldirs) $(DESTDIR)$(postdir); \
@@ -101,7 +101,7 @@ install-data-hook: gdm.conf Xsession gnome.desktop Default.desktop Default PostS
-if test -f $(DESTDIR)$(postdir)/Default; then \
cp -f $(DESTDIR)$(postdir)/Default $(DESTDIR)$(postdir)/Default.orig; \
fi
- $(INSTALL_SCRIPT) $(srcdir)/PostSession $(DESTDIR)$(postdir)/Default
+ $(INSTALL_SCRIPT) PostSession $(DESTDIR)$(postdir)/Default
if test '!' -d $(DESTDIR)$(gnomercdir); then \
$(mkinstalldirs) $(DESTDIR)$(gnomercdir); \
diff --git a/configure.in b/configure.in
index 01018ec1..6efcfb5c 100644
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ dnl
AC_PROG_INTLTOOL([0.21])
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(gdm,2.4.2.0)
+AM_INIT_AUTOMAKE(gdm,2.4.2.95)
AM_MAINTAINER_MODE
GDK_PIXBUF_REQUIRED=1.3.1