aboutsummaryrefslogtreecommitdiff
path: root/x11/gdm
diff options
context:
space:
mode:
Diffstat (limited to 'x11/gdm')
-rw-r--r--x11/gdm/Makefile8
-rw-r--r--x11/gdm/distinfo6
-rw-r--r--x11/gdm/files/extra-patch-daemon_slave.c18
-rw-r--r--x11/gdm/files/gdm.in2
-rw-r--r--x11/gdm/files/patch-config_gdm.conf.in11
-rw-r--r--x11/gdm/files/patch-configure137
-rw-r--r--x11/gdm/files/patch-daemon_gdmconsolekit.c11
-rw-r--r--x11/gdm/pkg-install4
-rw-r--r--x11/gdm/pkg-plist213
9 files changed, 258 insertions, 152 deletions
diff --git a/x11/gdm/Makefile b/x11/gdm/Makefile
index a54a1c443c46..023393457a2a 100644
--- a/x11/gdm/Makefile
+++ b/x11/gdm/Makefile
@@ -3,11 +3,11 @@
# Whom: Joe Marcus Clarke <marcus@FreeBSD.org>
#
# $FreeBSD$
-# $MCom: ports/x11/gdm/Makefile,v 1.58 2007/03/12 16:56:06 marcus Exp $
+# $MCom: ports/x11/gdm/Makefile,v 1.80 2007/10/22 04:42:08 marcus Exp $
#
PORTNAME= gdm
-PORTVERSION= 2.18.4
+PORTVERSION= 2.20.1
PORTREVISION= 1
CATEGORIES= x11 gnome
MASTER_SITES= ${MASTER_SITE_GNOME}
@@ -84,9 +84,9 @@ post-patch:
${WRKSRC}/config/Makefile.in
@${REINPLACE_CMD} -e 's|/usr/X11R6|${LOCALBASE}|g' \
${WRKSRC}/configure ${WRKSRC}/po/*.po ${WRKSRC}/gui/*.glade \
- ${WRKSRC}/daemon/*.c ${WRKSRC}/docs/*/*.xml
+ ${WRKSRC}/daemon/*.c ${WRKSRC}/docs/*/*.*
@${REINPLACE_CMD} -e 's|/etc/gdm/gdm.conf|${PREFIX}/etc/gdm/gdm.conf|' \
- ${WRKSRC}/docs/gdm.1
+ ${WRKSRC}/docs/gdm.1
post-install:
.if !defined(PACKAGE_BUILDING)
diff --git a/x11/gdm/distinfo b/x11/gdm/distinfo
index 21dd4a4ea27e..c5f473bb23ca 100644
--- a/x11/gdm/distinfo
+++ b/x11/gdm/distinfo
@@ -1,3 +1,3 @@
-MD5 (gnome2/gdm-2.18.4.tar.bz2) = 53e5f5820fa67abf55c37ea7570807b7
-SHA256 (gnome2/gdm-2.18.4.tar.bz2) = 1491178239060f14d7258e94fb511ae056da6b5525d6a64b69be45fe061342c3
-SIZE (gnome2/gdm-2.18.4.tar.bz2) = 3459899
+MD5 (gnome2/gdm-2.20.1.tar.bz2) = ed7b7efcb7fd97cc400e2416e0093e71
+SHA256 (gnome2/gdm-2.20.1.tar.bz2) = b916867853c0e4ef5b8e76a58baa28ff666fd3da741438c595b5f23d031501d7
+SIZE (gnome2/gdm-2.20.1.tar.bz2) = 3774217
diff --git a/x11/gdm/files/extra-patch-daemon_slave.c b/x11/gdm/files/extra-patch-daemon_slave.c
index 2d609cf2faec..b493dcd80ad9 100644
--- a/x11/gdm/files/extra-patch-daemon_slave.c
+++ b/x11/gdm/files/extra-patch-daemon_slave.c
@@ -1,6 +1,6 @@
---- daemon/slave.c.orig Sat Oct 28 22:38:51 2006
-+++ daemon/slave.c Tue Oct 31 12:33:41 2006
-@@ -321,8 +321,7 @@ run_session_output (gboolean read_until_
+--- daemon/slave.c.orig 2007-09-17 10:45:50.000000000 -0400
++++ daemon/slave.c 2007-09-25 13:42:06.000000000 -0400
+@@ -373,8 +373,7 @@
break;
}
@@ -10,17 +10,17 @@
continue;
/* write until we succeed in writing something */
-@@ -344,13 +343,6 @@ run_session_output (gboolean read_until_
- }
+@@ -397,13 +396,6 @@
d->xsession_errors_bytes += r;
--
+
- if G_UNLIKELY (d->xsession_errors_bytes >= MAX_XSESSION_ERRORS_BYTES &&
- ! got_xfsz_signal) {
- VE_IGNORE_EINTR (write (d->xsession_errors_fd,
-- "\n...Too much output, ignoring rest...\n",
-- strlen ("\n...Too much output, ignoring rest...\n")));
+- "\n...Too much output, ignoring rest...\n",
+- strlen ("\n...Too much output, ignoring rest...\n")));
- }
-
+-
/* there wasn't more then buf available, so no need to try reading
* again, unless we really want to */
+ if (r < sizeof (buf) && ! read_until_eof)
diff --git a/x11/gdm/files/gdm.in b/x11/gdm/files/gdm.in
index 21b493a0595b..9b11f3fb3ee2 100644
--- a/x11/gdm/files/gdm.in
+++ b/x11/gdm/files/gdm.in
@@ -1,6 +1,6 @@
#!/bin/sh
# $FreeBSD$
-# $MCom: ports/x11/gdm/files/gdm.in,v 1.12 2007/02/16 18:14:26 mezz Exp $
+# $MCom: ports/x11/gdm/files/gdm.in,v 1.15 2007/08/15 17:52:06 mezz Exp $
# PROVIDE: gdm
# REQUIRE: LOGIN cleanvar moused
diff --git a/x11/gdm/files/patch-config_gdm.conf.in b/x11/gdm/files/patch-config_gdm.conf.in
index 0eeb4bfc5562..6382bd445fd8 100644
--- a/x11/gdm/files/patch-config_gdm.conf.in
+++ b/x11/gdm/files/patch-config_gdm.conf.in
@@ -6,7 +6,7 @@
-# Automatic VT allocation. Right now only works on Linux. This way we force
+# Automatic VT allocation. This way we force
- # X to use specific vts. turn VTAllocation to false if this is causing
+ # X to use specific vts. Turn VTAllocation to false if this is causing
# problems.
-#FirstVT=7
-#VTAllocation=true
@@ -15,12 +15,3 @@
# Should double login be treated with a warning (and possibility to change VT's
# on Linux and FreeBSD systems for console logins)
#DoubleLoginWarning=true
-@@ -305,7 +305,7 @@
- # The specific gtkrc file we use. It should be the full path to the gtkrc that
- # we need. Unless you need a specific gtkrc that doesn't correspond to a
- # specific theme, then just use the GtkTheme key.
--#GtkRC=@datadir@/themes/Default/gtk-2.0/gtkrc
-+#GtkRC=@datadir@/../themes/Default/gtk-2.0/gtkrc
-
- # The GTK+ theme to use for the GUI.
- #GtkTheme=Default
diff --git a/x11/gdm/files/patch-configure b/x11/gdm/files/patch-configure
new file mode 100644
index 000000000000..18b1e2742f57
--- /dev/null
+++ b/x11/gdm/files/patch-configure
@@ -0,0 +1,137 @@
+--- configure.orig 2007-10-22 00:31:04.000000000 -0400
++++ configure 2007-10-22 00:34:52.000000000 -0400
+@@ -29593,15 +29592,13 @@ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_util_login" >&5
+ echo "${ECHO_T}$ac_cv_lib_util_login" >&6; }
+ if test $ac_cv_lib_util_login = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBUTIL 1
++ cat >>confdefs.h <<\_ACEOF
++#define HAVE_LOGIN 1
+ _ACEOF
+-
+- LIBS="-lutil $LIBS"
+-
++
++ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
+ fi
+
+-
+ { echo "$as_me:$LINENO: checking for logout in -lutil" >&5
+ echo $ECHO_N "checking for logout in -lutil... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_util_logout+set}" = set; then
+@@ -29664,12 +29661,80 @@ fi
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_util_logout" >&5
+ echo "${ECHO_T}$ac_cv_lib_util_logout" >&6; }
+ if test $ac_cv_lib_util_logout = yes; then
+- cat >>confdefs.h <<_ACEOF
+-#define HAVE_LIBUTIL 1
++ cat >>confdefs.h <<\_ACEOF
++#define HAVE_LOGOUT 1
++_ACEOF
++
++ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
++fi
++
++{ echo "$as_me:$LINENO: checking for logwtmp in -lutil" >&5
++echo $ECHO_N "checking for logwtmp in -lutil... $ECHO_C" >&6; }
++if test "${ac_cv_lib_util_logwtmp+set}" = set; then
++ echo $ECHO_N "(cached) $ECHO_C" >&6
++else
++ ac_check_lib_save_LIBS=$LIBS
++LIBS="-lutil $LIBS"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h. */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h. */
++
++/* Override any GCC internal prototype to avoid an error.
++ Use char because int might match the return type of a GCC
++ builtin and then its argument prototype would still apply. */
++#ifdef __cplusplus
++extern "C"
++#endif
++char logwtmp ();
++int
++main ()
++{
++return logwtmp ();
++ ;
++ return 0;
++}
+ _ACEOF
++rm -f conftest.$ac_objext conftest$ac_exeext
++if { (ac_try="$ac_link"
++case "(($ac_try" in
++ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
++ *) ac_try_echo=$ac_try;;
++esac
++eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
++ (eval "$ac_link") 2>conftest.er1
++ ac_status=$?
++ grep -v '^ *+' conftest.er1 >conftest.err
++ rm -f conftest.er1
++ cat conftest.err >&5
++ echo "$as_me:$LINENO: \$? = $ac_status" >&5
++ (exit $ac_status); } && {
++ test -z "$ac_c_werror_flag" ||
++ test ! -s conftest.err
++ } && test -s conftest$ac_exeext &&
++ $as_test_x conftest$ac_exeext; then
++ ac_cv_lib_util_logwtmp=yes
++else
++ echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
+
+- LIBS="-lutil $LIBS"
++ ac_cv_lib_util_logwtmp=no
++fi
+
++rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
++ conftest$ac_exeext conftest.$ac_ext
++LIBS=$ac_check_lib_save_LIBS
++fi
++{ echo "$as_me:$LINENO: result: $ac_cv_lib_util_logwtmp" >&5
++echo "${ECHO_T}$ac_cv_lib_util_logwtmp" >&6; }
++if test $ac_cv_lib_util_logwtmp = yes; then
++ cat >>confdefs.h <<\_ACEOF
++#define HAVE_LOGWTMP 1
++_ACEOF
++
++ EXTRA_DAEMON_LIBS="$EXTRA_DAEMON_LIBS -lutil"
+ fi
+
+
+@@ -33472,18 +33537,18 @@ esac
+
+ # allow user to override the host-specific default
+
+-test "x$GDM_USER_PATH" == x && GDM_USER_PATH=${HOST_GDM_USER_PATH}
+-test "x$GDM_HALT_COMMAND" == x && GDM_HALT_COMMAND=${HOST_GDM_HALT_COMMAND}
+-test "x$HALT_COMMAND" == x && HALT_COMMAND=${HOST_HALT_COMMAND}
+-test "x$REBOOT_COMMAND" == x && REBOOT_COMMAND=${HOST_REBOOT_COMMAND}
+-test "x$SUSPEND_COMMAND" == x && SUSPEND_COMMAND=${HOST_SUSPEND_COMMAND}
+-test "x$XSESSION_SHELL" == x && XSESSION_SHELL=${HOST_XSESSION_SHELL}
+-test "x$SOUND_PROGRAM" == x && SOUND_PROGRAM=${HOST_SOUND_PROGRAM}
+-test "x$GDMGNOMESESSIONCMD" == x && GDMGNOMESESSIONCMD=${HOST_GDMGNOMESESSIONCMD}
+-test "x$UTMP_LINE_ATTACHED" == x && UTMP_LINE_ATTACHED=${HOST_UTMP_LINE_ATTACHED}
+-test "x$UTMP_LINE_REMOTE" == x && UTMP_LINE_REMOTE=${HOST_UTMP_LINE_REMOTE}
+-test "x$UTMP_PSEUDO_DEVICE" == x && UTMP_PSEUDO_DEVICE=${HOST_UTMP_PSEUDO_DEVICE}
+-test "x$GDM_RBAC_SYSCMD_KEYS" == x && GDM_RBAC_SYSCMD_KEYS=${HOST_GDM_RBAC_SYSCMD_KEYS}
++test "x$GDM_USER_PATH" = x && GDM_USER_PATH=${HOST_GDM_USER_PATH}
++test "x$GDM_HALT_COMMAND" = x && GDM_HALT_COMMAND=${HOST_GDM_HALT_COMMAND}
++test "x$HALT_COMMAND" = x && HALT_COMMAND=${HOST_HALT_COMMAND}
++test "x$REBOOT_COMMAND" = x && REBOOT_COMMAND=${HOST_REBOOT_COMMAND}
++test "x$SUSPEND_COMMAND" = x && SUSPEND_COMMAND=${HOST_SUSPEND_COMMAND}
++test "x$XSESSION_SHELL" = x && XSESSION_SHELL=${HOST_XSESSION_SHELL}
++test "x$SOUND_PROGRAM" = x && SOUND_PROGRAM=${HOST_SOUND_PROGRAM}
++test "x$GDMGNOMESESSIONCMD" = x && GDMGNOMESESSIONCMD=${HOST_GDMGNOMESESSIONCMD}
++test "x$UTMP_LINE_ATTACHED" = x && UTMP_LINE_ATTACHED=${HOST_UTMP_LINE_ATTACHED}
++test "x$UTMP_LINE_REMOTE" = x && UTMP_LINE_REMOTE=${HOST_UTMP_LINE_REMOTE}
++test "x$UTMP_PSEUDO_DEVICE" = x && UTMP_PSEUDO_DEVICE=${HOST_UTMP_PSEUDO_DEVICE}
++test "x$GDM_RBAC_SYSCMD_KEYS" = x && GDM_RBAC_SYSCMD_KEYS=${HOST_GDM_RBAC_SYSCMD_KEYS}
+
+ # On Solaris, the /usr/bin/Xserver script is used to decide whether to
+ # use Xsun or Xorg, so this is used on Solaris.
diff --git a/x11/gdm/files/patch-daemon_gdmconsolekit.c b/x11/gdm/files/patch-daemon_gdmconsolekit.c
new file mode 100644
index 000000000000..b07647071d08
--- /dev/null
+++ b/x11/gdm/files/patch-daemon_gdmconsolekit.c
@@ -0,0 +1,11 @@
+--- daemon/gdmconsolekit.c.orig 2007-08-30 22:57:18.000000000 -0400
++++ daemon/gdmconsolekit.c 2007-08-30 22:57:35.000000000 -0400
+@@ -457,7 +457,7 @@ open_ck_session (struct passwd *pwent,
+ char *device;
+
+ /* FIXME: how does xorg construct this */
+- device = g_strdup_printf ("/dev/tty%d", d->vt);
++ device = g_strdup_printf ("/dev/ttyv%d", d->vt - 1);
+ add_param_string (&iter_struct, "x11-display-device", device);
+ g_free (device);
+ }
diff --git a/x11/gdm/pkg-install b/x11/gdm/pkg-install
index bcce174fd151..b775c107227c 100644
--- a/x11/gdm/pkg-install
+++ b/x11/gdm/pkg-install
@@ -38,8 +38,8 @@ POST-INSTALL)
${MKDIR} -p /var/log/gdm
${CHOWN} -R root:${GROUP} /var/gdm
${CHMOD} 1770 /var/gdm
- ${CHOWN} root:wheel ${PKG_PREFIX}/share/gnome/gdm
- ${CHMOD} 0755 ${PKG_PREFIX}/share/gnome/gdm
+ ${CHOWN} root:wheel ${PKG_PREFIX}/share/gdm
+ ${CHMOD} 0755 ${PKG_PREFIX}/share/gdm
${MKDIR} -p ${PKG_PREFIX}/etc/dm/Sessions
exit 0
diff --git a/x11/gdm/pkg-plist b/x11/gdm/pkg-plist
index 72961e6973a5..2a17308472eb 100644
--- a/x11/gdm/pkg-plist
+++ b/x11/gdm/pkg-plist
@@ -38,112 +38,47 @@ sbin/gdm-restart
sbin/gdm-safe-restart
sbin/gdm-stop
sbin/gdmsetup
-share/gnome/applications/gdmflexiserver-xnest.desktop
-share/gnome/applications/gdmflexiserver.desktop
-share/gnome/applications/gdmphotosetup.desktop
-share/gnome/applications/gdmsetup.desktop
-share/gnome/gdm/BuiltInSessions/default.desktop
-share/gnome/gdm/defaults.conf
-share/gnome/gdm/factory-defaults.conf
-share/gnome/gdm/gdmchooser.glade
-share/gnome/gdm/gdmphotosetup.glade
-share/gnome/gdm/gdmsetup.glade
-share/gnome/gdm/themes/circles/GdmGreeterTheme.desktop
-share/gnome/gdm/themes/circles/background.svg
-share/gnome/gdm/themes/circles/circles.xml
-share/gnome/gdm/themes/circles/flower.png
-share/gnome/gdm/themes/circles/help.png
-share/gnome/gdm/themes/circles/options.png
-share/gnome/gdm/themes/circles/screenshot.png
-share/gnome/gdm/themes/happygnome-list/GdmGreeterTheme.desktop
-share/gnome/gdm/themes/happygnome-list/background.svg
-share/gnome/gdm/themes/happygnome-list/gnome-logo.svg
-share/gnome/gdm/themes/happygnome-list/happygnome.xml
-share/gnome/gdm/themes/happygnome-list/options.png
-share/gnome/gdm/themes/happygnome-list/screenshot.png
-share/gnome/gdm/themes/happygnome/GdmGreeterTheme.desktop
-share/gnome/gdm/themes/happygnome/background.svg
-share/gnome/gdm/themes/happygnome/gnome-logo.svg
-share/gnome/gdm/themes/happygnome/happygnome.xml
-share/gnome/gdm/themes/happygnome/options.png
-share/gnome/gdm/themes/happygnome/screenshot.png
+%%DATADIR%%/BuiltInSessions/default.desktop
+%%DATADIR%%/applications/gdmflexiserver-xnest.desktop
+%%DATADIR%%/applications/gdmflexiserver.desktop
+%%DATADIR%%/applications/gdmphotosetup.desktop
+%%DATADIR%%/applications/gdmsetup.desktop
+%%DATADIR%%/defaults.conf
+%%DATADIR%%/factory-defaults.conf
+%%DATADIR%%/gdmchooser.glade
+%%DATADIR%%/gdmphotosetup.glade
+%%DATADIR%%/gdmsetup.glade
+%%DATADIR%%/themes/circles/GdmGreeterTheme.desktop
+%%DATADIR%%/themes/circles/background.svg
+%%DATADIR%%/themes/circles/circles.xml
+%%DATADIR%%/themes/circles/flower.png
+%%DATADIR%%/themes/circles/screenshot.png
+%%DATADIR%%/themes/happygnome-list/GdmGreeterTheme.desktop
+%%DATADIR%%/themes/happygnome-list/background.svg
+%%DATADIR%%/themes/happygnome-list/gnome-logo.svg
+%%DATADIR%%/themes/happygnome-list/happygnome-list.xml
+%%DATADIR%%/themes/happygnome-list/screenshot.png
+%%DATADIR%%/themes/happygnome/GdmGreeterTheme.desktop
+%%DATADIR%%/themes/happygnome/background.svg
+%%DATADIR%%/themes/happygnome/gnome-logo.svg
+%%DATADIR%%/themes/happygnome/happygnome.xml
+%%DATADIR%%/themes/happygnome/screenshot.png
share/gnome/help/gdm/C/gdm.xml
share/gnome/help/gdm/C/legal.xml
-share/gnome/help/gdm/de/figures/gdm_window.png
-share/gnome/help/gdm/de/gdm.xml
-share/gnome/help/gdm/de/legal.xml
-share/gnome/help/gdm/es/figures/gdm_window.png
+share/gnome/help/gdm/en_GB/gdm.xml
share/gnome/help/gdm/es/gdm.xml
-share/gnome/help/gdm/es/legal.xml
-share/gnome/help/gdm/fr/figures/gdm_window.png
share/gnome/help/gdm/fr/gdm.xml
-share/gnome/help/gdm/fr/legal.xml
-share/gnome/help/gdm/it/figures/gdm_window.png
-share/gnome/help/gdm/it/gdm.xml
-share/gnome/help/gdm/it/legal.xml
-share/gnome/help/gdm/ja/figures/gdm_window.png
-share/gnome/help/gdm/ja/gdm.xml
-share/gnome/help/gdm/ja/legal.xml
-share/gnome/help/gdm/ko/figures/gdm_window.png
share/gnome/help/gdm/ko/gdm.xml
-share/gnome/help/gdm/ko/legal.xml
+share/gnome/help/gdm/oc/gdm.xml
+share/gnome/help/gdm/sv/gdm.xml
share/gnome/help/gdm/uk/gdm.xml
-share/gnome/help/gdm/uk/legal.xml
-share/gnome/help/gdm/zh_CN/figures/gdm_window.png
-share/gnome/help/gdm/zh_CN/gdm.xml
-share/gnome/help/gdm/zh_CN/legal.xml
-share/gnome/help/gdm/zh_HK/figures/gdm_window.png
-share/gnome/help/gdm/zh_HK/gdm.xml
-share/gnome/help/gdm/zh_HK/legal.xml
-share/gnome/help/gdm/zh_TW/figures/gdm_window.png
-share/gnome/help/gdm/zh_TW/gdm.xml
-share/gnome/help/gdm/zh_TW/legal.xml
-share/gnome/omf/gdm/gdm-C.omf
-share/gnome/omf/gdm/gdm-de.omf
-share/gnome/omf/gdm/gdm-es.omf
-share/gnome/omf/gdm/gdm-fr.omf
-share/gnome/omf/gdm/gdm-it.omf
-share/gnome/omf/gdm/gdm-ja.omf
-share/gnome/omf/gdm/gdm-ko.omf
-share/gnome/omf/gdm/gdm-uk.omf
-share/gnome/omf/gdm/gdm-zh_CN.omf
-share/gnome/omf/gdm/gdm-zh_HK.omf
-share/gnome/omf/gdm/gdm-zh_TW.omf
-share/gnome/pixmaps/faces/astronaut.jpg
-share/gnome/pixmaps/faces/baseball.png
-share/gnome/pixmaps/faces/butterfly.png
-share/gnome/pixmaps/faces/cat-eye.jpg
-share/gnome/pixmaps/faces/chess.jpg
-share/gnome/pixmaps/faces/coffee.jpg
-share/gnome/pixmaps/faces/dice.jpg
-share/gnome/pixmaps/faces/energy-arc.jpg
-share/gnome/pixmaps/faces/fish.jpg
-share/gnome/pixmaps/faces/flake.jpg
-share/gnome/pixmaps/faces/flower.jpg
-share/gnome/pixmaps/faces/grapes.jpg
-share/gnome/pixmaps/faces/guitar.jpg
-share/gnome/pixmaps/faces/launch.jpg
-share/gnome/pixmaps/faces/leaf.jpg
-share/gnome/pixmaps/faces/lightning.jpg
-share/gnome/pixmaps/faces/penguin.jpg
-share/gnome/pixmaps/faces/puppy.jpg
-share/gnome/pixmaps/faces/sky.jpg
-share/gnome/pixmaps/faces/soccerball.png
-share/gnome/pixmaps/faces/sunflower.jpg
-share/gnome/pixmaps/faces/sunset.jpg
-share/gnome/pixmaps/faces/tennis-ball.png
-share/gnome/pixmaps/faces/yellow-rose.jpg
-share/gnome/pixmaps/gdm-foot-logo.png
-share/gnome/pixmaps/gdm-setup.png
-share/gnome/pixmaps/gdm-xnest.png
-share/gnome/pixmaps/gdm.png
-share/gnome/pixmaps/login-photo.png
-share/gnome/pixmaps/nobody.png
-share/gnome/pixmaps/nohost.png
-share/gnome/xsessions/gnome.desktop
share/icons/hicolor/16x16/apps/gdm-xnest.png
share/icons/hicolor/32x32/apps/gdm-setup.png
share/icons/hicolor/32x32/apps/gdm-xnest.png
+share/icons/hicolor/48x48/apps/gdm-login-photo.png
+share/icons/hicolor/48x48/apps/gdm-setup.png
+share/icons/hicolor/48x48/apps/gdm-xnest.png
+share/icons/hicolor/48x48/apps/gdm.png
share/locale/af/LC_MESSAGES/gdm.mo
share/locale/am/LC_MESSAGES/gdm.mo
share/locale/ar/LC_MESSAGES/gdm.mo
@@ -182,6 +117,7 @@ share/locale/is/LC_MESSAGES/gdm.mo
share/locale/it/LC_MESSAGES/gdm.mo
share/locale/ja/LC_MESSAGES/gdm.mo
share/locale/ka/LC_MESSAGES/gdm.mo
+share/locale/kn/LC_MESSAGES/gdm.mo
share/locale/ko/LC_MESSAGES/gdm.mo
share/locale/ku/LC_MESSAGES/gdm.mo
share/locale/lt/LC_MESSAGES/gdm.mo
@@ -207,6 +143,7 @@ share/locale/pt_BR/LC_MESSAGES/gdm.mo
share/locale/ro/LC_MESSAGES/gdm.mo
share/locale/ru/LC_MESSAGES/gdm.mo
share/locale/rw/LC_MESSAGES/gdm.mo
+share/locale/si/LC_MESSAGES/gdm.mo
share/locale/sk/LC_MESSAGES/gdm.mo
share/locale/sl/LC_MESSAGES/gdm.mo
share/locale/sq/LC_MESSAGES/gdm.mo
@@ -214,6 +151,7 @@ share/locale/sr/LC_MESSAGES/gdm.mo
share/locale/sr@Latn/LC_MESSAGES/gdm.mo
share/locale/sv/LC_MESSAGES/gdm.mo
share/locale/ta/LC_MESSAGES/gdm.mo
+share/locale/te/LC_MESSAGES/gdm.mo
share/locale/th/LC_MESSAGES/gdm.mo
share/locale/tr/LC_MESSAGES/gdm.mo
share/locale/uk/LC_MESSAGES/gdm.mo
@@ -224,36 +162,61 @@ share/locale/zh_CN/LC_MESSAGES/gdm.mo
share/locale/zh_HK/LC_MESSAGES/gdm.mo
share/locale/zh_TW/LC_MESSAGES/gdm.mo
share/locale/zu/LC_MESSAGES/gdm.mo
-@dirrm share/gnome/xsessions
-@dirrm share/gnome/pixmaps/faces
-@dirrm share/gnome/omf/gdm
-@dirrm share/gnome/help/gdm/zh_TW/figures
-@dirrm share/gnome/help/gdm/zh_TW
-@dirrm share/gnome/help/gdm/zh_HK/figures
-@dirrm share/gnome/help/gdm/zh_HK
-@dirrm share/gnome/help/gdm/zh_CN/figures
-@dirrm share/gnome/help/gdm/zh_CN
+share/omf/gdm/gdm-C.omf
+share/omf/gdm/gdm-en_GB.omf
+share/omf/gdm/gdm-es.omf
+share/omf/gdm/gdm-fr.omf
+share/omf/gdm/gdm-ko.omf
+share/omf/gdm/gdm-oc.omf
+share/omf/gdm/gdm-sv.omf
+share/omf/gdm/gdm-uk.omf
+share/pixmaps/faces/astronaut.jpg
+share/pixmaps/faces/baseball.png
+share/pixmaps/faces/butterfly.png
+share/pixmaps/faces/cat-eye.jpg
+share/pixmaps/faces/chess.jpg
+share/pixmaps/faces/coffee.jpg
+share/pixmaps/faces/dice.jpg
+share/pixmaps/faces/energy-arc.jpg
+share/pixmaps/faces/fish.jpg
+share/pixmaps/faces/flake.jpg
+share/pixmaps/faces/flower.jpg
+share/pixmaps/faces/grapes.jpg
+share/pixmaps/faces/guitar.jpg
+share/pixmaps/faces/launch.jpg
+share/pixmaps/faces/leaf.jpg
+share/pixmaps/faces/lightning.jpg
+share/pixmaps/faces/penguin.jpg
+share/pixmaps/faces/puppy.jpg
+share/pixmaps/faces/sky.jpg
+share/pixmaps/faces/soccerball.png
+share/pixmaps/faces/sunflower.jpg
+share/pixmaps/faces/sunset.jpg
+share/pixmaps/faces/tennis-ball.png
+share/pixmaps/faces/yellow-rose.jpg
+share/pixmaps/gdm-foot-logo.png
+share/pixmaps/nobody.png
+share/pixmaps/nohost.png
+share/xsessions/gnome.desktop
+@dirrm share/xsessions
+@dirrm share/pixmaps/faces
+@dirrm share/omf/gdm
@dirrm share/gnome/help/gdm/uk
-@dirrm share/gnome/help/gdm/ko/figures
+@dirrm share/gnome/help/gdm/sv
+@dirrm share/gnome/help/gdm/oc
@dirrm share/gnome/help/gdm/ko
-@dirrm share/gnome/help/gdm/ja/figures
-@dirrm share/gnome/help/gdm/ja
-@dirrm share/gnome/help/gdm/it/figures
-@dirrm share/gnome/help/gdm/it
-@dirrm share/gnome/help/gdm/fr/figures
@dirrm share/gnome/help/gdm/fr
-@dirrm share/gnome/help/gdm/es/figures
@dirrm share/gnome/help/gdm/es
-@dirrm share/gnome/help/gdm/de/figures
-@dirrm share/gnome/help/gdm/de
+@dirrm share/gnome/help/gdm/en_GB
@dirrm share/gnome/help/gdm/C
@dirrm share/gnome/help/gdm
-@dirrm share/gnome/gdm/themes/happygnome-list
-@dirrm share/gnome/gdm/themes/happygnome
-@dirrm share/gnome/gdm/themes/circles
-@dirrm share/gnome/gdm/themes
-@dirrm share/gnome/gdm/BuiltInSessions
-@dirrm share/gnome/gdm
+@dirrm %%DATADIR%%/themes/happygnome-list
+@dirrm %%DATADIR%%/themes/happygnome
+@dirrm %%DATADIR%%/themes/circles
+@dirrm %%DATADIR%%/themes
+@dirrm %%DATADIR%%/applications
+@dirrm %%DATADIR%%/BuiltInSessions
+@dirrm %%DATADIR%%
@dirrm etc/gdm/modules
@dirrm etc/gdm/Sessions
@dirrm etc/gdm/PreSession
@@ -264,8 +227,8 @@ share/locale/zu/LC_MESSAGES/gdm.mo
@dirrmtry etc/dm/Sessions
@dirrmtry etc/dm
@dirrmtry sbin
-@dirrmtry share/gnome/log/gdm
-@dirrmtry share/gnome/log
+@dirrmtry share/log/gdm
+@dirrmtry share/log
@unexec /bin/rm -rf /var/gdm 2>/dev/null || /usr/bin/true
@unexec /bin/rm -rf /var/log/gdm 2>/dev/null || /usr/bin/true
@dirrmtry share/locale/zu/LC_MESSAGES
@@ -274,6 +237,10 @@ share/locale/zu/LC_MESSAGES/gdm.mo
@dirrmtry share/locale/zh_HK
@dirrmtry share/locale/xh/LC_MESSAGES
@dirrmtry share/locale/xh
+@dirrmtry share/locale/te/LC_MESSAGES
+@dirrmtry share/locale/te
+@dirrmtry share/locale/si/LC_MESSAGES
+@dirrmtry share/locale/si
@dirrmtry share/locale/rw/LC_MESSAGES
@dirrmtry share/locale/rw
@dirrmtry share/locale/oc/LC_MESSAGES