Update to new release version. Updated.

2006-04-09  Brian Cameron  <brian.cameron@sun.com>

        * Release 2.18.1:
        * configure.ac: Update to new release version.
        * NEWS: Updated.

svn path=/branches/gnome-2-18/; revision=4779

3 files changed, 49 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 0b32f0d9..7b53cc32 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,10 @@
-2007-04-06  Brian Cameron  <brian.cameron@sun.com>
+2006-04-09  Brian Cameron  <brian.cameron@sun.com>
+
+        * Release 2.18.1:
+        * configure.ac: Update to new release version.
+        * NEWS: Updated.
+
+2007-04-09  Brian Cameron  <brian.cameron@sun.com>
 
 	* gui/greeter/greeter.c, gui/greeter/greeter_ulist.c: Backout
 	  change so that greeter Face Browser only works when Browser=true.
@@ -9,12 +15,12 @@
 	  from these themes since gdmgreeter does not yet support the
 	  BROWSER key.  This will go into 2.20.
 
-2007-04-06  Brian Cameron  <brian.cameron@sun.com>
+2007-04-09  Brian Cameron  <brian.cameron@sun.com>
 
 	* configure.ac, daemon/gdm.[ch], gui/gdmlogin.c, gui/gdmcomm.c,
 	  gui/gdmXnestchooser.c, gui/greeter/greeter.c:  Deprecated
 	  GDM_KEY_PID_FILE and now use /var/run/gdm.pid.  This fixes
-	  bug #162849.  Backported from head, patch by WIlliam Jon
+	  bug #162849.  Backported from head, patch by William Jon
 	  McCann <mccann@jhu.edu>.
 
 2007-04-06  Brian Cameron  <brian.cameron@sun.com>
diff --git a/NEWS b/NEWS
index d7f3bdfe..0a006346 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,44 @@
 Ahh news...
 
+2.18.1 Stuff:
+
+- The GDM configuration option daemon/PidFile is now deprecated and
+  GDM now always uses /var/run/gdm.pid.  The location can be configured
+  at compile time with the configure --with-pid-file option.  This
+  fixes bug #162849.  (William Jon McCann)
+
+- Now GDM supports Xephyr as the Nested Xserver command.  GDM will use
+  Xephyr by default if it is on the system, and fallback to Xnest.  Xephyr
+  works much better than Xnest.  (Brian Cameron)
+
+- GDM application desktop files now use the correct categories, so the
+  menu choices should appear in the correct place in the menu.  (Brian
+  Cameron)
+
+- Remove the userlist from the circles and happygnome themes since this
+  was causing problems for some users.  This change will go into 2.20
+  where we are fixing the problem better by fixing gdmsetup to support
+  setting the configuration so that gdmlogin and gdmgreeter work the
+  same way with the Browser key.
+
+- Now gdmgreeter has an ATK label for the entry field.  (David Zeuthen)
+
+- Fix check so language combo style works.  Fixes bug #423063.  (Simon)
+
+- Now "Configure GDM" menu choice is not available when accessibility is
+  turned on since running gdmsetup in this configuration causes GDM to
+  hang.  Until the hanging bug is fixed, it's better to not allow the
+  user to get into this situation.  (Brian Cameron)
+
+- Now support XnestUnscaledFontPath configuration option, which allows GDM
+  to work with Xnest.  Xorg 7.2 XGetFontPath function now returns fontpath
+  with the ":unscaled" prefix, which Xsun Xnest cannot handle.  Setting
+  XnestUnscaledFontPath=false, will strip the ":unscaled" prefix from the
+  fontpath so that it can work.  (Brian Cameron)
+
+- GDM daemon no longer links with D-Bus if ConsoleKit is not enabled.
+  (William Jon McCann)
+
 2.18.0 Stuff:
 
 - Fix gdmchooser so the Cancel button works.  (Brian Cameron)
diff --git a/configure.ac b/configure.ac
index bb026c1e..8b2b98be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.52)
 AC_INIT(daemon/gdm.h)
 
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(gdm,2.18.0)
+AM_INIT_AUTOMAKE(gdm,2.18.1)
 AC_CONFIG_MACRO_DIR([m4])
 AM_MAINTAINER_MODE