Branches for Intrepid

Author: Rob Browning
Revision Date: 2006-01-05 18:10:56 UTC

* Remove "Conflicts: emacs". If I recall correctly, this dates back to
  a time when the Emacs binary package was just named "emacs"
  (i.e. unversioned), and before the creation of emacsen-common and the
  Debian Emacs Policy. The Conflicts should be safe to remove now, and
  the removal will allow us to create a new emacs-defaults source
  package (a la gcc-defaults) that will produce an emacs package that
  always depends on the current "standard" version of Emacs
  (i.e. emacs21, emacs22, etc.).
* Update to Standards-Version to 3.6.2.