I completely forgot to commit to the gnome-2-2 branch after releasing

2.4.1.4.  I am so dumb ... -George

Mon May 05 13:08:12 2003  George Lebl <jirka@5z.com>

	* Release 2.4.1.4

	* gdm.spec.in: Fixup lang stuff and file lists

	* config/Makefile.am: fixup link install

6 files changed, 65 insertions, 21 deletions

diff --git a/ChangeLog b/ChangeLog
index 6c43e0ef..038fce51 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,14 @@
 
 	* configure.in: Added "hi" to ALL_LINGUAS
 
+Mon May 05 13:08:12 2003  George Lebl <jirka@5z.com>
+
+	* Release 2.4.1.4
+
+	* gdm.spec.in: Fixup lang stuff and file lists
+
+	* config/Makefile.am: fixup link install
+
 2003-05-05  Danilo Šegan  <dsegan@gmx.net>
 
 	* configure.in: Added "sr" and "sr@Latn" to ALL_LINGUAS
diff --git a/NEWS b/NEWS
index a1499a0c..71f33af2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,37 @@
 Ahh news...
 
+2.4.1.4 stuff:
+
+- Raise DisplaysPerHost default to 2 to avoid a FAQ-type-problem
+
+- Add xdmcp/PingInterval key to the default config file
+
+- Fixed up the included spec file
+
+- Fixed some typo's (Kjartan Maraas)
+
+- Fixed Solaris build (Niall Power)
+
+- Added Thai, Mongolian, Indonesian, Kannada, Hindi
+  Bengali, Belarusian, Bosnian, Welsh, Persian, Interlingua,
+  Albanian, Serbian, Yiddish and Panjabi Language support
+  (Ross Golder, Sanlig Badral)
+
+- Sorted languages in alphabetic order (#106293) (Ross Golder)
+
+- Translation updates (Roozbeh Purnader, Christian Rose, Taneem Ahmed,
+  Pablo Saratxaga, Danilo Aegan, Jordi Mallach, Dmitry G. Mastrukov,
+  Belarusian team, Alessio Frusciante, Lapo Calamandrei, Christophe Merlet,
+  Andras Timar, Takeshi AIHANA, Roozbeh Pournader, Artis Trops,
+  Kang Jeong-Hee, Stanislav Visnovsky, FSF-India, Abel Cheung, Metin Amiroff,
+  Pauli Virtanen, Lauri Nurmi, Kjartan Maraas, Christian Neumar,
+  Kostas Papadimas, Vincent van Adrighem, Zbigniew Chyla, GNOME PL Team,
+  Evandro Fernandes Giovanini, Duarte Loreto, Pablo Gonzalo del Campo,
+  Lucas 'Basurero' Vieites, Ole Laursen, Paul Duffy, Russian team,
+  Yuriy Syrota, Miloslav Trmac, Gil "Dolfin" Osher, Progga,
+  Christian Neumair, Alexandre Folle de Menezes, Benjamin Greiner,
+  Fatih Demir, Arman)
+
 2.4.1.3 stuff:
 
 - Fix redhat bug #83334 by fixing md5 code on non-alpha 64bit platforms
diff --git a/config/Makefile.am b/config/Makefile.am
index ce5825c9..ab69a4f6 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -69,7 +69,7 @@ install-data-hook: gdm.conf gnomerc Gnome Xsession
 		if test -f $(DESTDIR)$(sessdir)/Default; then \
 			cp -f $(DESTDIR)$(sessdir)/Default $(DESTDIR)$(sessdir)/Default.orig; \
 		fi; \
-		$(LN_S) -f $(sessdir)/Xsession $(DESTDIR)$(sessdir)/Default; \
+		$(LN_S) -f Xsession $(DESTDIR)$(sessdir)/Default; \
 	fi
 
 	if test '!' -d $(DESTDIR)$(initdir); then \
diff --git a/configure.in b/configure.in
index 829dc595..10e0ec6b 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.1.3)
+AM_INIT_AUTOMAKE(gdm,2.4.1.4)
 AM_MAINTAINER_MODE
 
 GDK_PIXBUF_REQUIRED=1.3.1
diff --git a/gdm.spec.in b/gdm.spec.in
index 801ef115..27cc2c99 100644
--- a/gdm.spec.in
+++ b/gdm.spec.in
@@ -50,11 +50,11 @@ make sysconfdir=$RPM_BUILD_ROOT%{sysconfdir}/X11 \
 
 
 # install RH specific session files
-rm -f $RPM_BUILD_ROOT%{sysconfdir}/X11/gdm/Sessions/*
+# rm -f $RPM_BUILD_ROOT%{sysconfdir}/X11/gdm/Sessions/*
 
-install -m 755 config/Default.redhat $RPM_BUILD_ROOT%{sysconfdir}/X11/gdm/Sessions/Default
-install -m 755 config/Gnome $RPM_BUILD_ROOT%{sysconfdir}/X11/gdm/Sessions/Gnome
-ln -sf Default $RPM_BUILD_ROOT%{sysconfdir}/X11/gdm/Sessions/default
+# install -m 755 config/Default.redhat $RPM_BUILD_ROOT%{sysconfdir}/X11/gdm/Sessions/Default
+# install -m 755 config/Gnome $RPM_BUILD_ROOT%{sysconfdir}/X11/gdm/Sessions/Gnome
+# ln -sf Default $RPM_BUILD_ROOT%{sysconfdir}/X11/gdm/Sessions/default
 
 # change default Init script to be Red Hat default
 # Note that this just sets up background and we already do that ourselves
@@ -65,7 +65,7 @@ ln -sf Default $RPM_BUILD_ROOT%{sysconfdir}/X11/gdm/Sessions/default
 # mv $RPM_BUILD_ROOT%{sysconfdir}/X11/pam.d $RPM_BUILD_ROOT%{sysconfdir}
 # move security stuff to right place
 # mv $RPM_BUILD_ROOT%{sysconfdir}/X11/security $RPM_BUILD_ROOT%{sysconfdir}
-%find_lang %{name}
+%find_lang %{name}-2.4
 
 %clean
 [ -n "$RPM_BUILD_ROOT" -a "$RPM_BUILD_ROOT" != / ] && rm -rf $RPM_BUILD_ROOT
@@ -100,7 +100,7 @@ fi
 # ignore error in the above
 exit 0
 
-%files -f %name.lang
+%files -f %name-2.4.lang
 %defattr(-, root, root)
 
 %doc AUTHORS COPYING ChangeLog NEWS README
@@ -111,9 +111,10 @@ exit 0
 %config %{sysconfdir}/security/console.apps/*
 %{_datadir}/pixmaps/*
 %{_datadir}/gdm
-%{_datadir}/gnome/apps/*/*
-%{_datadir}/gnome/help/*
-%{_datadir}/omf/gdm
+%{_datadir}/applications/*
+%{_datadir}/gnome/capplets/*
+# DOCUMENTATION!
+# %{_datadir}/omf/gdm
 # %config %{sysconfdir}/security/console.apps/gdmsetup
 # %config %{sysconfdir}/X11/gdm/gnomerc
 # %config %{sysconfdir}/X11/gdm/gdm.conf
@@ -134,6 +135,9 @@ exit 0
 
 
 %changelog
+* Mon May  5 2003 George Lebl <jirka@5z.com>
+- Updated the lang stuff, and the file lists
+
 * Tue Nov  6 2001 Gregory Leblanc <gleblanc@linuxweasel.com>
 - removed some unnecessary %defines
 - fixed find_lang stuff
diff --git a/po/POTFILES.in b/po/POTFILES.in
index c984d117..41948275 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -17,19 +17,19 @@ daemon/xdmcp.c
 gui/gdmXnestchooser.c
 gui/gdmchooser-strings.c
 gui/gdmchooser.c
-gui/gdmchooser.glade
+gui/gdmchooser.glade.h
 gui/gdmcomm.c
-gui/gdmflexiserver-xnest.desktop.in
+gui/gdmflexiserver-xnest.desktop.in.h
 gui/gdmflexiserver.c
-gui/gdmflexiserver.desktop.in
+gui/gdmflexiserver.desktop.in.h
 gui/gdmlanguages.c
 gui/gdmlogin.c
 gui/gdmphotosetup.c
-gui/gdmphotosetup.desktop.in
+gui/gdmphotosetup.desktop.in.h
 gui/gdmsetup-strings.c
 gui/gdmsetup.c
-gui/gdmsetup.desktop.in
-gui/gdmsetup.glade
+gui/gdmsetup.desktop.in.h
+gui/gdmsetup.glade.h
 gui/gdmwm.c
 gui/greeter/greeter.c
 gui/greeter/greeter_action_language.c
@@ -38,9 +38,9 @@ gui/greeter/greeter_canvas_item.c
 gui/greeter/greeter_session.c
 gui/greeter/greeter_system.c
 gui/greeter/greeter_parser.c
-gui/greeter/themes/circles/GdmGreeterTheme.desktop.in
-gui/greeter/themes/circles/circles.xml.in
-gui/greeter/themes/happygnome/GdmGreeterTheme.desktop.in
-gui/greeter/themes/happygnome/happygnome.xml.in
+gui/greeter/themes/circles/GdmGreeterTheme.desktop.in.h
+gui/greeter/themes/circles/circles.xml.in.h
+gui/greeter/themes/happygnome/GdmGreeterTheme.desktop.in.h
+gui/greeter/themes/happygnome/happygnome.xml.in.h
 utils/gdmaskpass.c
 vicious-extensions/glade-helper.c