Merge lp:~persia/choose-mirror/armel+lpia into lp:~ubuntu-core-dev/choose-mirror/ubuntu

[Emmet Hikory]

[Emmet Hikory (persia)]

As an alternative, it might be nice to set the Defaults to ports.ubuntu.com and /ubuntu-ports/ and only special-case the "primary" architectures. This would reduce overhead in adding new architectures.

Unmerged revisions

602. By Emmet Hikory on 2009-03-23

Add the bug number to the changelog

601. By Emmet Hikory on 2009-03-23

Add appropriate defaults and mirrors for armel and lpia

600. By Steve Langasek on 2008-06-20

revert, per Ante :)

599. By Steve Langasek on 2008-06-20

* Update Croatian branding changes to be closer to the Debian original
  translations, which should give less ambiguous translations in light of
  the grammatical ambiguity of "Ubuntu" in this language. Thanks to Ante
  Karamatic for the native-speaker help.

598. By Steve Langasek on 2008-06-12

mark for upload

597. By Steve Langasek on 2008-06-12

* Fix extraneous Ubuntu-specific reference to PREFERRED_DISTRIBUTION; in
  practice this should never be needed anymore, but in any case it's
  currently not defined.

596. By Steve Langasek on 2008-06-12

mark for release

595. By Steve Langasek on 2008-06-12

merge in the change to drop PREFERRED_DISTRIBUTION, after discussing with Colin

594. By Steve Langasek on 2008-06-12

* Change the default target from hardy to intrepid; drop edgy from the list
  of suite choices since it's no longer supported

593. By Steve Langasek on 2008-06-12

merge from Debian 2.24

=== modified file 'Mirrors.masterlist.ubuntu'
--- Mirrors.masterlist.ubuntu	2008-04-18 09:17:03 +0000
+++ Mirrors.masterlist.ubuntu	2009-03-23 08:30:38 +0000
@@ -14,7 +14,7 @@
 Archive-http: /ubuntu-ports/
 Archive-ftp: /ubuntu-ports/
 Archive-rsync: ubuntu-ports/
-Archive-architecture: hppa ia64 powerpc sparc
+Archive-architecture: armel hppa ia64 lpia powerpc sparc
 Country: GB Great Britain
 Wildcard: yes
 Location: London

=== modified file 'debian/changelog'
--- debian/changelog	2008-06-20 07:50:31 +0000
+++ debian/changelog	2009-03-23 11:10:49 +0000
@@ -1,3 +1,9 @@
+choose-mirror (2.24ubuntu3) UNRELEASED; urgency=low
+
+  * Add appropriate defaults and mirrors for armel and lpia (LP: #347161)
+
+ -- Emmet Hikory <[e-mail]>  Mon, 23 Mar 2009 17:29:47 +0900
+
 choose-mirror (2.24ubuntu2) intrepid; urgency=low
 
   * Fix extraneous Ubuntu-specific reference to PREFERRED_DISTRIBUTION; in

=== modified file 'debian/choose-mirror-bin.templates.ftp.base-in'
--- debian/choose-mirror-bin.templates.ftp.base-in	2008-06-12 01:53:22 +0000
+++ debian/choose-mirror-bin.templates.ftp.base-in	2009-03-23 08:30:38 +0000
@@ -12,8 +12,10 @@
 Template: mirror/ftp/directory
 Type: string
 Default: /ubuntu/
+Default[armel]: /ubuntu-ports/
 Default[hppa]: /ubuntu-ports/
 Default[ia64]: /ubuntu-ports/
+Default[lpia]: /ubuntu-ports/
 Default[powerpc]: /ubuntu-ports/
 Default[sparc]: /ubuntu-ports/
 # :sl2:

=== modified file 'debian/choose-mirror-bin.templates.ftp.sel-in'
--- debian/choose-mirror-bin.templates.ftp.sel-in	2008-06-12 01:53:22 +0000
+++ debian/choose-mirror-bin.templates.ftp.sel-in	2009-03-23 08:30:38 +0000
@@ -31,8 +31,10 @@
 Type: select
 Choices: ${mirrors}
 Default: archive.ubuntu.com
+Default[armel]: ports.ubuntu.com
 Default[hppa]: ports.ubuntu.com
 Default[ia64]: ports.ubuntu.com
+Default[lpia]: ports.ubuntu.com
 Default[powerpc]: ports.ubuntu.com
 Default[sparc]: ports.ubuntu.com
 # :sl2:

=== modified file 'debian/choose-mirror-bin.templates.http-in'
--- debian/choose-mirror-bin.templates.http-in	2008-06-12 01:53:22 +0000
+++ debian/choose-mirror-bin.templates.http-in	2009-03-23 08:30:38 +0000
@@ -30,8 +30,10 @@
 Type: select
 Choices: ${mirrors}
 Default: archive.ubuntu.com
+Default[armel]: ports.ubuntu.com
 Default[hppa]: ports.ubuntu.com
 Default[ia64]: ports.ubuntu.com
+Default[lpia]: ports.ubuntu.com
 Default[powerpc]: ports.ubuntu.com
 Default[sparc]: ports.ubuntu.com
 # :sl1:
@@ -54,8 +56,10 @@
 Template: mirror/http/directory
 Type: string
 Default: /ubuntu/
+Default[armel]: /ubuntu-ports/
 Default[hppa]: /ubuntu-ports/
 Default[ia64]: /ubuntu-ports/
+Default[lpia]: /ubuntu-ports/
 Default[powerpc]: /ubuntu-ports/
 Default[sparc]: /ubuntu-ports/
 # :sl2: