Changeset 138


Ignore:
Timestamp:
03/27/07 15:38:14 (7 years ago)
Author:
alanbach-guest
Message:

[svn-inject] Applying Debian modifications to trunk

Location:
pkg/main/gdm/trunk
Files:
31 added
3 deleted
53 edited

Legend:

Unmodified
Added
Removed
  • pkg/main/gdm/trunk/Makefile.in

    r135 r138  
    4747subdir = . 
    4848ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 
    49 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ 
    50         $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac 
     49am__aclocal_m4_deps = $(top_srcdir)/configure.ac 
    5150am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    5251        $(ACLOCAL_M4) 
     
    619618        $(am__remove_distdir) 
    620619        mkdir $(distdir) 
    621         $(mkdir_p) $(distdir)/. $(distdir)/config $(distdir)/m4 $(distdir)/po 
     620        $(mkdir_p) $(distdir)/. $(distdir)/config $(distdir)/po 
    622621        @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \ 
    623622        topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \ 
  • pkg/main/gdm/trunk/config.guess

    r135 r138  
    22# Attempt to guess a canonical system name. 
    33#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 
    4 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. 
    5  
    6 timestamp='2005-07-08' 
     4#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, 
     5#   Inc. 
     6 
     7timestamp='2006-07-02' 
    78 
    89# This file is free software; you can redistribute it and/or modify it 
     
    107108trap "rm -f \$tmpfiles 2>/dev/null; rmdir \$tmp 2>/dev/null; exit 1" 1 2 13 15 ; 
    108109: ${TMPDIR=/tmp} ; 
    109  { tmp=`(umask 077 && mktemp -d -q "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || 
     110 { tmp=`(umask 077 && mktemp -d "$TMPDIR/cgXXXXXX") 2>/dev/null` && test -n "$tmp" && test -d "$tmp" ; } || 
    110111 { test -n "$RANDOM" && tmp=$TMPDIR/cg$$-$RANDOM && (umask 077 && mkdir $tmp) ; } || 
    111112 { tmp=$TMPDIR/cg-$$ && (umask 077 && mkdir $tmp) && echo "Warning: creating insecure temp directory" >&2 ; } || 
     
    207208        echo ${UNAME_MACHINE}-unknown-ekkobsd${UNAME_RELEASE} 
    208209        exit ;; 
     210    *:SolidBSD:*:*) 
     211        echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE} 
     212        exit ;; 
    209213    macppc:MirBSD:*:*) 
    210         echo powerppc-unknown-mirbsd${UNAME_RELEASE} 
     214        echo powerpc-unknown-mirbsd${UNAME_RELEASE} 
    211215        exit ;; 
    212216    *:MirBSD:*:*) 
     
    765769        exit ;; 
    766770    *:FreeBSD:*:*) 
    767         echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` 
     771        case ${UNAME_MACHINE} in 
     772            pc98) 
     773                echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; 
     774            amd64) 
     775                echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; 
     776            *) 
     777                echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;; 
     778        esac 
    768779        exit ;; 
    769780    i*:CYGWIN*:*) 
     
    780791        echo ${UNAME_MACHINE}-pc-pw32 
    781792        exit ;; 
    782     x86:Interix*:[34]*) 
    783         echo i586-pc-interix${UNAME_RELEASE}|sed -e 's/\..*//' 
     793    x86:Interix*:[3456]*) 
     794        echo i586-pc-interix${UNAME_RELEASE} 
     795        exit ;; 
     796    EM64T:Interix*:[3456]*) 
     797        echo x86_64-unknown-interix${UNAME_RELEASE} 
    784798        exit ;; 
    785799    [345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*) 
     
    795809        echo ${UNAME_MACHINE}-pc-uwin 
    796810        exit ;; 
    797     amd64:CYGWIN*:*:*) 
     811    amd64:CYGWIN*:*:* | x86_64:CYGWIN*:*:*) 
    798812        echo x86_64-unknown-cygwin 
    799813        exit ;; 
     
    816830        exit ;; 
    817831    arm*:Linux:*:*) 
     832        echo ${UNAME_MACHINE}-unknown-linux-gnu 
     833        exit ;; 
     834    avr32*:Linux:*:*) 
    818835        echo ${UNAME_MACHINE}-unknown-linux-gnu 
    819836        exit ;; 
     
    852869        #endif 
    853870EOF 
    854         eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` 
     871        eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' 
     872            /^CPU/{ 
     873                s: ::g 
     874                p 
     875            }'`" 
    855876        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } 
    856877        ;; 
     
    871892        #endif 
    872893EOF 
    873         eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^CPU=` 
     894        eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' 
     895            /^CPU/{ 
     896                s: ::g 
     897                p 
     898            }'`" 
    874899        test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; } 
    875900        ;; 
     901    or32:Linux:*:*) 
     902        echo or32-unknown-linux-gnu 
     903        exit ;; 
    876904    ppc:Linux:*:*) 
    877905        echo powerpc-unknown-linux-gnu 
     
    916944    sparc:Linux:*:* | sparc64:Linux:*:*) 
    917945        echo ${UNAME_MACHINE}-unknown-linux-gnu 
     946        exit ;; 
     947    vax:Linux:*:*) 
     948        echo ${UNAME_MACHINE}-dec-linux-gnu 
    918949        exit ;; 
    919950    x86_64:Linux:*:*) 
     
    962993        # endif 
    963994        #else 
    964         #ifdef __INTEL_COMPILER 
     995        #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC) 
    965996        LIBC=gnu 
    966997        #else 
     
    9721003        #endif 
    9731004EOF 
    974         eval `$CC_FOR_BUILD -E $dummy.c 2>/dev/null | grep ^LIBC=` 
     1005        eval "`$CC_FOR_BUILD -E $dummy.c 2>/dev/null | sed -n ' 
     1006            /^LIBC/{ 
     1007                s: ::g 
     1008                p 
     1009            }'`" 
    9751010        test x"${LIBC}" != x && { 
    9761011                echo "${UNAME_MACHINE}-pc-linux-${LIBC}" 
     
    11831218        UNAME_PROCESSOR=`uname -p` || UNAME_PROCESSOR=unknown 
    11841219        case $UNAME_PROCESSOR in 
    1185             *86) UNAME_PROCESSOR=i686 ;; 
    11861220            unknown) UNAME_PROCESSOR=powerpc ;; 
    11871221        esac 
     
    12611295    i*86:skyos:*:*) 
    12621296        echo ${UNAME_MACHINE}-pc-skyos`echo ${UNAME_RELEASE}` | sed -e 's/ .*$//' 
     1297        exit ;; 
     1298    i*86:rdos:*:*) 
     1299        echo ${UNAME_MACHINE}-pc-rdos 
    12631300        exit ;; 
    12641301esac 
  • pkg/main/gdm/trunk/config.sub

    r135 r138  
    22# Configuration validation subroutine script. 
    33#   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 
    4 #   2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. 
    5  
    6 timestamp='2005-07-08' 
     4#   2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, 
     5#   Inc. 
     6 
     7timestamp='2006-09-20' 
    78 
    89# This file is (in principle) common to ALL GNU software. 
     
    120121maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'` 
    121122case $maybe_os in 
    122   nto-qnx* | linux-gnu* | linux-dietlibc | linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | \ 
    123   kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | storm-chaos* | os2-emx* | rtmk-nova*) 
     123  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \ 
     124  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \ 
     125  storm-chaos* | os2-emx* | rtmk-nova*) 
    124126    os=-$maybe_os 
    125127    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'` 
     
    172174                os=-hiuxwe2 
    173175                ;; 
     176        -sco6) 
     177                os=-sco5v6 
     178                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` 
     179                ;; 
    174180        -sco5) 
    175181                os=-sco3.2v5 
     
    185191                ;; 
    186192        -sco3.2v[4-9]*) 
     193                # Don't forget version if it is 3.2v4 or newer. 
     194                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` 
     195                ;; 
     196        -sco5v6*) 
    187197                # Don't forget version if it is 3.2v4 or newer. 
    188198                basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'` 
     
    232242        | alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \ 
    233243        | am33_2.0 \ 
    234         | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \ 
     244        | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \ 
    235245        | bfin \ 
    236246        | c4x | clipper \ 
     
    240250        | i370 | i860 | i960 | ia64 \ 
    241251        | ip2k | iq2000 \ 
    242         | m32r | m32rle | m68000 | m68k | m88k | maxq | mcore \ 
     252        | m32c | m32r | m32rle | m68000 | m68k | m88k \ 
     253        | maxq | mb | microblaze | mcore \ 
    243254        | mips | mipsbe | mipseb | mipsel | mipsle \ 
    244255        | mips16 \ 
     
    258269        | mipstx39 | mipstx39el \ 
    259270        | mn10200 | mn10300 \ 
    260         | ms1 \ 
     271        | mt \ 
    261272        | msp430 \ 
     273        | nios | nios2 \ 
    262274        | ns16k | ns32k \ 
    263275        | or32 \ 
     
    265277        | powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \ 
    266278        | pyramid \ 
    267         | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \ 
     279        | score \ 
     280        | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \ 
    268281        | sh64 | sh64le \ 
    269         | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \ 
    270         | sparcv8 | sparcv9 | sparcv9b \ 
    271         | strongarm \ 
     282        | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \ 
     283        | sparcv8 | sparcv9 | sparcv9b | sparcv9v \ 
     284        | spu | strongarm \ 
    272285        | tahoe | thumb | tic4x | tic80 | tron \ 
    273286        | v850 | v850e \ 
    274287        | we32k \ 
    275         | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \ 
     288        | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \ 
    276289        | z8k) 
    277                 basic_machine=$basic_machine-unknown 
    278                 ;; 
    279         m32c) 
    280290                basic_machine=$basic_machine-unknown 
    281291                ;; 
     
    286296                ;; 
    287297        m88110 | m680[12346]0 | m683?2 | m68360 | m5200 | v70 | w65 | z8k) 
     298                ;; 
     299        ms1) 
     300                basic_machine=mt-unknown 
    288301                ;; 
    289302 
     
    306319        | alphapca5[67]-* | alpha64pca5[67]-* | arc-* \ 
    307320        | arm-*  | armbe-* | armle-* | armeb-* | armv*-* \ 
    308         | avr-* \ 
     321        | avr-* | avr32-* \ 
    309322        | bfin-* | bs2000-* \ 
    310323        | c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \ 
     
    317330        | i*86-* | i860-* | i960-* | ia64-* \ 
    318331        | ip2k-* | iq2000-* \ 
    319         | m32r-* | m32rle-* \ 
     332        | m32c-* | m32r-* | m32rle-* \ 
    320333        | m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \ 
    321334        | m88110-* | m88k-* | maxq-* | mcore-* \ 
     
    337350        | mipstx39-* | mipstx39el-* \ 
    338351        | mmix-* \ 
    339         | ms1-* \ 
     352        | mt-* \ 
    340353        | msp430-* \ 
     354        | nios-* | nios2-* \ 
    341355        | none-* | np1-* | ns16k-* | ns32k-* \ 
    342356        | orion-* \ 
     
    345359        | pyramid-* \ 
    346360        | romp-* | rs6000-* \ 
    347         | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \ 
     361        | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \ 
    348362        | shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \ 
    349         | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \ 
     363        | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \ 
    350364        | sparclite-* \ 
    351         | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \ 
     365        | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \ 
    352366        | tahoe-* | thumb-* \ 
    353367        | tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \ 
     
    355369        | v850-* | v850e-* | vax-* \ 
    356370        | we32k-* \ 
    357         | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \ 
     371        | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \ 
    358372        | xstormy16-* | xtensa-* \ 
    359373        | ymp-* \ 
    360374        | z8k-*) 
    361                 ;; 
    362         m32c-*) 
    363375                ;; 
    364376        # Recognize the various machine names and aliases which stand 
     
    696708                basic_machine=i386-pc 
    697709                os=-msdos 
     710                ;; 
     711        ms1-*) 
     712                basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'` 
    698713                ;; 
    699714        mvs) 
     
    804819                basic_machine=ns32k-pc532 
    805820                ;; 
     821        pc98) 
     822                basic_machine=i386-pc 
     823                ;; 
     824        pc98-*) 
     825                basic_machine=i386-`echo $basic_machine | sed 's/^[^-]*-//'` 
     826                ;; 
    806827        pentium | p5 | k5 | k6 | nexgen | viac3) 
    807828                basic_machine=i586-pc 
     
    860881                os=-pw32 
    861882                ;; 
     883        rdos) 
     884                basic_machine=i386-pc 
     885                os=-rdos 
     886                ;; 
    862887        rom68k) 
    863888                basic_machine=m68k-rom68k 
     
    885910        sb1el) 
    886911                basic_machine=mipsisa64sb1el-unknown 
     912                ;; 
     913        sde) 
     914                basic_machine=mipsisa32-sde 
     915                os=-elf 
    887916                ;; 
    888917        sei) 
     
    11021131                basic_machine=sh-unknown 
    11031132                ;; 
    1104         sparc | sparcv8 | sparcv9 | sparcv9b) 
     1133        sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v) 
    11051134                basic_machine=sparc-sun 
    11061135                ;; 
     
    11751204              | -nindy* | -vxsim* | -vxworks* | -ebmon* | -hms* | -mvs* \ 
    11761205              | -clix* | -riscos* | -uniplus* | -iris* | -rtu* | -xenix* \ 
    1177               | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* | -openbsd* \ 
     1206              | -hiux* | -386bsd* | -knetbsd* | -mirbsd* | -netbsd* \ 
     1207              | -openbsd* | -solidbsd* \ 
    11781208              | -ekkobsd* | -kfreebsd* | -freebsd* | -riscix* | -lynxos* \ 
    11791209              | -bosx* | -nextstep* | -cxux* | -aout* | -elf* | -oabi* \ 
     
    11821212              | -chorusos* | -chorusrdb* \ 
    11831213              | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \ 
    1184               | -mingw32* | -linux-gnu* | -linux-uclibc* | -uxpv* | -beos* | -mpeix* | -udk* \ 
     1214              | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \ 
     1215              | -uxpv* | -beos* | -mpeix* | -udk* \ 
    11851216              | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \ 
    11861217              | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \ 
     
    11891220              | -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \ 
    11901221              | -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \ 
    1191               | -skyos* | -haiku*) 
     1222              | -skyos* | -haiku* | -rdos* | -toppers*) 
    11921223        # Remember, each alternative MUST END IN *, to match a version number. 
    11931224                ;; 
     
    13411372 
    13421373case $basic_machine in 
     1374        score-*) 
     1375                os=-elf 
     1376                ;; 
     1377        spu-*) 
     1378                os=-elf 
     1379                ;; 
    13431380        *-acorn) 
    13441381                os=-riscix1.2 
     
    13501387                os=-aout 
    13511388                ;; 
    1352     c4x-* | tic4x-*) 
    1353         os=-coff 
    1354         ;; 
     1389        c4x-* | tic4x-*) 
     1390                os=-coff 
     1391                ;; 
    13551392        # This must come before the *-dec entry. 
    13561393        pdp10-*) 
  • pkg/main/gdm/trunk/config/Makefile.in

    r135 r138  
    4343        $(srcdir)/ssh.desktop.in.in 
    4444ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 
    45 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ 
    46         $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac 
     45am__aclocal_m4_deps = $(top_srcdir)/configure.ac 
    4746am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    4847        $(ACLOCAL_M4) 
  • pkg/main/gdm/trunk/config/PostLogin

    r135 r138  
    55# script will be run before any setup is run on behalf of the user and is 
    66# useful if you for example need to do some setup to create a home directory 
    7 # for the user or something like that.  $HOME, $LOGIN and such will all be 
     7# for the user or something like that.  $HOME, $LOGNAME and such will all be 
    88# set appropriately and this script is run as root. 
  • pkg/main/gdm/trunk/config/XKeepsCrashing

    r135 r138  
    1111else 
    1212  GDMTRANSLATE= 
     13fi 
     14 
     15# Set the console to UTF-8 if needed. 
     16CHARMAP=`locale charmap` 
     17if test "$CHARMAP" = "UTF-8" 
     18then 
     19  unicode_start 2> /dev/null || true 
     20else 
     21  unicode_stop 2> /dev/null || true 
    1322fi 
    1423 
     
    3948} 
    4049 
     50# X has a bad habit of not restoring the vt settings on exit.  Make sure that 
     51# the keyboard is restored to xlate mode, since we're going to try to interact 
     52# with the user 
     53# (http://bugzilla.ubuntu.com/show_bug.cgi?id=6286) 
     54KBD_MODE=`gdmwhich kbd_mode` 
     55if test "x$KBD_MODE" != "x" ; then 
     56  kbd_mode -a 
     57fi 
     58 
    4159MSG3=`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."` 
    4260MSG4=`gettextfunc "Would you like to try to configure the X server?  Note that you will need the root password for this."` 
     
    6179 
    6280# 
    63 # First see if we can find an X configuration program 
    64 #  (first one in the list will be used) 
    65 # 
    66 XCONFIGURATOR= 
    67 for n in \ 
    68   /usr/bin/system-config-display \ 
    69   /usr/bin/redhat-config-xfree86 \ 
    70   /usr/sbin/XFdrake              \ 
    71   /usr/bin/X11/XF86Setup         \ 
    72   /usr/bin/X11/Xconfigurator     \ 
    73   /usr/bin/X11/xf86cfg           \ 
    74    ; do 
    75   # standard shell test has no or and loops have no breaks, eek 
    76   if test "x$XCONFIGURATOR" = "x" ; then 
    77     if test -x "$n" ; then 
    78       XCONFIGURATOR="$n" 
    79     fi 
    80   fi 
    81 done 
    82  
    83 # 
    8481# Now we check for dialog and gdmaskpass 
    8582# 
     83DIALOG_OPTS= 
    8684DIALOG=`gdmwhich dialog` 
    8785if test "x$DIALOG" = "x" ; then 
    8886  DIALOG=`gdmwhich whiptail` 
     87  DIALOG_OPTS="--scrolltext" 
    8988fi 
    9089if test -x "$LIBEXECDIR/gdmaskpass" ; then 
     
    9291else 
    9392  ASKPASS= 
    94 fi 
    95  
    96 # 
    97 #  If this is a mouse problem try mouseconfig and modify some 
    98 #  messages 
    99 # 
    100 if grep '^\(Cannot open mouse\|No core pointer\)' "$XLOG" 2> /dev/null ; then 
    101  
    102   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?"` 
    103  
    104   if test -x /usr/sbin/mouseconfig ; then 
    105     XCONFIGURATOR=/usr/sbin/mouseconfig 
    106     # Note: we know this is a mouse problem and yay we have mouseconfig 
    107     MSG4=`gettextfunc "Would you like to try to configure the mouse?  Note that you will need the root password for this."` 
    108   fi 
    109  
    110   if test -x /usr/bin/system-config-mouse ; then 
    111     XCONFIGURATOR=/usr/bin/system-config-mouse 
    112     # Note: we know this is a mouse problem and yay we have system-config-mouse 
    113     MSG4=`gettextfunc "Would you like to try to configure the mouse?  Note that you will need the root password for this."` 
    114   fi 
    115  
    11693fi 
    11794 
     
    158135 
    159136if "$DIALOG" --yesno "$MSG8" 10 50 ; then  
    160   "$DIALOG" --textbox "$XLOG" 22 76 
     137  "$DIALOG" $DIALOG_OPTS --textbox "$XLOG" 22 76 
    161138  # Support XFree86 v4 logfile thingie 
    162139  if grep '^(..) Log file: "' "$XLOG" 2> /dev/null ; then 
    163140    XLOG_DETAIL=`grep '^(..) Log file: "' "$XLOG" | sed 's/^[^"]*"\([^"]*\)".*$/\1/'` 
    164141    if "$DIALOG" --yesno "$MSG9" 10 50 ; then  
    165       "$DIALOG" --textbox "$XLOG_DETAIL" 22 76 
     142      "$DIALOG" $DIALOG_OPTS --textbox "$XLOG_DETAIL" 22 76 
    166143    fi 
    167144  fi 
    168145fi 
    169146 
    170 if test "x$XCONFIGURATOR" = "x" ; then 
    171   "$DIALOG" --msgbox "$MSG7" 8 50 
    172   exit 1 
    173 fi 
    174  
    175 if "$DIALOG" --yesno "$MSG4" 10 50 ; then  
    176   clear 
    177   echo 
    178   echo "$MSG5" 
    179   if test "x$ASKPASS" = "x" ; then 
    180     # dirty trick to fool su into asking the root password even if were 
    181     # root 
    182     su nobody -c "su -c $XCONFIGURATOR" 
    183   else 
    184     if "$ASKPASS" ; then 
    185       "$XCONFIGURATOR" 
    186     fi 
    187   fi 
    188   clear 
    189   "$DIALOG" --msgbox "$MSG6" 8 50 
    190   exit 0 
    191 else 
    192   "$DIALOG" --msgbox "$MSG7" 8 50 
    193   exit 1 
    194 fi 
     147"$DIALOG" --msgbox "$MSG7" 8 50 
     148exit 1 
  • pkg/main/gdm/trunk/config/gdm.conf.in

    r135 r138  
    22# 
    33# This file should not be updated by hand.  Since GDM 2.13.0.4, 
    4 # configuration choices in the /etc/X11/gdm/gdm.conf-custom file will 
     4# configuration choices in the /etc/gdm/gdm.conf file will 
    55# override the default values specified in this file (installation  
    66# locations of the configuration files may vary for different distros). 
     
    3131# e.g, the "Enable" key in the "[debug]" section would be "debug/Enable". 
    3232# 
    33 # You can also run gdm-restart or gdm-safe-restart to cause GDM to restart and 
    34 # re-read the new configuration settings.  You can also restart GDM by sending 
    35 # a HUP or USR1 signal to the daemon.  HUP behaves like gdm-restart and causes 
    36 # any user session started by GDM to exit immediately while USR1 behaves like 
    37 # gdm-safe-restart and will wait until all users log out before restarting GDM. 
     33# You can also run invoke-rc.d gdm reload or invoke-rc.d gdm restart 
     34# to cause GDM to restart and re-read the new configuration settings.  
     35# You can also restart GDM by sending a HUP or USR1 signal to the 
     36# daemon.  HUP behaves like restart and causes any user session 
     37# started by GDM to exit immediately while USR1 behaves like 
     38# reload and will wait until all users log out before 
     39# restarting GDM. 
    3840# 
    3941# For full reference documentation see the GNOME help browser under 
     
    6870# The greeter for local (non-xdmcp) logins.  Change gdmlogin to gdmgreeter to 
    6971# get the new graphical greeter. 
    70 #Greeter=@libexecdir@/gdmlogin 
     72Greeter=@libexecdir@/gdmgreeter 
    7173 
    7274# The greeter for xdmcp logins, usually you want a less graphically intensive 
     
    8385 
    8486# Default path to set.  The profile scripts will likely override this value. 
    85 # This value will be overridden with the value from /etc/default/login if it 
    86 # contains "ROOT=<pathvalue>". 
    87 #DefaultPath=@GDM_USER_PATH@ 
     87DefaultPath=/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/games 
    8888# Default path for root.  The profile scripts will likely override this value. 
    89 # This value will be overridden with the value from /etc/default/login if it 
    90 # contains "SUROOT=<pathvalue>". 
    91 #RootPath=/sbin:/usr/sbin:@GDM_USER_PATH@ 
     89RootPath=/usr/local/bin:/usr/local/sbin:/sbin:/usr/sbin:/bin:/usr/bin:/usr/bin/X11:/usr/games 
    9290 
    9391# If you are having trouble with using a single server for a long time and want 
     
    105103# does not always work, only if those clients have a window of their own. 
    106104#KillInitClients=true 
    107 LogDir=@logdir@ 
     105LogDir=/var/log/gdm 
    108106# You should probably never change this value unless you have a weird setup. 
    109107PidFile=/var/run/gdm.pid 
     
    125123# Reboot, Halt and suspend commands, you can add different commands separated 
    126124# by a semicolon.  GDM will use the first one it can find. 
    127 #RebootCommand=@REBOOT_COMMAND@ 
    128 #HaltCommand=@HALT_COMMAND@ 
    129 #SuspendCommand=@SUSPEND_COMMAND@ 
     125RebootCommand=/sbin/shutdown -r now "Rebooted via gdm." 
     126HaltCommand=/sbin/shutdown -h now "Shut Down via gdm." 
     127SuspendCommand=/usr/bin/apm --suspend 
    130128# Probably should not touch the below this is the standard setup. 
    131129ServAuthDir=@authdir@ 
     
    136134# This is a directory where .desktop files describing the sessions live.  It is 
    137135# really a PATH style variable since 2.4.4.2 to allow actual interoperability 
    138 # with KDM.  Note that <dmconfdir>/Sessions is there for backwards 
    139 # compatibility reasons with 2.4.4.x. 
    140 #SessionDesktopDir=/etc/X11/sessions/:@dmconfdir@/Sessions/:@datadir@/gdm/BuiltInSessions/:@datadir@/xsessions/ 
     136# with KDM. 
     137SessionDesktopDir=@datadir@/gdm/BuiltInSessions/:@datadir@/xsessions/:/var/lib/menu-xdg/xsessions/ 
    141138# This is the default .desktop session.  One of the ones in SessionDesktopDir 
    142 #DefaultSession=gnome.desktop 
     139DefaultSession=default.desktop 
    143140# Better leave this blank and HOME will be used.  You can use syntax ~/ below 
    144141# to indicate home directory of the user.  You can also set this to something 
     
    166163# X to use specific vts.  turn VTAllocation to false if this is causing 
    167164# problems. 
    168 #FirstVT=7 
    169 #VTAllocation=true 
     165FirstVT=7 
     166VTAllocation=true 
    170167# Should double login be treated with a warning (and possibility to change VT's 
    171168# on Linux and FreeBSD systems for console logins) 
     
    206203# Allow root to login.  It makes sense to turn this off for kiosk use, when 
    207204# you want to minimize the possibility of break in. 
    208 AllowRoot=true 
     205AllowRoot=false 
    209206# Allow login as root via XDMCP.  This value will be overridden and set to 
    210207# false if the /etc/default/login file exists and contains 
     
    216213# 0 is the most restrictive, 1 allows group write permissions, 2 allows all 
    217214# write permissions. 
    218 RelaxPermissions=0 
     215RelaxPermissions=1 
    219216# Check if directories are owned by logon user.  Set to false, if you have, for 
    220217# example, home directories owned by some other user. 
     
    233230# a "-nolisten tcp", as then the query just wouldn't work, so this setting only 
    234231# affects truly local sessions. 
    235 #DisallowTCP=true 
     232DisallowTCP=true 
    236233# By default never place cookies if we "detect" NFS.  We detect NFS by 
    237234# detecting "root-squashing".  It seems bad practice to place cookies on things 
     
    340337# browser or in the gdmselection list for Automatic/Timed login.  They will not 
    341338# be displayed regardless of the settings for Include and Exclude. 
    342 #MinimalUID=100 
     339MinimalUID=1000 
    343340# Users listed in Include will be included in the face browser and in the 
    344341# gdmsetup selection list for Automatic/Timed login.  Users should be separated 
     
    349346# be able to log in, but will have to type their username.  Users should be 
    350347# separated by commas.   
    351 #Exclude=bin,daemon,adm,lp,sync,shutdown,halt,mail,news,uucp,operator,nobody,gdm,postgres,pvm,rpm,nfsnobody,pcap 
     348Exclude=nobody 
    352349# By default, an empty include list means display no users.  By setting 
    353350# IncludeAll to true, the password file will be scanned and all users will be 
     
    357354# environments.  The setting of IncludeAll does nothing if Include is set to a 
    358355# non-empty value. 
    359 #IncludeAll=false 
     356IncludeAll=true 
    360357# If user or user.png exists in this dir it will be used as his picture. 
    361358#GlobalFaceDir=@datadir@/pixmaps/faces/ 
     
    364361# the one shipped with GDM and edit it.  It is not a standard locale.alias 
    365362# file, although GDM will be able to read a standard locale.alias file as well. 
    366 #LocaleFile=@gdmlocaledir@/locale.alias 
     363LocaleFile=/etc/gdm/locale.conf 
    367364# Logo shown in the standard greeter. 
    368 #Logo=@pixmapdir@/gdm-foot-logo.png 
     365Logo=@pixmapdir@/gdmDebianLogo.xpm 
    369366# Logo shown on file chooser button in gdmsetup (do not modify this value). 
    370367#ChooserButtonLogo=@pixmapdir@/gdm-foot-logo.png 
     
    455452# key and set GraphicalThemeRand to true.  Otherwise use GraphicalTheme 
    456453# and specify just one theme. 
    457 #GraphicalTheme=circles 
    458 #GraphicalThemes=circles/:happygnome 
     454GraphicalTheme=debian-moreblue 
     455#GraphicalThemes=debian-moreblue:/bijou/:blueswirl/:circles/:debblue-list/:debblue/:ayo/:debian-dawn/:debian-greeter/:debian/:glassfoot/:hantzley/:happygnome/:industrial/:crystal/:linsta 
    459456GraphicalThemeDir=@datadir@/gdm/themes/ 
    460457GraphicalThemeRand=false 
     
    559556[server-Standard] 
    560557name=Standard server 
    561 command=@X_SERVER@ @X_CONFIG_OPTIONS@ @XEVIE_OPTION@ 
     558command=@X_SERVER@ -dpi 96 @X_CONFIG_OPTIONS@ @XEVIE_OPTION@ 
    562559flexible=true 
    563560# Indicates that the X server should be started at a different process 
  • pkg/main/gdm/trunk/configure.ac

    r135 r138  
    970970# location (the real directory) if possible. 
    971971# 
    972 if test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then 
     972if true; then # debian 
     973   X_PATH="/usr/bin" 
     974   X_SERVER_PATH="/usr/bin" 
     975   X_SERVER="/usr/bin/X" 
     976   X_CONFIG_OPTIONS="-audit 0" 
     977elif test ! -h /usr/X11R6 -a -x /usr/X11R6/bin/X; then 
    973978   X_PATH="/usr/X11R6/bin" 
    974979   X_SERVER_PATH="/usr/X11R6/bin" 
  • pkg/main/gdm/trunk/daemon/Makefile.in

    r135 r138  
    4242DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 
    4343ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 
    44 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ 
    45         $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac 
     44am__aclocal_m4_deps = $(top_srcdir)/configure.ac 
    4645am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    4746        $(ACLOCAL_M4) 
  • pkg/main/gdm/trunk/daemon/display.c

    r135 r138  
    305305        closelog (); 
    306306 
    307         /* Close everything */ 
    308         gdm_close_all_descriptors (0 /* from */, fds[0] /* except */, slave_fifo_pipe_fd /* except2 */); 
     307        /* Close stdin/stdout/stderr.  Leave others, as pam modules may have them open */ 
     308        close(0); close(1); close(2); 
    309309 
    310310        /* No error checking here - if it's messed the best response 
  • pkg/main/gdm/trunk/daemon/gdmconfig.c

    r135 r138  
    594594    * that would be what the user wants. 
    595595    */ 
     596 
     597    /* 
     598     * We disable this on Debian, as we already have the non-custom conf 
     599     * located in /usr/share.  So, we make the old conf the custom config 
     600     * in /etc, with the same name as before.  Users that upgrade to the new 
     601     * maintainer conf get just that (and a blank custom.conf to make changes 
     602     * in), and users that don't upgrade to the new conf, get both configs 
     603     * with the one they kept getting precedence. 
     604     */ 
     605#if 0 
    596606   VE_IGNORE_EINTR (r = g_stat (GDM_OLD_CONF, statbuf)); 
    597607   if (r >= 0) { 
     
    599609      return ve_config_new (custom_config_file); 
    600610   } 
     611#endif 
    601612 
    602613   VE_IGNORE_EINTR (r = g_stat (GDM_CUSTOM_CONF, statbuf)); 
  • pkg/main/gdm/trunk/daemon/misc.c

    r135 r138  
    345345 
    346346/* 
    347  * Clear environment, but keep the i18n ones, 
    348  * note that this leaks memory so only use before exec 
    349  * (keep LD_* if preserve_ld_vars is true) 
    350  */ 
    351 void 
    352 gdm_clearenv_no_lang (void) 
    353 { 
    354         int i; 
    355         GList *li, *envs = NULL; 
    356  
    357         for (i = 0; environ[i] != NULL; i++) { 
    358                 char *env = environ[i]; 
    359                 if (strncmp (env, "LC_", 3) == 0 || 
    360                     strncmp (env, "LANG", 4) == 0 || 
    361                     strncmp (env, "LINGUAS", 7) == 0) 
    362                         envs = g_list_prepend (envs, g_strdup (env)); 
    363                 if (preserve_ld_vars && 
    364                     strncmp (env, "LD_", 3) == 0) 
    365                         envs = g_list_prepend (envs, g_strdup (env)); 
    366         } 
    367  
    368         ve_clearenv (); 
    369  
    370         for (li = envs; li != NULL; li = li->next) { 
    371                 putenv (li->data); 
    372         } 
    373  
    374         g_list_free (envs); 
    375 } 
    376  
    377 /* 
    378347 * Clear environment completely 
    379348 * note that this leaks memory so only use before exec 
     
    13921361gdm_fdgetc (int fd) 
    13931362{ 
    1394         char buf[1]; 
     1363        unsigned char buf[1]; 
    13951364        int bytes; 
    13961365 
  • pkg/main/gdm/trunk/daemon/server.c

    r135 r138  
    12561256                        _exit (SERVER_ABORT); 
    12571257                } 
     1258        /* 
     1259         * When started as root, X will read $HOME/xorg.conf before files in /etc.  As this isn't what users 
     1260         * expect from gdm starting up, we set $HOME to be /etc/X11.  (an unset $HOME will cause the X server 
     1261         * to bail)  The Debian X server will have this removed soon, and hopefully the change will go 
     1262         * upstream, at which point the original code will not cause user confusion. 
     1263         */ 
     1264#if 0 
    12581265                if (pwent->pw_dir != NULL && 
    12591266                    g_file_test (pwent->pw_dir, G_FILE_TEST_EXISTS)) 
     
    12611268                else 
    12621269                        g_setenv ("HOME", "/", TRUE); /* Hack */ 
     1270#endif 
     1271                g_setenv ("HOME", "/etc/X11", TRUE); 
    12631272                g_setenv ("SHELL", pwent->pw_shell, TRUE); 
    12641273                g_unsetenv ("MAIL"); 
  • pkg/main/gdm/trunk/daemon/slave.c

    r135 r138  
    17511751                if ( ! ve_string_empty (display->theme_name)) 
    17521752                        g_setenv ("GDM_GTK_THEME", display->theme_name, TRUE); 
    1753                 g_unsetenv ("MAIL");    /* Unset $MAIL for broken shells */ 
    17541753 
    17551754                closelog (); 
     
    24762475        closelog (); 
    24772476 
    2478         gdm_close_all_descriptors (2 /* from */, -1 /* except */, -1 /* except2 */); 
    2479  
    2480         gdm_open_dev_null (O_RDWR); /* open stderr - fd 2 */ 
     2477        /* 
     2478         * Leave stderr open to the log 
     2479         */ 
     2480        gdm_close_all_descriptors (3 /* from */, -1 /* except */, -1 /* except2 */); 
    24812481 
    24822482        openlog ("gdm", LOG_PID, LOG_DAEMON); 
     
    25122512                      GDM_GREETER_PROTOCOL_VERSION, TRUE); 
    25132513        g_setenv ("GDM_VERSION", VERSION, TRUE); 
    2514         g_unsetenv ("MAIL");    /* Unset $MAIL for broken shells */ 
    25152514 
    25162515        pwent = getpwnam (gdmuser); 
     
    29462945 
    29472946                VE_IGNORE_EINTR (close (0)); 
    2948                 gdm_close_all_descriptors (2 /* from */, -1 /* except */, -1 /* except2 */); 
     2947                gdm_close_all_descriptors (3 /* from */, -1 /* except */, -1 /* except2 */); 
    29492948 
    29502949                gdm_open_dev_null (O_RDONLY); /* open stdin - fd 0 */ 
    2951                 gdm_open_dev_null (O_RDWR); /* open stderr - fd 2 */ 
    29522950 
    29532951                openlog ("gdm", LOG_PID, LOG_DAEMON); 
     
    29792977 
    29802978                g_setenv ("GDM_VERSION", VERSION, TRUE); 
    2981  
    2982                 g_unsetenv ("MAIL");    /* Unset $MAIL for broken shells */ 
    29832979 
    29842980                pwent = getpwnam (gdmuser); 
     
    34353431        g_setenv ("USERNAME", pwent->pw_name, TRUE); 
    34363432        g_setenv ("HOME", home_dir, TRUE); 
     3433        g_setenv ("PWD", home_dir, TRUE); 
    34373434        g_setenv ("GDMSESSION", session, TRUE); 
    34383435        g_setenv ("DESKTOP_SESSION", session, TRUE); 
    34393436        g_setenv ("SHELL", pwent->pw_shell, TRUE); 
    3440         g_unsetenv ("MAIL");    /* Unset $MAIL for broken shells */ 
    34413437 
    34423438        if (d->type == TYPE_STATIC) { 
     
    53005296        if ( ! ve_string_empty (d->theme_name)) 
    53015297                g_setenv ("GDM_GTK_THEME", d->theme_name, TRUE); 
    5302         g_unsetenv ("MAIL"); 
    53035298        argv = ve_split (script); 
    53045299        VE_IGNORE_EINTR (execv (argv[0], argv)); 
     
    54395434            if ( ! ve_string_empty (d->theme_name)) 
    54405435                    g_setenv ("GDM_GTK_THEME", d->theme_name, TRUE); 
    5441             g_unsetenv ("MAIL"); 
    54425436 
    54435437            argv = ve_split (str->str); 
  • pkg/main/gdm/trunk/daemon/verify-pam.c

    r135 r138  
    826826    null_tok = 0; 
    827827 
    828     /* start the timer for timed logins */ 
    829     if ( ! ve_string_empty (gdm_get_value_string (GDM_KEY_TIMED_LOGIN)) && 
    830         d->timed_login_ok && 
    831         (local || gdm_get_value_bool (GDM_KEY_ALLOW_REMOTE_AUTOLOGIN))) { 
    832             gdm_slave_greeter_ctl_no_ret (GDM_STARTTIMER, ""); 
    833             started_timer = TRUE; 
    834     } 
    835  
     828    /* don't start a time login if we've already entered a username */ 
    836829    if (username != NULL) { 
    837830            login = g_strdup (username); 
    838831            gdm_slave_greeter_ctl_no_ret (GDM_SETLOGIN, login); 
     832    } else { 
     833            /* start the timer for timed logins */ 
     834            if ( ! ve_string_empty (gdm_get_value_string (GDM_KEY_TIMED_LOGIN)) && 
     835                d->timed_login_ok && 
     836                (local || gdm_get_value_bool (GDM_KEY_ALLOW_REMOTE_AUTOLOGIN))) { 
     837                    gdm_slave_greeter_ctl_no_ret (GDM_STARTTIMER, ""); 
     838                    started_timer = TRUE; 
     839                } 
    839840    } 
    840841 
     
    11121113        gdm_slave_action_pending ()) { 
    11131114            /* I'm not sure yet if I should display this message for any other issues - heeten */ 
     1115            /* at least AUTHINFO_UNAVAIL -- it's what user unknown is! */ 
    11141116            if (pamerr == PAM_AUTH_ERR || 
    1115                 pamerr == PAM_USER_UNKNOWN) { 
     1117                pamerr == PAM_USER_UNKNOWN || 
     1118                pamerr == PAM_AUTHINFO_UNAVAIL) { 
    11161119                    gboolean is_capslock = FALSE; 
    11171120                    const char *basemsg; 
  • pkg/main/gdm/trunk/docs/C/gdm.xml

    r135 r138  
    11<?xml version="1.0"?> 
    22<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN"  
    3     "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" [ 
     3    "/usr/share/sgml/docbook/dtd/xml/4.1.2/docbookx.dtd" [ 
    44    <!ENTITY legal SYSTEM "legal.xml"> 
    55    <!ENTITY version "2.15.1">  
  • pkg/main/gdm/trunk/docs/Makefile.in

    r135 r138  
    6464subdir = docs 
    6565ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 
    66 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ 
    67         $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac 
     66am__aclocal_m4_deps = $(top_srcdir)/configure.ac 
    6867am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    6968        $(ACLOCAL_M4) 
  • pkg/main/gdm/trunk/docs/de/Makefile.in

    r135 r138  
    102102subdir = docs/de 
    103103ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 
    104 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ 
    105         $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac 
     104am__aclocal_m4_deps = $(top_srcdir)/configure.ac 
    106105am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    107106        $(ACLOCAL_M4) 
  • pkg/main/gdm/trunk/docs/es/Makefile.in

    r135 r138  
    102102subdir = docs/es 
    103103ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 
    104 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ 
    105         $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac 
     104am__aclocal_m4_deps = $(top_srcdir)/configure.ac 
    106105am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    107106        $(ACLOCAL_M4) 
  • pkg/main/gdm/trunk/docs/fr/Makefile.in

    r135 r138  
    102102subdir = docs/fr 
    103103ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 
    104 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ 
    105         $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac 
     104am__aclocal_m4_deps = $(top_srcdir)/configure.ac 
    106105am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    107106        $(ACLOCAL_M4) 
  • pkg/main/gdm/trunk/docs/gdm.1

    r135 r138  
    3939For full documentation see the GNOME help browser 
    4040under the 
    41 .B GNOME / System 
     41.B Applications / System Tools 
    4242section. 
    4343.SH OPTIONS 
  • pkg/main/gdm/trunk/docs/it/Makefile.in

    r135 r138  
    102102subdir = docs/it 
    103103ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 
    104 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ 
    105         $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac 
     104am__aclocal_m4_deps = $(top_srcdir)/configure.ac 
    106105am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    107106        $(ACLOCAL_M4) 
  • pkg/main/gdm/trunk/docs/ja/Makefile.in

    r135 r138  
    102102subdir = docs/ja 
    103103ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 
    104 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ 
    105         $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac 
     104am__aclocal_m4_deps = $(top_srcdir)/configure.ac 
    106105am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    107106        $(ACLOCAL_M4) 
  • pkg/main/gdm/trunk/docs/ko/Makefile.in

    r135 r138  
    102102subdir = docs/ko 
    103103ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 
    104 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ 
    105         $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac 
     104am__aclocal_m4_deps = $(top_srcdir)/configure.ac 
    106105am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    107106        $(ACLOCAL_M4) 
  • pkg/main/gdm/trunk/docs/zh_CN/Makefile.in

    r135 r138  
    102102subdir = docs/zh_CN 
    103103ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 
    104 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ 
    105         $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac 
     104am__aclocal_m4_deps = $(top_srcdir)/configure.ac 
    106105am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    107106        $(ACLOCAL_M4) 
  • pkg/main/gdm/trunk/docs/zh_HK/Makefile.in

    r135 r138  
    102102subdir = docs/zh_HK 
    103103ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 
    104 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ 
    105         $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac 
     104am__aclocal_m4_deps = $(top_srcdir)/configure.ac 
    106105am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    107106        $(ACLOCAL_M4) 
  • pkg/main/gdm/trunk/docs/zh_TW/Makefile.in

    r135 r138  
    102102subdir = docs/zh_TW 
    103103ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 
    104 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ 
    105         $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac 
     104am__aclocal_m4_deps = $(top_srcdir)/configure.ac 
    106105am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    107106        $(ACLOCAL_M4) 
  • pkg/main/gdm/trunk/gui/Makefile.am

    r135 r138  
    120120        $(GDKPIXBUF_LIBS)       \ 
    121121        $(top_builddir)/vicious-extensions/libviciousui-minimal.a \ 
    122         $(X_EXTRA_LIBS)         \ 
    123         $(XINERAMA_LIBS)        \ 
    124         $(X_LIBS)               \ 
    125         -lX11 
     122        $(XINERAMA_LIBS) 
    126123 
    127124# LIBGNOMEUI should be removed from gdmsetup at some point. 
     
    142139        $(EXTRA_SETUP_LIBS)     \ 
    143140        $(LIBGNOMEUI_LIBS)      \ 
    144         $(top_builddir)/vicious-extensions/libviciousui.a \ 
    145         $(X_LIBS)               \ 
    146         -lXau                   \ 
    147         -lX11 
     141        $(top_builddir)/vicious-extensions/libviciousui.a 
    148142 
    149143gdmphotosetup_LDADD = \ 
  • pkg/main/gdm/trunk/gui/Makefile.in

    r135 r138  
    4747DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 
    4848ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 
    49 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ 
    50         $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac 
     49am__aclocal_m4_deps = $(top_srcdir)/configure.ac 
    5150am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    5251        $(ACLOCAL_M4) 
     
    114113        $(am__DEPENDENCIES_1) \ 
    115114        $(top_builddir)/vicious-extensions/libviciousui-minimal.a \ 
    116         $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ 
    117115        $(am__DEPENDENCIES_1) 
    118116am_gdmphotosetup_OBJECTS = gdmphotosetup.$(OBJEXT) 
     
    130128        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ 
    131129        $(am__DEPENDENCIES_1) \ 
    132         $(top_builddir)/vicious-extensions/libviciousui.a \ 
    133         $(am__DEPENDENCIES_1) 
     130        $(top_builddir)/vicious-extensions/libviciousui.a 
    134131DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir) 
    135132depcomp = $(SHELL) $(top_srcdir)/depcomp 
     
    521518        $(GDKPIXBUF_LIBS)       \ 
    522519        $(top_builddir)/vicious-extensions/libviciousui-minimal.a \ 
    523         $(X_EXTRA_LIBS)         \ 
    524         $(XINERAMA_LIBS)        \ 
    525         $(X_LIBS)               \ 
    526         -lX11 
     520        $(XINERAMA_LIBS) 
    527521 
    528522 
     
    544538        $(EXTRA_SETUP_LIBS)     \ 
    545539        $(LIBGNOMEUI_LIBS)      \ 
    546         $(top_builddir)/vicious-extensions/libviciousui.a \ 
    547         $(X_LIBS)               \ 
    548         -lXau                   \ 
    549         -lX11 
     540        $(top_builddir)/vicious-extensions/libviciousui.a 
    550541 
    551542gdmphotosetup_LDADD = \ 
  • pkg/main/gdm/trunk/gui/faces/Makefile.in

    r135 r138  
    4040DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 
    4141ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 
    42 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ 
    43         $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac 
     42am__aclocal_m4_deps = $(top_srcdir)/configure.ac 
    4443am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    4544        $(ACLOCAL_M4) 
  • pkg/main/gdm/trunk/gui/gdmcommon.c

    r135 r138  
    265265        guint sid; 
    266266 
    267         if ( ! ve_string_empty (g_getenv ("GDM_IS_LOCAL")) && 
    268             strncmp (ve_sure_string (g_getenv ("DISPLAY")), ":0", 2) == 0) 
    269                 return; 
    270  
    271267        sid = g_signal_lookup ("activate", 
    272268                               GTK_TYPE_MENU_ITEM); 
     
    307303        EntryBlink *eb; 
    308304        GtkSettings *settings; 
    309  
    310         if ( ! ve_string_empty (g_getenv ("GDM_IS_LOCAL")) && 
    311             strncmp (ve_sure_string (g_getenv ("DISPLAY")), ":0", 2) == 0) 
    312                 return; 
    313305 
    314306        eb = g_new0 (EntryBlink, 1); 
  • pkg/main/gdm/trunk/gui/gdmlanguages.c

    r135 r138  
    243243{ 
    244244        int i; 
     245 
    245246        if (lang_names != NULL) 
    246247                return; 
     
    469470        GList *langs = NULL; 
    470471        GHashTable *dupcheck; 
    471         gboolean got_english = FALSE; 
    472472        Language *language; 
    473473        gboolean clean; 
     
    561561                                     GINT_TO_POINTER (1)); 
    562562 
    563                 /* if we have an english locale */ 
    564                 if (strncmp (lang, "en_", 3) == 0 || 
    565                     strcmp (lang, "C") == 0) 
    566                         got_english = TRUE; 
    567  
    568563                g_strfreev (lang_list); 
    569564        } 
     
    572567        g_hash_table_destroy (dupcheck); 
    573568 
    574         /* If we haven't found any english locale, add american 
    575          * english as that's as much of a fallback as we can get */ 
    576         if ( ! got_english) 
    577                 langs = g_list_prepend (langs, g_strdup ("en_US")); 
     569        /* Ensure there is at least one English locale -- the one available 
     570         * on all systems, "C" */ 
     571        langs = g_list_prepend (langs, g_strdup ("C")); 
    578572 
    579573        curlocale = setlocale (LC_MESSAGES, NULL); 
  • pkg/main/gdm/trunk/gui/gdmsetup.desktop

    r135 r138  
    144144¥ç®¡ç†å“¡ïŒ‰ 
    145145TryExec=/usr/local/sbin/gdmsetup 
    146 Exec=gdmsetup 
     146Exec=gksu "sudo /usr/sbin/gdmsetup" 
    147147Icon=gdm-setup 
    148148StartupNotify=true 
  • pkg/main/gdm/trunk/gui/gdmsetup.desktop.in.in

    r135 r138  
    55_Comment=Configure the login window (GNOME Display Manager) 
    66TryExec=@sbindir@/gdmsetup 
    7 Exec=gdmsetup 
     7Exec=gksu "sudo /usr/sbin/gdmsetup" 
    88Icon=gdm-setup 
    99StartupNotify=true 
  • pkg/main/gdm/trunk/gui/greeter/Makefile.am

    r135 r138  
    8686        $(GDKPIXBUF_LIBS)       \ 
    8787        $(GREETER_LIBS)         \ 
    88         $(X_EXTRA_LIBS)         \ 
    89         $(XINERAMA_LIBS)        \ 
    90         $(X_LIBS)               \ 
    91         -lX11 
     88        $(XINERAMA_LIBS) 
    9289 
    9390EXTRA_DIST = \ 
  • pkg/main/gdm/trunk/gui/greeter/Makefile.in

    r135 r138  
    4242DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 
    4343ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 
    44 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ 
    45         $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac 
     44am__aclocal_m4_deps = $(top_srcdir)/configure.ac 
    4645am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    4746        $(ACLOCAL_M4) 
     
    6564gdmgreeter_DEPENDENCIES =  \ 
    6665        $(top_builddir)/vicious-extensions/libviciousui-minimal.a \ 
    67         $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ 
    6866        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ 
    6967        $(am__DEPENDENCIES_1) $(am__DEPENDENCIES_1) \ 
     
    408406        $(GDKPIXBUF_LIBS)       \ 
    409407        $(GREETER_LIBS)         \ 
    410         $(X_EXTRA_LIBS)         \ 
    411         $(XINERAMA_LIBS)        \ 
    412         $(X_LIBS)               \ 
    413         -lX11 
     408        $(XINERAMA_LIBS) 
    414409 
    415410EXTRA_DIST = \ 
  • pkg/main/gdm/trunk/gui/greeter/greeter.c

    r135 r138  
    9393} 
    9494 
    95 /* If in random theme mode then grab a random theme from those selected */ 
     95static char *get_theme_file (const char *in, char **theme_dir); 
     96 
     97/* If in random theme mode then grab a random theme from those selected. 
     98 * If a theme doesn't exist, try  the rest of the list from the randomly chosen 
     99 * position for one that does. 
     100 */ 
    96101static char * 
    97102get_random_theme () 
    98103{ 
    99104    char **vec; 
    100         char *themes_list; 
    101         char *theme; 
     105    char *themes_list; 
     106    char *theme = NULL; 
     107    char *dir; 
    102108    int size; 
    103         int i; 
     109    int chosen; 
     110    int i; 
    104111 
    105112    themes_list = gdm_config_get_string (GDM_KEY_GRAPHICAL_THEMES); 
     
    116123 
    117124        /* Get Random Theme from list */ 
    118         srand (time (NULL)); 
    119         i = rand () % size; 
    120         theme = g_strdup (vec[i]); 
     125        srand ( time(NULL) ); 
     126        chosen = rand() % size; 
     127 
     128        /* Find a theme that exists */ 
     129        for (i = 0; i < size; i++) { 
     130                int j; 
     131                char *file; 
     132 
     133                j = (i + chosen >= size) ? i+chosen-size : i+chosen; 
     134                file = get_theme_file( vec[j], &dir ); 
     135 
     136                g_free(file); 
     137                if (g_file_test(dir, G_FILE_TEST_IS_DIR)) { 
     138                    g_free(dir); 
     139                        theme = g_strdup (vec[j]); 
     140                        break; 
     141                } 
     142            g_free(dir); 
     143        } 
     144 
    121145    g_strfreev (vec); 
    122146 
  • pkg/main/gdm/trunk/gui/greeter/themes/Makefile.in

    r135 r138  
    3939DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 
    4040ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 
    41 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ 
    42         $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac 
     41am__aclocal_m4_deps = $(top_srcdir)/configure.ac 
    4342am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    4443        $(ACLOCAL_M4) 
  • pkg/main/gdm/trunk/gui/greeter/themes/circles/Makefile.in

    r135 r138  
    4040DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 
    4141ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 
    42 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ 
    43         $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac 
     42am__aclocal_m4_deps = $(top_srcdir)/configure.ac 
    4443am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    4544        $(ACLOCAL_M4) 
  • pkg/main/gdm/trunk/gui/greeter/themes/circles/circles.xml

    r135 r138  
    8585        </fixed> 
    8686      </item> 
    87       <item type="button" id="ok_button"> 
    88         <pos anchor="n" x="50%" height="32" width="50%"/> 
    89         <stock type="ok"/> 
    90       </item> 
    91       <item type="button" id="cancel_button"> 
    92         <pos anchor="n" x="50%" height="32" width="50%"/> 
    93         <stock type="startagain"/> 
    94       </item> 
    9587      <item type="label" id="pam-message"> 
    9688        <pos anchor="n" x="50%"/> 
  • pkg/main/gdm/trunk/gui/greeter/themes/happygnome-list/Makefile.in

    r135 r138  
    4040DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 
    4141ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 
    42 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ 
    43         $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac 
     42am__aclocal_m4_deps = $(top_srcdir)/configure.ac 
    4443am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    4544        $(ACLOCAL_M4) 
  • pkg/main/gdm/trunk/gui/greeter/themes/happygnome-list/happygnome.xml

    r135 r138  
    9696        </fixed> 
    9797      </item> 
    98       <item type="button" id="ok_button"> 
    99         <pos anchor="n" x="50%" height="32" width="50%"/> 
    100         <stock type="ok"/> 
    101       </item> 
    102       <item type="button" id="cancel_button"> 
    103         <pos anchor="n" x="50%" height="32" width="50%"/> 
    104         <stock type="startagain"/> 
    105       </item> 
    10698      <item type="label" id="pam-message"> 
    10799        <pos anchor="n" x="50%"/> 
  • pkg/main/gdm/trunk/gui/greeter/themes/happygnome/Makefile.in

    r135 r138  
    4040DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 
    4141ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 
    42 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ 
    43         $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac 
     42am__aclocal_m4_deps = $(top_srcdir)/configure.ac 
    4443am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    4544        $(ACLOCAL_M4) 
  • pkg/main/gdm/trunk/gui/greeter/themes/happygnome/happygnome.xml

    r135 r138  
    8585        </fixed> 
    8686      </item> 
    87       <item type="button" id="ok_button"> 
    88         <pos anchor="n" x="50%" height="32" width="50%"/> 
    89         <stock type="ok"/> 
    90       </item> 
    91       <item type="button" id="cancel_button"> 
    92         <pos anchor="n" x="50%" height="32" width="50%"/> 
    93         <stock type="startagain"/> 
    94       </item> 
    9587      <item type="label" id="pam-message"> 
    9688        <pos anchor="n" x="50%"/> 
  • pkg/main/gdm/trunk/gui/modules/Makefile.in

    r135 r138  
    4141DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 
    4242ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 
    43 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ 
    44         $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac 
     43am__aclocal_m4_deps = $(top_srcdir)/configure.ac 
    4544am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    4645        $(ACLOCAL_M4) 
  • pkg/main/gdm/trunk/ltmain.sh

    r135 r138  
    4444PROGRAM=ltmain.sh 
    4545PACKAGE=libtool 
    46 VERSION=1.5.22 
     46VERSION="1.5.22 Debian 1.5.22-4" 
    4747TIMESTAMP=" (1.1220.2.365 2005/12/18 22:14:06)" 
    4848 
     
    20832083        dlopen) libs="$dlfiles" ;; 
    20842084        dlpreopen) libs="$dlprefiles" ;; 
    2085         link) libs="$deplibs %DEPLIBS% $dependency_libs" ;; 
     2085        link) 
     2086          libs="$deplibs %DEPLIBS%" 
     2087          test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs" 
     2088          ;; 
    20862089        esac 
    20872090      fi 
     
    32013204            age="$number_minor" 
    32023205            revision="$number_minor" 
     3206            ;; 
     3207          *) 
     3208            $echo "$modename: unknown library version type \`$version_type'" 1>&2 
     3209            $echo "Fatal configuration error.  See the $PACKAGE docs for more information." 1>&2 
     3210            exit $EXIT_FAILURE 
    32033211            ;; 
    32043212          esac 
  • pkg/main/gdm/trunk/pixmaps/16x16/Makefile.in

    r135 r138  
    4242DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 
    4343ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 
    44 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ 
    45         $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac 
     44am__aclocal_m4_deps = $(top_srcdir)/configure.ac 
    4645am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    4746        $(ACLOCAL_M4) 
  • pkg/main/gdm/trunk/pixmaps/32x32/Makefile.in

    r135 r138  
    4242DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 
    4343ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 
    44 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ 
    45         $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac 
     44am__aclocal_m4_deps = $(top_srcdir)/configure.ac 
    4645am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    4746        $(ACLOCAL_M4) 
  • pkg/main/gdm/trunk/pixmaps/48x48/Makefile.in

    r135 r138  
    4242DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 
    4343ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 
    44 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ 
    45         $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac 
     44am__aclocal_m4_deps = $(top_srcdir)/configure.ac 
    4645am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    4746        $(ACLOCAL_M4) 
  • pkg/main/gdm/trunk/pixmaps/Makefile.in

    r135 r138  
    4040DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 
    4141ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 
    42 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ 
    43         $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac 
     42am__aclocal_m4_deps = $(top_srcdir)/configure.ac 
    4443am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    4544        $(ACLOCAL_M4) 
  • pkg/main/gdm/trunk/po/fr.po

    r135 r138  
    401401#, c-format 
    402402msgid "System is shutting down, please wait ..." 
    403 msgstr "Le systÚme est en train de s'arrêter, veuillez patientez..." 
     403msgstr "Le systÚme est en train de s'arrêter, veuillez patienter..." 
    404404 
    405405#: ../daemon/gdm.c:672 
  • pkg/main/gdm/trunk/utils/Makefile.in

    r135 r138  
    4646DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in 
    4747ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 
    48 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ 
    49         $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac 
     48am__aclocal_m4_deps = $(top_srcdir)/configure.ac 
    5049am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    5150        $(ACLOCAL_M4) 
  • pkg/main/gdm/trunk/vicious-extensions/Makefile.in

    r135 r138  
    4343        COPYING.LIB ChangeLog 
    4444ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 
    45 am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \ 
    46         $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.ac 
     45am__aclocal_m4_deps = $(top_srcdir)/configure.ac 
    4746am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \ 
    4847        $(ACLOCAL_M4) 
Note: See TracChangeset for help on using the changeset viewer.