please merge choose-mirror from debian

[Gianfranco Costamagna]

debdiff following

[Gianfranco Costamagna (costamagnagianfranco)]

builds on ppa:costamagnagianfranco/locutusofborg-ppa

[Gianfranco Costamagna (costamagnagianfranco)]

updated debdiff

[Martin Pitt (pitti)]

This is a very complex debdiff which is hard to test. So I'd rather not have general sponsors upload this, at least not before Mathieu has a look at this. Unsubscribing sponsors for now.

[Launchpad Janitor (janitor)]

This bug was fixed in the package choose-mirror - 2.69ubuntu1

---------------
choose-mirror (2.69ubuntu1) yakkety; urgency=medium

  * Resynchronise with Debian. Remaining changes: (LP: #1582219)
    - Use Ubuntu mirrors.
    - Ubuntu branding.
    - Set default country to GB.
    - Never ask mirror/suite, mark it untranslatable, and give it
      appropriate choices for Ubuntu.
    - Pick CC.archive.ubuntu.com (for the country selected in the installer)
      as the default mirror. For ports architectures (armel, powerpc) use
      ports.ubuntu.com instead.
    * Add support for CC.ports.ubuntu.com; using the same logic as
      CC.archive.ubuntu.com for general country mirrors.
    - Drop the priorities of the country/mirror questions to medium if we're
      installing from a CD that includes the base system.
    - Support setting OVERRIDE_BASE_INSTALLABLE in the environment to force
      choose-mirror to assume that the base system is installable.
    - Skip mirror validation if the base system is installable and we're
      installing from a mirror in the masterlist.
    - Don't check if archive.ubuntu.com is reachable before asking for a
      proxy.
    - Allow preseeding the default CC.archive.ubuntu.com setup by preseeding
      mirror/http/mirror to CC.archive.ubuntu.com, and likewise for
      mirror/ftp/mirror.
    - Force xgettext to use UTF-8 encoding when generating templates files,
      to cope with Côte d'Ivoire.
    - Only default mirror/country to the value of debian-installer/country
      if the latter has any mirrors; otherwise, fall through to defaulting
      to GB.
    - Exclude all-countries mirrors such as ports.ubuntu.com when
      determining whether there is a mirror in the country specified in
      debian-installer/country.
    - If the selected country has no mirror (excluding all-countries
      mirrors), then fall back to the default.

 -- Gianfranco Costamagna <email address hidden> Wed, 03 Aug 2016 15:17:38 -0400

[Gianfranco Costamagna (costamagnagianfranco)]

Hi Mathieu, would you mind sponsoring this new debdiff? Debian did some translation updates, so I rebased the debdiff on top of them
thanks!

[Gianfranco Costamagna (costamagnagianfranco)]

since there are only translation updates I'm subscribing sponsors again, it shouldn't be a big issue

[Martin Pitt (pitti)]

2.70 had a grave bug which was fixed in 2.71 (https://tracker.debian.org/news/790923). Please re-do the merge against 2.72, and open a new sponsoring bug as the original merge here has already landed. Thanks!