Branches for Edgy

Author: Florent Rougon
Revision Date: 2006-06-26 10:37:04 UTC

* Translations:
  - Fix typos in french debconf translation, thanks to Florentin Duneau
    <f.baced@wanadoo.fr> (closes: #374632) [frank]
  - Update brazilian Portuguese debconf translation, thanks to Andre
    Luis Lopes <andrelop@debian.org> and Felipe Augusto van de Wiel
    <felipe@cathedrallabs.org> [frank]

* scripts/update-fontlang:
    - don't include ${conffile} in the generated file if
      ${conffile}.dpkg-new exists ($conffile may not be up-to-date in this
      case);
      see http://lists.debian.org/debian-tetex-maint/2006/06/msg00260.html
      for a discussion of this subject.
    - cosmetic fixes. [florent]

* Update scripts/update-updmap.1 and doc/Debian-TeX-Policy.sgml
  accordingly. [florent]