Branches for Intrepid

Author: Bryce Harrington
Revision Date: 2008-06-17 17:11:26 UTC

* Merge from debian unstable, remaining changes:
  - debian/control:
    + Change maintainer address.
    + Replace/Conflict bdftopcf to smooth upgrades from 6.06 LTS.
  - debian/xfonts-utils.postinst.in:
    + Remove /usr/share/X11/fonts and any empty sub-directories to clean up
      cruft left by fc-cache as well as update-fonts-{scale,dir,alias}.
    + Slightly improve error-handling in the above, and do the .postinst.in
      boilerplate stuff so that the XSF build system doesn't clean it up for
      us.