← Back to branch summary

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

« back to all changes in this revision

Viewing changes to debian/xdm.postinst.in

  • 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
https://launchpad.net/bugs/682196
http://bugs.debian.org/556694
* 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:
debian/xdm.postinst.in
5
5
# /usr/share/common-licenses/GPL or <http://www.gnu.org/copyleft/gpl.txt>.
6
6
# Acknowledgements to Stephen Early, Mark Eichin, and Manoj Srivastava.
7
7
 
8
 
# $Id: xdm.postinst.in 189 2005-06-11 00:04:27Z branden $
9
 
 
10
8
set -e
11
9
 
12
10
# source debconf library
17
15
 
18
16
#INCLUDE_SHELL_LIB#
19
17
 
20
 
OBSOLETE_CONFFILES="pixmaps/XFree86.xpm pixmaps/XFree86bw.xpm pixmaps/ubuntu.xpm pixmaps/ubuntubw.xdm pixmaps/debian.xpm pixmaps/debianbw.xpm pixmaps/xorg.xpm pixmaps/xorgbw.xpm"
21
18
DAEMON=/usr/bin/xdm
22
19
OLD_DAEMON=/usr/bin/X11/xdm
23
20
 
24
 
# now safe to remove old xserver dir
25
 
if [ -e /usr/X11R6/lib/X11/xdm.moved-by-preinst ]; then
26
 
  rm -r /usr/X11R6/lib/X11/xdm.moved-by-preinst
27
 
fi
28
 
 
29
 
# now safe to remove obsolete conffiles
30
 
for F in $OBSOLETE_CONFFILES; do
31
 
  remove_conffile_commit "/etc/X11/xdm/$F"
32
 
done
33
 
 
34
21
# debconf is not a registry, so we only fiddle with the default file if it
35
22
# does not exist
36
23
DEFAULT_DISPLAY_MANAGER_FILE=/etc/X11/default-display-manager