Branches for Intrepid

Author: Martin Pitt
Revision Date: 2008-06-26 13:34:13 UTC

* Merge to Debian unstable. Remaining Ubuntu changes:
  - sbin/locale-gen:
    + /etc/locale.gen -> /var/lib/locales/supported.d/
    + Support creation of all locales of a given language.
    + Some small bug fixes.
  - manpages/en/locale-gen.8: Describe additional Ubuntuish ways of calling
    locale-gen.
  - debian/control:
    + Do not depend on belocs-locales-data, we use 'locales'.
    + Recommend 'locales' (a dependency leads to circles and breaks
      upgrades).
  - debian/manpages: Do not install locale.gen manpages, we do not use this
    conffile.
  - Remove debian/{pre,post}{inst,rm}: We do not set up locales here, only
    in the 'locales' package.
  - debian/rules:
    + Don't setup debconf stuff.
  - Add debian/{install,remove}-language-pack: Hook scripts for language
    pack installation/removal. Install them in debian/rules.
  - locale/iso-4217.def: Fix codes for Mexican Peso (LP#63520), Russian
    Ruble, Bulgarian Lev, Romanian Leu, Bosnian and Herzegovina Convertible
    Mark, and Serbian Dinar. Add Tajik Somoni.
  - locale/iso-3166.def: Fix codes for the Serbia/Montenegro split.