Merge lp:~nobuto/ubuntu/raring/ubuntu-defaults-builder/unify-apt-line into lp:ubuntu/raring/ubuntu-defaults-builder

[Nobuto Murata]

config/archives/*.{chroot,binary}.list were deprecated in current live-build, we should use *.list.{chroot,binary} syntax[1] instead as well as the change[2] of Rev.142.

[1] http://live.debian.net/manual/html/live-manual.en.html#371
[2] http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/raring/ubuntu-defaults-builder/raring/revision/142

But in cases of adding PPA, we don't have to separate the content into {chroot,binary}. This branch just unifies the content to fix duplicated apt-lines in generated ISO.

[Barry Warsaw (barry)]

Seems reasonable to me. Thanks for the contribution to Ubuntu! I'll sponsor this change.

review: Approve

=== modified file 'bin/ubuntu-defaults-image'
--- bin/ubuntu-defaults-image	2012-10-17 10:50:21 +0000
+++ bin/ubuntu-defaults-image	2012-10-28 17:39:20 +0000
@@ -72,12 +72,11 @@
     FINGERPRINT=${FINGERPRINT#'"'}
 
     # fetch GPG key
-    gpg --no-default-keyring --primary-keyring config/archives/ubuntu-defaults.chroot.key  --keyserver keyserver.ubuntu.com --recv-key "$FINGERPRINT"
+    gpg --no-default-keyring --primary-keyring config/archives/ubuntu-defaults.key  --keyserver keyserver.ubuntu.com --recv-key "$FINGERPRINT"
 
     # add PPA apt source
     local DEB_PPA="deb http://ppa.launchpad.net/$PPA/ubuntu $SUITE main"
-    echo "$DEB_PPA" > config/archives/ubuntu-defaults.chroot.list
-    echo "$DEB_PPA" > config/archives/ubuntu-defaults.binary.list
+    echo "$DEB_PPA" > config/archives/ubuntu-defaults.list
 }
 
 eval set -- "$(getopt -o '' -l help,locale:,keep-apt,keep-apt-components:,package:,arch:,release:,components:,mirror:,security-mirror:,ppa: -- "$@")" || { help; exit 1; }