Changeset 138

Timestamp:

03/27/07 15:38:14 (6 years ago)

Author:

alanbach-guest

Message:

[svn-inject] Applying Debian modifications to trunk

Location:

pkg/main/gdm/trunk

Files:

• Makefile.in (modified) (2 diffs)
• config.guess (modified) (14 diffs)
• config.sub (modified) (24 diffs)
• config/CDE.desktop (deleted)
• config/Makefile.in (modified) (1 diff)
• config/PostLogin (modified) (1 diff)
• config/XKeepsCrashing (modified) (5 diffs)
• config/default.desktop (deleted)
• config/gdm.conf.in (modified) (17 diffs)
• config/gnome.desktop (deleted)
• configure.ac (modified) (1 diff)
• daemon/Makefile.in (modified) (1 diff)
• daemon/display.c (modified) (1 diff)
• daemon/gdmconfig.c (modified) (2 diffs)
• daemon/misc.c (modified) (2 diffs)
• daemon/server.c (modified) (2 diffs)
• daemon/slave.c (modified) (8 diffs)
• daemon/verify-pam.c (modified) (2 diffs)
• debian (added)
• debian/README.Debian (added)
• debian/Xsession (added)
• debian/changelog (added)
• debian/config (added)
• debian/control (added)
• debian/copyright (added)
• debian/debian-moreblue.shar (added)
• debian/dirs (added)
• debian/docs (added)
• debian/extract-locales (added)
• debian/gdm-autologin.pam (added)
• debian/gdm.pam (added)
• debian/gdm.pod (added)
• debian/gdm.xpm (added)
• debian/gdmDebianLogo.xpm (added)
• debian/gdmchooser.pod (added)
• debian/gdmflexiserver.pod (added)
• debian/gdmlogin.pod (added)
• debian/init (added)
• debian/locale.conf (added)
• debian/login-photo.xpm (added)
• debian/menu (added)
• debian/postinst (added)
• debian/postrm (added)
• debian/prerm (added)
• debian/rules (added)
• debian/templates (added)
• debian/watch (added)
• docs/C/gdm.xml (modified) (1 diff)
• docs/Makefile.in (modified) (1 diff)
• docs/de/Makefile.in (modified) (1 diff)
• docs/es/Makefile.in (modified) (1 diff)
• docs/fr/Makefile.in (modified) (1 diff)
• docs/gdm.1 (modified) (1 diff)
• docs/it/Makefile.in (modified) (1 diff)
• docs/ja/Makefile.in (modified) (1 diff)
• docs/ko/Makefile.in (modified) (1 diff)
• docs/zh_CN/Makefile.in (modified) (1 diff)
• docs/zh_HK/Makefile.in (modified) (1 diff)
• docs/zh_TW/Makefile.in (modified) (1 diff)
• gui/Makefile.am (modified) (2 diffs)
• gui/Makefile.in (modified) (5 diffs)
• gui/faces/Makefile.in (modified) (1 diff)
• gui/gdmcommon.c (modified) (2 diffs)
• gui/gdmlanguages.c (modified) (4 diffs)
• gui/gdmsetup.desktop (modified) (1 diff)
• gui/gdmsetup.desktop.in.in (modified) (1 diff)
• gui/greeter/Makefile.am (modified) (1 diff)
• gui/greeter/Makefile.in (modified) (3 diffs)
• gui/greeter/greeter.c (modified) (2 diffs)
• gui/greeter/themes/Makefile.in (modified) (1 diff)
• gui/greeter/themes/circles/Makefile.in (modified) (1 diff)
• gui/greeter/themes/circles/circles.xml (modified) (1 diff)
• gui/greeter/themes/happygnome-list/Makefile.in (modified) (1 diff)
• gui/greeter/themes/happygnome-list/happygnome.xml (modified) (1 diff)
• gui/greeter/themes/happygnome/Makefile.in (modified) (1 diff)
• gui/greeter/themes/happygnome/happygnome.xml (modified) (1 diff)
• gui/modules/Makefile.in (modified) (1 diff)
• ltmain.sh (modified) (3 diffs)
• pixmaps/16x16/Makefile.in (modified) (1 diff)
• pixmaps/32x32/Makefile.in (modified) (1 diff)
• pixmaps/48x48/Makefile.in (modified) (1 diff)
• pixmaps/Makefile.in (modified) (1 diff)
• po/fr.po (modified) (1 diff)
• utils/Makefile.in (modified) (1 diff)
• vicious-extensions/Makefile.in (modified) (1 diff)
• xdm.config.in (added)
• xdm.templates (added)

pkg/main/gdm/trunk/Makefile.in

@@ -47 +47 @@
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)
@@ -619 +618 @@
         $(am__remove_distdir)
         mkdir $(distdir)
-        $(mkdir_p) $(distdir)/. $(distdir)/config $(distdir)/m4 $(distdir)/po
+        $(mkdir_p) $(distdir)/. $(distdir)/config $(distdir)/po
         @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
         topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \

pkg/main/gdm/trunk/config.guess

@@ -2 +2 @@
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-timestamp='2005-07-08'
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
+
+timestamp='2006-07-02'
 
 # This file is free software; you can redistribute it and/or modify it
@@ -107 +108 @@
 trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ;
 : ${TMPDIR=/tmp} ;
- { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
+ { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } ||
  { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } ||
  { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } ||
@@ -207 +208 @@
         echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE}
         exit ;;
+    *:SolidBSD:*:*)
+        echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
+        exit ;;
     macppc:MirBSD:*:*)
-        echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+        echo powerpc-unknown-mirbsd${UNAME_RELEASE}
         exit ;;
     *:MirBSD:*:*)
@@ -765 +769 @@
         exit ;;
     *:FreeBSD:*:*)
-        echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
+        case ${UNAME_MACHINE} in
+            pc98)
+                echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+            amd64)
+                echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+            *)
+                echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+        esac
         exit ;;
     i*:CYGWIN*:*)
@@ -780 +791 @@
         echo ${UNAME_MACHINE}-pc-pw32
         exit ;;
-    x86:Interix*:[34]*)
-        echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//'
+    x86:Interix*:[3456]*)
+        echo i586-pc-interix${UNAME_RELEASE}
+        exit ;;
+    EM64T:Interix*:[3456]*)
+        echo x86_64-unknown-interix${UNAME_RELEASE}
         exit ;;
     [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@@ -795 +809 @@
         echo ${UNAME_MACHINE}-pc-uwin
         exit ;;
-    amd64:CYGWIN*:*:*)
+    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*)
         echo x86_64-unknown-cygwin
         exit ;;
@@ -816 +830 @@
         exit ;;
     arm*:Linux:*:*)
+        echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit ;;
+    avr32*:Linux:*:*)
         echo ${UNAME_MACHINE}-unknown-linux-gnu
         exit ;;
@@ -852 +869 @@
         #endif
 EOF
-        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+        eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+            /^CPU/{
+                s: ::g
+                p
+            }'`"
         test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
         ;;
@@ -871 +892 @@
         #endif
 EOF
-        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=`
+        eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+            /^CPU/{
+                s: ::g
+                p
+            }'`"
         test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
         ;;
+    or32:Linux:*:*)
+        echo or32-unknown-linux-gnu
+        exit ;;
     ppc:Linux:*:*)
         echo powerpc-unknown-linux-gnu
@@ -916 +944 @@
     sparc:Linux:*:* | sparc64:Linux:*:*)
         echo ${UNAME_MACHINE}-unknown-linux-gnu
+        exit ;;
+    vax:Linux:*:*)
+        echo ${UNAME_MACHINE}-dec-linux-gnu
         exit ;;
     x86_64:Linux:*:*)
@@ -962 +993 @@
         # endif
         #else
-        #ifdef __INTEL_COMPILER
+        #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
         LIBC=gnu
         #else
@@ -972 +1003 @@
         #endif
 EOF
-        eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=`
+        eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n '
+            /^LIBC/{
+                s: ::g
+                p
+            }'`"
         test x"${LIBC}" != x && {
                 echo "${UNAME_MACHINE}-pc-linux-${LIBC}"
@@ -1183 +1218 @@
         UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown
         case $UNAME_PROCESSOR in
-            *86) UNAME_PROCESSOR=i686 ;;
             unknown) UNAME_PROCESSOR=powerpc ;;
         esac
@@ -1261 +1295 @@
     i*86:skyos:*:*)
         echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//'
+        exit ;;
+    i*86:rdos:*:*)
+        echo ${UNAME_MACHINE}-pc-rdos
         exit ;;
 esac

pkg/main/gdm/trunk/config.sub

@@ -2 +2 @@
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
-
-timestamp='2005-07-08'
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+#   Inc.
+
+timestamp='2006-09-20'
 
 # This file is (in principle) common to ALL GNU software.
@@ -120 +121 @@
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \
-  kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*)
+  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
+  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
@@ -172 +174 @@
                 os=-hiuxwe2
                 ;;
+        -sco6)
+                os=-sco5v6
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
         -sco5)
                 os=-sco3.2v5
@@ -185 +191 @@
                 ;;
         -sco3.2v[4-9]*)
+                # Don't forget version if it is 3.2v4 or newer.
+                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
+                ;;
+        -sco5v6*)
                 # Don't forget version if it is 3.2v4 or newer.
                 basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
@@ -232 +242 @@
         | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
         | am33_2.0 \
-        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
         | bfin \
         | c4x | clipper \
@@ -240 +250 @@
         | i370 | i860 | i960 | ia64 \
         | ip2k | iq2000 \
-        | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \
+        | m32c | m32r | m32rle | m68000 | m68k | m88k \
+        | maxq | mb | microblaze | mcore \
         | mips | mipsbe | mipseb | mipsel | mipsle \
         | mips16 \
@@ -258 +269 @@
         | mipstx39 | mipstx39el \
         | mn10200 | mn10300 \
-        | ms1 \
+        | mt \
         | msp430 \
+        | nios | nios2 \
         | ns16k | ns32k \
         | or32 \
@@ -265 +277 @@
         | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
         | pyramid \
-        | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+        | score \
+        | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
         | sh64 | sh64le \
-        | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
-        | sparcv8 | sparcv9 | sparcv9b \
-        | strongarm \
+        | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+        | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+        | spu | strongarm \
         | tahoe | thumb | tic4x | tic80 | tron \
         | v850 | v850e \
         | we32k \
-        | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+        | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
         | z8k)
-                basic_machine=$basic_machine-unknown
-                ;;
-        m32c)
                 basic_machine=$basic_machine-unknown
                 ;;
@@ -286 +296 @@
                 ;;
         m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k)
+                ;;
+        ms1)
+                basic_machine=mt-unknown
                 ;;
 
@@ -306 +319 @@
         | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
         | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
-        | avr-* \
+        | avr-* | avr32-* \
         | bfin-* | bs2000-* \
         | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
@@ -317 +330 @@
         | i*86-* | i860-* | i960-* | ia64-* \
         | ip2k-* | iq2000-* \
-        | m32r-* | m32rle-* \
+        | m32c-* | m32r-* | m32rle-* \
         | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
         | m88110-* | m88k-* | maxq-* | mcore-* \
@@ -337 +350 @@
         | mipstx39-* | mipstx39el-* \
         | mmix-* \
-        | ms1-* \
+        | mt-* \
         | msp430-* \
+        | nios-* | nios2-* \
         | none-* | np1-* | ns16k-* | ns32k-* \
         | orion-* \
@@ -345 +359 @@
         | pyramid-* \
         | romp-* | rs6000-* \
-        | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+        | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
         | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
-        | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+        | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
         | sparclite-* \
-        | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+        | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
         | tahoe-* | thumb-* \
         | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
@@ -355 +369 @@
         | v850-* | v850e-* | vax-* \
         | we32k-* \
-        | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+        | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
         | xstormy16-* | xtensa-* \
         | ymp-* \
         | z8k-*)
-                ;;
-        m32c-*)
                 ;;
         # Recognize the various machine names and aliases which stand
@@ -696 +708 @@
                 basic_machine=i386-pc
                 os=-msdos
+                ;;
+        ms1-*)
+                basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
                 ;;
         mvs)
@@ -804 +819 @@
                 basic_machine=ns32k-pc532
                 ;;
+        pc98)
+                basic_machine=i386-pc
+                ;;
+        pc98-*)
+                basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'`
+                ;;
         pentium | p5 | k5 | k6 | nexgen | viac3)
                 basic_machine=i586-pc
@@ -860 +881 @@
                 os=-pw32
                 ;;
+        rdos)
+                basic_machine=i386-pc
+                os=-rdos
+                ;;
         rom68k)
                 basic_machine=m68k-rom68k
@@ -885 +910 @@
         sb1el)
                 basic_machine=mipsisa64sb1el-unknown
+                ;;
+        sde)
+                basic_machine=mipsisa32-sde
+                os=-elf
                 ;;
         sei)
@@ -1102 +1131 @@
                 basic_machine=sh-unknown
                 ;;
-        sparc | sparcv8 | sparcv9 | sparcv9b)
+        sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
                 basic_machine=sparc-sun
                 ;;
@@ -1175 +1204 @@
               | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \
               | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \
-              | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \
+              | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \
+              | -openbsd* | -solidbsd* \
               | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \
               | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \
@@ -1182 +1212 @@
               | -chorusos* | -chorusrdb* \
               | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-              | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \
+              | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+              | -uxpv* | -beos* | -mpeix* | -udk* \
               | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
               | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1189 +1220 @@
               | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
               | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
-              | -skyos* | -haiku*)
+              | -skyos* | -haiku* | -rdos* | -toppers*)
         # Remember, each alternative MUST END IN *, to match a version number.
                 ;;
@@ -1341 +1372 @@
 
 case $basic_machine in
+        score-*)
+                os=-elf
+                ;;
+        spu-*)
+                os=-elf
+                ;;
         *-acorn)
                 os=-riscix1.2
@@ -1350 +1387 @@
                 os=-aout
                 ;;
-    c4x-* | tic4x-*)
-        os=-coff
-        ;;
+        c4x-* | tic4x-*)
+                os=-coff
+                ;;
         # This must come before the *-dec entry.
         pdp10-*)

pkg/main/gdm/trunk/config/Makefile.in

@@ -43 +43 @@
         $(srcdir)/ssh.desktop.in.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)

pkg/main/gdm/trunk/config/PostLogin

@@ -5 +5 @@
 # script will be run before any setup is run on behalf of the user and is
 # useful if you for example need to do some setup to create a home directory
-# for the user or something like that.  $HOME, $LOGIN and such will all be
+# for the user or something like that.  $HOME, $LOGNAME and such will all be
 # set appropriately and this script is run as root.

pkg/main/gdm/trunk/config/XKeepsCrashing

@@ -11 +11 @@
 else
   GDMTRANSLATE=
+fi
+
+# Set the console to UTF-8 if needed.
+CHARMAP=`locale charmap`
+if test "$CHARMAP" = "UTF-8"
+then
+  unicode_start 2> /dev/null || true
+else
+  unicode_stop 2> /dev/null || true
 fi
 
@@ -39 +48 @@
 }
 
+# X has a bad habit of not restoring the vt settings on exit.  Make sure that
+# the keyboard is restored to xlate mode, since we're going to try to interact
+# with the user
+# (http://bugzilla.ubuntu.com/show_bug.cgi?id=6286)
+KBD_MODE=`gdmwhich kbd_mode`
+if test "x$KBD_MODE" != "x" ; then
+  kbd_mode -a
+fi
+
 MSG3=`gettextfunc "Failed to start the X server (your graphical interface).  It is likely that it is not set up correctly.  You will need to log in on a console and reconfigure the X server.  Then restart GDM."`
 MSG4=`gettextfunc "Would you like to try to configure the X server?  Note that you will need the root password for this."`
@@ -61 +79 @@
 
 #
-# First see if we can find an X configuration program
-#  (first one in the list will be used)
-#
-XCONFIGURATOR=
-for n in \
-  /usr/bin/system-config-display \
-  /usr/bin/redhat-config-xfree86 \
-  /usr/sbin/XFdrake              \
-  /usr/bin/X11/XF86Setup         \
-  /usr/bin/X11/Xconfigurator     \
-  /usr/bin/X11/xf86cfg           \
-   ; do
-  # standard shell test has no or and loops have no breaks, eek
-  if test "x$XCONFIGURATOR" = "x" ; then
-    if test -x "$n" ; then
-      XCONFIGURATOR="$n"
-    fi
-  fi
-done
-
-#
 # Now we check for dialog and gdmaskpass
 #
+DIALOG_OPTS=
 DIALOG=`gdmwhich dialog`
 if test "x$DIALOG" = "x" ; then
   DIALOG=`gdmwhich whiptail`
+  DIALOG_OPTS="--scrolltext"
 fi
 if test -x "$LIBEXECDIR/gdmaskpass" ; then
@@ -92 +91 @@
 else
   ASKPASS=
-fi
-
-#
-#  If this is a mouse problem try mouseconfig and modify some
-#  messages
-#
-if grep '^\(Cannot open mouse\|No core pointer\)' "$XLOG" 2> /dev/null ; then
-
-  MSG8=`gettextfunc "Failed to start the X server (your graphical interface).  It seems that the pointer device (your mouse) is not set up correctly.  Would you like to view the X server output to diagnose the problem?"`
-
-  if test -x /usr/sbin/mouseconfig ; then
-    XCONFIGURATOR=/usr/sbin/mouseconfig
-    # Note: we know this is a mouse problem and yay we have mouseconfig
-    MSG4=`gettextfunc "Would you like to try to configure the mouse?  Note that you will need the root password for this."`
-  fi
-
-  if test -x /usr/bin/system-config-mouse ; then
-    XCONFIGURATOR=/usr/bin/system-config-mouse
-    # Note: we know this is a mouse problem and yay we have system-config-mouse
-    MSG4=`gettextfunc "Would you like to try to configure the mouse?  Note that you will need the root password for this."`
-  fi
-
 fi
 
@@ -158 +135 @@
 
 if "$DIALOG" --yesno "$MSG8" 10 50 ; then 
-  "$DIALOG" --textbox "$XLOG" 22 76
+  "$DIALOG" $DIALOG_OPTS --textbox "$XLOG" 22 76
   # Support XFree86 v4 logfile thingie
   if grep '^(..) Log file: "' "$XLOG" 2> /dev/null ; then
     XLOG_DETAIL=`grep '^(..) Log file: "' "$XLOG" | sed 's/^[^"]*"\([^"]*\)".*$/\1/'`
     if "$DIALOG" --yesno "$MSG9" 10 50 ; then 
-      "$DIALOG" --textbox "$XLOG_DETAIL" 22 76
+      "$DIALOG" $DIALOG_OPTS --textbox "$XLOG_DETAIL" 22 76
     fi
   fi
 fi
 
-if test "x$XCONFIGURATOR" = "x" ; then
-  "$DIALOG" --msgbox "$MSG7" 8 50
-  exit 1
-fi
-
-if "$DIALOG" --yesno "$MSG4" 10 50 ; then 
-  clear
-  echo
-  echo "$MSG5"
-  if test "x$ASKPASS" = "x" ; then
-    # dirty trick to fool su into asking the root password even if were
-    # root
-    su nobody -c "su -c $XCONFIGURATOR"
-  else
-    if "$ASKPASS" ; then
-      "$XCONFIGURATOR"
-    fi
-  fi
-  clear
-  "$DIALOG" --msgbox "$MSG6" 8 50
-  exit 0
-else
-  "$DIALOG" --msgbox "$MSG7" 8 50
-  exit 1
-fi
+"$DIALOG" --msgbox "$MSG7" 8 50
+exit 1

pkg/main/gdm/trunk/config/gdm.conf.in

@@ -2 +2 @@
 #
 # This file should not be updated by hand.  Since GDM 2.13.0.4,
-# configuration choices in the /etc/X11/gdm/gdm.conf-custom file will
+# configuration choices in the /etc/gdm/gdm.conf file will
 # override the default values specified in this file (installation 
 # locations of the configuration files may vary for different distros).
@@ -31 +31 @@
 # e.g, the "Enable" key in the "[debug]" section would be "debug/Enable".
 #
-# You can also run gdm-restart or gdm-safe-restart to cause GDM to restart and
-# re-read the new configuration settings.  You can also restart GDM by sending
-# a HUP or USR1 signal to the daemon.  HUP behaves like gdm-restart and causes
-# any user session started by GDM to exit immediately while USR1 behaves like
-# gdm-safe-restart and will wait until all users log out before restarting GDM.
+# You can also run invoke-rc.d gdm reload or invoke-rc.d gdm restart
+# to cause GDM to restart and re-read the new configuration settings. 
+# You can also restart GDM by sending a HUP or USR1 signal to the
+# daemon.  HUP behaves like restart and causes any user session
+# started by GDM to exit immediately while USR1 behaves like
+# reload and will wait until all users log out before
+# restarting GDM.
 #
 # For full reference documentation see the GNOME help browser under
@@ -68 +70 @@
 # The greeter for local (non-xdmcp) logins.  Change gdmlogin to gdmgreeter to
 # get the new graphical greeter.
-#Greeter=@libexecdir@/gdmlogin
+Greeter=@libexecdir@/gdmgreeter
 
 # The greeter for xdmcp logins, usually you want a less graphically intensive
@@ -83 +85 @@
 
 # Default path to set.  The profile scripts will likely override this value.
-# This value will be overridden with the value from /etc/default/login if it
-# contains "ROOT=<pathvalue>".
-#DefaultPath=@GDM_USER_PATH@
+DefaultPath=/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games
 # Default path for root.  The profile scripts will likely override this value.
-# This value will be overridden with the value from /etc/default/login if it
-# contains "SUROOT=<pathvalue>".
-#RootPath=/sbin:/usr/sbin:@GDM_USER_PATH@
+RootPath=/usr/local/bin:/usr/local/sbin:/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/games
 
 # If you are having trouble with using a single server for a long time and want
@@ -105 +103 @@
 # does not always work, only if those clients have a window of their own.
 #KillInitClients=true
-LogDir=@logdir@
+LogDir=/var/log/gdm
 # You should probably never change this value unless you have a weird setup.
 PidFile=/var/run/gdm.pid
@@ -125 +123 @@
 # Reboot, Halt and suspend commands, you can add different commands separated
 # by a semicolon.  GDM will use the first one it can find.
-#RebootCommand=@REBOOT_COMMAND@
-#HaltCommand=@HALT_COMMAND@
-#SuspendCommand=@SUSPEND_COMMAND@
+RebootCommand=/sbin/shutdown -r now "Rebooted via gdm."
+HaltCommand=/sbin/shutdown -h now "Shut Down via gdm."
+SuspendCommand=/usr/bin/apm --suspend
 # Probably should not touch the below this is the standard setup.
 ServAuthDir=@authdir@
@@ -136 +134 @@
 # This is a directory where .desktop files describing the sessions live.  It is
 # really a PATH style variable since 2.4.4.2 to allow actual interoperability
-# with KDM.  Note that <dmconfdir>/Sessions is there for backwards
-# compatibility reasons with 2.4.4.x.
-#SessionDesktopDir=/etc/X11/sessions/:@dmconfdir@/Sessions/:@datadir@/gdm/BuiltInSessions/:@datadir@/xsessions/
+# with KDM.
+SessionDesktopDir=@datadir@/gdm/BuiltInSessions/:@datadir@/xsessions/:/var/lib/menu-xdg/xsessions/
 # This is the default .desktop session.  One of the ones in SessionDesktopDir
-#DefaultSession=gnome.desktop
+DefaultSession=default.desktop
 # Better leave this blank and HOME will be used.  You can use syntax ~/ below
 # to indicate home directory of the user.  You can also set this to something
@@ -166 +163 @@
 # X to use specific vts.  turn VTAllocation to false if this is causing
 # problems.
-#FirstVT=7
-#VTAllocation=true
+FirstVT=7
+VTAllocation=true
 # Should double login be treated with a warning (and possibility to change VT's
 # on Linux and FreeBSD systems for console logins)
@@ -206 +203 @@
 # Allow root to login.  It makes sense to turn this off for kiosk use, when
 # you want to minimize the possibility of break in.
-AllowRoot=true
+AllowRoot=false
 # Allow login as root via XDMCP.  This value will be overridden and set to
 # false if the /etc/default/login file exists and contains
@@ -216 +213 @@
 # 0 is the most restrictive, 1 allows group write permissions, 2 allows all
 # write permissions.
-RelaxPermissions=0
+RelaxPermissions=1
 # Check if directories are owned by logon user.  Set to false, if you have, for
 # example, home directories owned by some other user.
@@ -233 +230 @@
 # a "-nolisten tcp", as then the query just wouldn't work, so this setting only
 # affects truly local sessions.
-#DisallowTCP=true
+DisallowTCP=true
 # By default never place cookies if we "detect" NFS.  We detect NFS by
 # detecting "root-squashing".  It seems bad practice to place cookies on things
@@ -340 +337 @@
 # browser or in the gdmselection list for Automatic/Timed login.  They will not
 # be displayed regardless of the settings for Include and Exclude.
-#MinimalUID=100
+MinimalUID=1000
 # Users listed in Include will be included in the face browser and in the
 # gdmsetup selection list for Automatic/Timed login.  Users should be separated
@@ -349 +346 @@
 # be able to log in, but will have to type their username.  Users should be
 # separated by commas.  
-#Exclude=bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,gdm,postgres,pvm,rpm,nfsnobody,pcap
+Exclude=nobody
 # By default, an empty include list means display no users.  By setting
 # IncludeAll to true, the password file will be scanned and all users will be
@@ -357 +354 @@
 # environments.  The setting of IncludeAll does nothing if Include is set to a
 # non-empty value.
-#IncludeAll=false
+IncludeAll=true
 # If user or user.png exists in this dir it will be used as his picture.
 #GlobalFaceDir=@datadir@/pixmaps/faces/
@@ -364 +361 @@
 # 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=@gdmlocaledir@/locale.alias
+LocaleFile=/etc/gdm/locale.conf
 # Logo shown in the standard greeter.
-#Logo=@pixmapdir@/gdm-foot-logo.png
+Logo=@pixmapdir@/gdmDebianLogo.xpm
 # Logo shown on file chooser button in gdmsetup (do not modify this value).
 #ChooserButtonLogo=@pixmapdir@/gdm-foot-logo.png
@@ -455 +452 @@
 # key and set GraphicalThemeRand to true.  Otherwise use GraphicalTheme
 # and specify just one theme.
-#GraphicalTheme=circles
-#GraphicalThemes=circles/:happygnome
+GraphicalTheme=debian-moreblue
+#GraphicalThemes=debian-moreblue:/bijou/:blueswirl/:circles/:debblue-list/:debblue/:ayo/:debian-dawn/:debian-greeter/:debian/:glassfoot/:hantzley/:happygnome/:industrial/:crystal/:linsta
 GraphicalThemeDir=@datadir@/gdm/themes/
 GraphicalThemeRand=false
@@ -559 +556 @@
 [server-Standard]
 name=Standard server
-command=@X_SERVER@ @X_CONFIG_OPTIONS@ @XEVIE_OPTION@
+command=@X_SERVER@ -dpi 96 @X_CONFIG_OPTIONS@ @XEVIE_OPTION@
 flexible=true
 # Indicates that the X server should be started at a different process

pkg/main/gdm/trunk/configure.ac

@@ -970 +970 @@
 # location (the real directory) if possible.
 #
-if test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then
+if true; then # debian
+   X_PATH="/usr/bin"
+   X_SERVER_PATH="/usr/bin"
+   X_SERVER="/usr/bin/X"
+   X_CONFIG_OPTIONS="-audit 0"
+elif test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then
    X_PATH="/usr/X11R6/bin"
    X_SERVER_PATH="/usr/X11R6/bin"

pkg/main/gdm/trunk/daemon/Makefile.in

@@ -42 +42 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)

pkg/main/gdm/trunk/daemon/display.c

@@ -305 +305 @@
         closelog ();
 
-        /* Close everything */
-        gdm_close_all_descriptors (0 /* from */, fds[0] /* except */, slave_fifo_pipe_fd /* except2 */);
+        /* Close stdin/stdout/stderr.  Leave others, as pam modules may have them open */
+        close(0); close(1); close(2);
 
         /* No error checking here - if it's messed the best response

pkg/main/gdm/trunk/daemon/gdmconfig.c

@@ -594 +594 @@
     * that would be what the user wants.
     */
+
+    /*
+     * We disable this on Debian, as we already have the non-custom conf
+     * located in /usr/share.  So, we make the old conf the custom config
+     * in /etc, with the same name as before.  Users that upgrade to the new
+     * maintainer conf get just that (and a blank custom.conf to make changes
+     * in), and users that don't upgrade to the new conf, get both configs
+     * with the one they kept getting precedence.
+     */
+#if 0
    VE_IGNORE_EINTR (r = g_stat (GDM_OLD_CONF, statbuf));
    if (r >= 0) {
@@ -599 +609 @@
       return ve_config_new (custom_config_file);
    }
+#endif
 
    VE_IGNORE_EINTR (r = g_stat (GDM_CUSTOM_CONF, statbuf));

pkg/main/gdm/trunk/daemon/misc.c

@@ -345 +345 @@
 
 /*
- * Clear environment, but keep the i18n ones,
- * note that this leaks memory so only use before exec
- * (keep LD_* if preserve_ld_vars is true)
- */
-void
-gdm_clearenv_no_lang (void)
-{
-        int i;
-        GList *li, *envs = NULL;
-
-        for (i = 0; environ[i] != NULL; i++) {
-                char *env = environ[i];
-                if (strncmp (env, "LC_", 3) == 0 ||
-                    strncmp (env, "LANG", 4) == 0 ||
-                    strncmp (env, "LINGUAS", 7) == 0)
-                        envs = g_list_prepend (envs, g_strdup (env));
-                if (preserve_ld_vars &&
-                    strncmp (env, "LD_", 3) == 0)
-                        envs = g_list_prepend (envs, g_strdup (env));
-        }
-
-        ve_clearenv ();
-
-        for (li = envs; li != NULL; li = li->next) {
-                putenv (li->data);
-        }
-
-        g_list_free (envs);
-}
-
-/*
  * Clear environment completely
  * note that this leaks memory so only use before exec
@@ -1392 +1361 @@
 gdm_fdgetc (int fd)
 {
-        char buf[1];
+        unsigned char buf[1];
         int bytes;
 

pkg/main/gdm/trunk/daemon/server.c

@@ -1256 +1256 @@
                         _exit (SERVER_ABORT);
                 }
+        /*
+         * When started as root, X will read $HOME/xorg.conf before files in /etc.  As this isn't what users
+         * expect from gdm starting up, we set $HOME to be /etc/X11.  (an unset $HOME will cause the X server
+         * to bail)  The Debian X server will have this removed soon, and hopefully the change will go
+         * upstream, at which point the original code will not cause user confusion.
+         */
+#if 0
                 if (pwent->pw_dir != NULL &&
                     g_file_test (pwent->pw_dir, G_FILE_TEST_EXISTS))
@@ -1261 +1268 @@
                 else
                         g_setenv ("HOME", "/", TRUE); /* Hack */
+#endif
+                g_setenv ("HOME", "/etc/X11", TRUE);
                 g_setenv ("SHELL", pwent->pw_shell, TRUE);
                 g_unsetenv ("MAIL");

pkg/main/gdm/trunk/daemon/slave.c

@@ -1751 +1751 @@
                 if ( ! ve_string_empty (display->theme_name))
                         g_setenv ("GDM_GTK_THEME", display->theme_name, TRUE);
-                g_unsetenv ("MAIL");    /* Unset $MAIL for broken shells */
 
                 closelog ();
@@ -2476 +2475 @@
         closelog ();
 
-        gdm_close_all_descriptors (2 /* from */, -1 /* except */, -1 /* except2 */);
-
-        gdm_open_dev_null (O_RDWR); /* open stderr - fd 2 */
+        /*
+         * Leave stderr open to the log
+         */
+        gdm_close_all_descriptors (3 /* from */, -1 /* except */, -1 /* except2 */);
 
         openlog ("gdm", LOG_PID, LOG_DAEMON);
@@ -2512 +2512 @@
                       GDM_GREETER_PROTOCOL_VERSION, TRUE);
         g_setenv ("GDM_VERSION", VERSION, TRUE);
-        g_unsetenv ("MAIL");    /* Unset $MAIL for broken shells */
 
         pwent = getpwnam (gdmuser);
@@ -2946 +2945 @@
 
                 VE_IGNORE_EINTR (close (0));
-                gdm_close_all_descriptors (2 /* from */, -1 /* except */, -1 /* except2 */);
+                gdm_close_all_descriptors (3 /* from */, -1 /* except */, -1 /* except2 */);
 
                 gdm_open_dev_null (O_RDONLY); /* open stdin - fd 0 */
-                gdm_open_dev_null (O_RDWR); /* open stderr - fd 2 */
 
                 openlog ("gdm", LOG_PID, LOG_DAEMON);
@@ -2979 +2977 @@
 
                 g_setenv ("GDM_VERSION", VERSION, TRUE);
-
-                g_unsetenv ("MAIL");    /* Unset $MAIL for broken shells */
 
                 pwent = getpwnam (gdmuser);
@@ -3435 +3431 @@
         g_setenv ("USERNAME", pwent->pw_name, TRUE);
         g_setenv ("HOME", home_dir, TRUE);
+        g_setenv ("PWD", home_dir, TRUE);
         g_setenv ("GDMSESSION", session, TRUE);
         g_setenv ("DESKTOP_SESSION", session, TRUE);
         g_setenv ("SHELL", pwent->pw_shell, TRUE);
-        g_unsetenv ("MAIL");    /* Unset $MAIL for broken shells */
 
         if (d->type == TYPE_STATIC) {
@@ -5300 +5296 @@
         if ( ! ve_string_empty (d->theme_name))
                 g_setenv ("GDM_GTK_THEME", d->theme_name, TRUE);
-        g_unsetenv ("MAIL");
         argv = ve_split (script);
         VE_IGNORE_EINTR (execv (argv[0], argv));
@@ -5439 +5434 @@
             if ( ! ve_string_empty (d->theme_name))
                     g_setenv ("GDM_GTK_THEME", d->theme_name, TRUE);
-            g_unsetenv ("MAIL");
 
             argv = ve_split (str->str);

pkg/main/gdm/trunk/daemon/verify-pam.c

@@ -826 +826 @@
     null_tok = 0;
 
-    /* start the timer for timed logins */
-    if ( ! ve_string_empty (gdm_get_value_string (GDM_KEY_TIMED_LOGIN)) &&
-        d->timed_login_ok &&
-        (local || gdm_get_value_bool (GDM_KEY_ALLOW_REMOTE_AUTOLOGIN))) {
-            gdm_slave_greeter_ctl_no_ret (GDM_STARTTIMER, "");
-            started_timer = TRUE;
-    }
-
+    /* don't start a time login if we've already entered a username */
     if (username != NULL) {
             login = g_strdup (username);
             gdm_slave_greeter_ctl_no_ret (GDM_SETLOGIN, login);
+    } else {
+            /* start the timer for timed logins */
+            if ( ! ve_string_empty (gdm_get_value_string (GDM_KEY_TIMED_LOGIN)) &&
+                d->timed_login_ok &&
+                (local || gdm_get_value_bool (GDM_KEY_ALLOW_REMOTE_AUTOLOGIN))) {
+                    gdm_slave_greeter_ctl_no_ret (GDM_STARTTIMER, "");
+                    started_timer = TRUE;
+                }
     }
 
@@ -1112 +1113 @@
         gdm_slave_action_pending ()) {
             /* I'm not sure yet if I should display this message for any other issues - heeten */
+            /* at least AUTHINFO_UNAVAIL -- it's what user unknown is! */
             if (pamerr == PAM_AUTH_ERR ||
-                pamerr == PAM_USER_UNKNOWN) {
+                pamerr == PAM_USER_UNKNOWN ||
+                pamerr == PAM_AUTHINFO_UNAVAIL) {
                     gboolean is_capslock = FALSE;
                     const char *basemsg;

pkg/main/gdm/trunk/docs/C/gdm.xml

@@ -1 +1 @@
 <?xml version="1.0"?>
 <!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" 
-    "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [
+    "/usr/share/sgml/docbook/dtd/xml/4.1.2/docbookx.dtd" [
     <!ENTITY legal SYSTEM "legal.xml">
     <!ENTITY version "2.15.1"> 

pkg/main/gdm/trunk/docs/Makefile.in

@@ -64 +64 @@
 subdir = docs
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)

pkg/main/gdm/trunk/docs/de/Makefile.in

@@ -102 +102 @@
 subdir = docs/de
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)

pkg/main/gdm/trunk/docs/es/Makefile.in

@@ -102 +102 @@
 subdir = docs/es
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)

pkg/main/gdm/trunk/docs/fr/Makefile.in

@@ -102 +102 @@
 subdir = docs/fr
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)

pkg/main/gdm/trunk/docs/gdm.1

@@ -39 +39 @@
 For full documentation see the GNOME help browser
 under the
-.B GNOME / System
+.B Applications / System Tools
 section.
 .SH OPTIONS

pkg/main/gdm/trunk/docs/it/Makefile.in

@@ -102 +102 @@
 subdir = docs/it
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)

pkg/main/gdm/trunk/docs/ja/Makefile.in

@@ -102 +102 @@
 subdir = docs/ja
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)

pkg/main/gdm/trunk/docs/ko/Makefile.in

@@ -102 +102 @@
 subdir = docs/ko
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)

pkg/main/gdm/trunk/docs/zh_CN/Makefile.in

@@ -102 +102 @@
 subdir = docs/zh_CN
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)

pkg/main/gdm/trunk/docs/zh_HK/Makefile.in

@@ -102 +102 @@
 subdir = docs/zh_HK
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)

pkg/main/gdm/trunk/docs/zh_TW/Makefile.in

@@ -102 +102 @@
 subdir = docs/zh_TW
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)

pkg/main/gdm/trunk/gui/Makefile.am

@@ -120 +120 @@
         $(GDKPIXBUF_LIBS)       \
         $(top_builddir)/vicious-extensions/libviciousui-minimal.a \
-        $(X_EXTRA_LIBS)         \
-        $(XINERAMA_LIBS)        \
-        $(X_LIBS)               \
-        -lX11
+        $(XINERAMA_LIBS)
 
 # LIBGNOMEUI should be removed from gdmsetup at some point.
@@ -142 +139 @@
         $(EXTRA_SETUP_LIBS)     \
         $(LIBGNOMEUI_LIBS)      \
-        $(top_builddir)/vicious-extensions/libviciousui.a \
-        $(X_LIBS)               \
-        -lXau                   \
-        -lX11
+        $(top_builddir)/vicious-extensions/libviciousui.a
 
 gdmphotosetup_LDADD = \

pkg/main/gdm/trunk/gui/Makefile.in

@@ -47 +47 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)
@@ -114 +113 @@
         $(am__DEPENDENCIES_1) \
         $(top_builddir)/vicious-extensions/libviciousui-minimal.a \
-        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
         $(am__DEPENDENCIES_1)
 am_gdmphotosetup_OBJECTS = gdmphotosetup.$(OBJEXT)
@@ -130 +128 @@
         $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
         $(am__DEPENDENCIES_1) \
-        $(top_builddir)/vicious-extensions/libviciousui.a \
-        $(am__DEPENDENCIES_1)
+        $(top_builddir)/vicious-extensions/libviciousui.a
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp = $(SHELL) $(top_srcdir)/depcomp
@@ -521 +518 @@
         $(GDKPIXBUF_LIBS)       \
         $(top_builddir)/vicious-extensions/libviciousui-minimal.a \
-        $(X_EXTRA_LIBS)         \
-        $(XINERAMA_LIBS)        \
-        $(X_LIBS)               \
-        -lX11
+        $(XINERAMA_LIBS)
 
 
@@ -544 +538 @@
         $(EXTRA_SETUP_LIBS)     \
         $(LIBGNOMEUI_LIBS)      \
-        $(top_builddir)/vicious-extensions/libviciousui.a \
-        $(X_LIBS)               \
-        -lXau                   \
-        -lX11
+        $(top_builddir)/vicious-extensions/libviciousui.a
 
 gdmphotosetup_LDADD = \

pkg/main/gdm/trunk/gui/faces/Makefile.in

@@ -40 +40 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)

pkg/main/gdm/trunk/gui/gdmcommon.c

@@ -265 +265 @@
         guint sid;
 
-        if ( ! ve_string_empty (g_getenv ("GDM_IS_LOCAL")) &&
-            strncmp (ve_sure_string (g_getenv ("DISPLAY")), ":0", 2) == 0)
-                return;
-
         sid = g_signal_lookup ("activate",
                                GTK_TYPE_MENU_ITEM);
@@ -307 +303 @@
         EntryBlink *eb;
         GtkSettings *settings;
-
-        if ( ! ve_string_empty (g_getenv ("GDM_IS_LOCAL")) &&
-            strncmp (ve_sure_string (g_getenv ("DISPLAY")), ":0", 2) == 0)
-                return;
 
         eb = g_new0 (EntryBlink, 1);

pkg/main/gdm/trunk/gui/gdmlanguages.c

@@ -243 +243 @@
 {
         int i;
+
         if (lang_names != NULL)
                 return;
@@ -469 +470 @@
         GList *langs = NULL;
         GHashTable *dupcheck;
-        gboolean got_english = FALSE;
         Language *language;
         gboolean clean;
@@ -561 +561 @@
                                      GINT_TO_POINTER (1));
 
-                /* if we have an english locale */
-                if (strncmp (lang, "en_", 3) == 0 ||
-                    strcmp (lang, "C") == 0)
-                        got_english = TRUE;
-
                 g_strfreev (lang_list);
         }
@@ -572 +567 @@
         g_hash_table_destroy (dupcheck);
 
-        /* If we haven't found any english locale, add american
-         * english as that's as much of a fallback as we can get */
-        if ( ! got_english)
-                langs = g_list_prepend (langs, g_strdup ("en_US"));
+        /* Ensure there is at least one English locale -- the one available
+         * on all systems, "C" */
+        langs = g_list_prepend (langs, g_strdup ("C"));
 
         curlocale = setlocale (LC_MESSAGES, NULL);

pkg/main/gdm/trunk/gui/gdmsetup.desktop

@@ -144 +144 @@
 ¥ç®¡ç†å“¡ïŒ‰
 TryExec=/usr/local/sbin/gdmsetup
-Exec=gdmsetup
+Exec=gksu "sudo /usr/sbin/gdmsetup"
 Icon=gdm-setup
 StartupNotify=true

pkg/main/gdm/trunk/gui/gdmsetup.desktop.in.in

@@ -5 +5 @@
 _Comment=Configure the login window (GNOME Display Manager)
 TryExec=@sbindir@/gdmsetup
-Exec=gdmsetup
+Exec=gksu "sudo /usr/sbin/gdmsetup"
 Icon=gdm-setup
 StartupNotify=true

pkg/main/gdm/trunk/gui/greeter/Makefile.am

@@ -86 +86 @@
         $(GDKPIXBUF_LIBS)       \
         $(GREETER_LIBS)         \
-        $(X_EXTRA_LIBS)         \
-        $(XINERAMA_LIBS)        \
-        $(X_LIBS)               \
-        -lX11
+        $(XINERAMA_LIBS)
 
 EXTRA_DIST = \

pkg/main/gdm/trunk/gui/greeter/Makefile.in

@@ -42 +42 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)
@@ -65 +64 @@
 gdmgreeter_DEPENDENCIES =  \
         $(top_builddir)/vicious-extensions/libviciousui-minimal.a \
-        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
         $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
         $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \
@@ -408 +406 @@
         $(GDKPIXBUF_LIBS)       \
         $(GREETER_LIBS)         \
-        $(X_EXTRA_LIBS)         \
-        $(XINERAMA_LIBS)        \
-        $(X_LIBS)               \
-        -lX11
+        $(XINERAMA_LIBS)
 
 EXTRA_DIST = \

pkg/main/gdm/trunk/gui/greeter/greeter.c

@@ -93 +93 @@
 }
 
-/* If in random theme mode then grab a random theme from those selected */
+static char *get_theme_file (const char *in, char **theme_dir);
+
+/* If in random theme mode then grab a random theme from those selected.
+ * If a theme doesn't exist, try  the rest of the list from the randomly chosen
+ * position for one that does.
+ */
 static char *
 get_random_theme ()
 {
     char **vec;
-        char *themes_list;
-        char *theme;
+    char *themes_list;
+    char *theme = NULL;
+    char *dir;
     int size;
-        int i;
+    int chosen;
+    int i;
 
     themes_list = gdm_config_get_string (GDM_KEY_GRAPHICAL_THEMES);
@@ -116 +123 @@
 
         /* Get Random Theme from list */
-        srand (time (NULL));
-        i = rand () % size;
-        theme = g_strdup (vec[i]);
+        srand ( time(NULL) );
+        chosen = rand() % size;
+
+        /* Find a theme that exists */
+        for (i = 0; i < size; i++) {
+                int j;
+                char *file;
+
+                j = (i + chosen >= size) ? i+chosen-size : i+chosen;
+                file = get_theme_file( vec[j], &dir );
+
+                g_free(file);
+                if (g_file_test(dir, G_FILE_TEST_IS_DIR)) {
+                    g_free(dir);
+                        theme = g_strdup (vec[j]);
+                        break;
+                }
+            g_free(dir);
+        }
+
     g_strfreev (vec);
 

pkg/main/gdm/trunk/gui/greeter/themes/Makefile.in

@@ -39 +39 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)

pkg/main/gdm/trunk/gui/greeter/themes/circles/Makefile.in

@@ -40 +40 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)

pkg/main/gdm/trunk/gui/greeter/themes/circles/circles.xml

@@ -85 +85 @@
         </fixed>
       </item>
-      <item type="button" id="ok_button">
-        <pos anchor="n" x="50%" height="32" width="50%"/>
-        <stock type="ok"/>
-      </item>
-      <item type="button" id="cancel_button">
-        <pos anchor="n" x="50%" height="32" width="50%"/>
-        <stock type="startagain"/>
-      </item>
       <item type="label" id="pam-message">
         <pos anchor="n" x="50%"/>

pkg/main/gdm/trunk/gui/greeter/themes/happygnome-list/Makefile.in

@@ -40 +40 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)

pkg/main/gdm/trunk/gui/greeter/themes/happygnome-list/happygnome.xml

@@ -96 +96 @@
         </fixed>
       </item>
-      <item type="button" id="ok_button">
-        <pos anchor="n" x="50%" height="32" width="50%"/>
-        <stock type="ok"/>
-      </item>
-      <item type="button" id="cancel_button">
-        <pos anchor="n" x="50%" height="32" width="50%"/>
-        <stock type="startagain"/>
-      </item>
       <item type="label" id="pam-message">
         <pos anchor="n" x="50%"/>

pkg/main/gdm/trunk/gui/greeter/themes/happygnome/Makefile.in

@@ -40 +40 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)

pkg/main/gdm/trunk/gui/greeter/themes/happygnome/happygnome.xml

@@ -85 +85 @@
         </fixed>
       </item>
-      <item type="button" id="ok_button">
-        <pos anchor="n" x="50%" height="32" width="50%"/>
-        <stock type="ok"/>
-      </item>
-      <item type="button" id="cancel_button">
-        <pos anchor="n" x="50%" height="32" width="50%"/>
-        <stock type="startagain"/>
-      </item>
       <item type="label" id="pam-message">
         <pos anchor="n" x="50%"/>

pkg/main/gdm/trunk/gui/modules/Makefile.in

@@ -41 +41 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)

pkg/main/gdm/trunk/ltmain.sh

@@ -44 +44 @@
 PROGRAM=ltmain.sh
 PACKAGE=libtool
-VERSION=1.5.22
+VERSION="1.5.22 Debian 1.5.22-4"
 TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)"
 
@@ -2083 +2083 @@
         dlopen) libs="$dlfiles" ;;
         dlpreopen) libs="$dlprefiles" ;;
-        link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
+        link)
+          libs="$deplibs %DEPLIBS%"
+          test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
+          ;;
         esac
       fi
@@ -3201 +3204 @@
             age="$number_minor"
             revision="$number_minor"
+            ;;
+          *)
+            $echo "$modename: unknown library version type \`$version_type'" 1>&2
+            $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2
+            exit $EXIT_FAILURE
             ;;
           esac

pkg/main/gdm/trunk/pixmaps/16x16/Makefile.in

@@ -42 +42 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)

pkg/main/gdm/trunk/pixmaps/32x32/Makefile.in

@@ -42 +42 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)

pkg/main/gdm/trunk/pixmaps/48x48/Makefile.in

@@ -42 +42 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)

pkg/main/gdm/trunk/pixmaps/Makefile.in

@@ -40 +40 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)

pkg/main/gdm/trunk/po/fr.po

@@ -401 +401 @@
 #, c-format
 msgid "System is shutting down, please wait ..."
-msgstr "Le systÚme est en train de s'arrêter, veuillez patientez..."
+msgstr "Le systÚme est en train de s'arrêter, veuillez patienter..."
 
 #: ../daemon/gdm.c:672

pkg/main/gdm/trunk/utils/Makefile.in

@@ -46 +46 @@
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)

pkg/main/gdm/trunk/vicious-extensions/Makefile.in

@@ -43 +43 @@
         COPYING.LIB ChangeLog
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
-        $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
         $(ACLOCAL_M4)