~ubuntu-branches/ubuntu/precise/xdm/precise

« back to all changes in this revision

Viewing changes to config/xdm-config.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Artur Rona
  • Date: 2011-01-30 00:53:09 UTC
  • mfrom: (9.1.4 sid)
  • Revision ID: james.westby@ubuntu.com-20110130005309-30mjjyk7div7d494
Tags: 1:1.1.10-3ubuntu1
* Merge from debian unstable.  Remaining changes: (LP: #682196)
  - debian/{rules, xdm.install, local/ubuntu*}:
    + Add Ubuntu graphics and configure xdm to use them by default.
  - debian/patches/ubuntu_no_whiteglass.diff: Don't hardcode
    the default Xcursor theme to whiteglass. Use the Ubuntu
    default x-cursor-theme instead.
* debian/patches/ftbfs_binutils-gold.diff: Fix FTBFS with binutils-gold
  and ld --as-needed. (Closes: #556694)
* Dropped changes, no longer applicable:
  - debian/{xdm.postinst.in, xdm.postrm.in, xdm.preinst.in}

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
 
! $Xorg: xdm-conf.cpp,v 1.3 2000/08/17 19:54:17 cpqbld Exp $
2
 
! $XdotOrg: $    
3
 
!
4
 
!
5
 
!
6
 
!
7
 
! $XFree86: xc/programs/xdm/config/xdm-conf.cpp,v 1.10 2002/11/30 19:11:32 herrb Exp $
 
1
!
 
2
!
 
3
!
 
4
!
8
5
!
9
6
#ifndef XDMCONFIGDIR
10
7
#define XDMCONFIGDIR XDMDIR
12
9
#ifndef XDMSCRIPTDIR
13
10
#define XDMSCRIPTDIR XDMDIR
14
11
#endif
 
12
DisplayManager.authDir: XDMXAUTHDIR
15
13
DisplayManager.errorLogFile:    XDMLOGDIR/xdm.log
16
14
DisplayManager.pidFile:         XDMPIDDIR/xdm.pid
17
15
DisplayManager.keyFile:         XDMCONFIGDIR/xdm-keys