-
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}