Merge lp:~dsmythies/installation-guide/trusty12 into lp:~ubuntu-core-dev/installation-guide/ubuntu

[Doug Smythies]

The armhf did not build, and in this version of the code it never has.
On 2103.08.04 two branches of this code deviated.
This merge proposal adds a file from branches Rev 44 to core Rev 529 (or thereabouts).

I have made a ppa and it does seem to build properly.

References:
https://code.launchpad.net/~dsmythies/installation-guide/trusty/+merge/212095
https://code.launchpad.net/~qbalazs/installation-guide/trunk/+merge/190783
http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/trusty/installation-guide/trusty/revision/44
http://bazaar.launchpad.net/~ubuntu-core-dev/installation-guide/ubuntu/revision/515
https://launchpad.net/~dsmythies/+archive/installation-guide/+builds?build_state=built

[lp:~dsmythies/installation-guide/trusty12]

530. By Doug Smythies on 2014-04-11

attempt to fix bzr conflict complaints

531. By Doug Smythies on 2014-04-11

attempt to fix bzr conflict complaints, again

[Iain Lane (laney)]

Thank you, this has been merged into trunk and will be available in the next release.

review: Approve

=== added file 'build/arch-options/armhf'
--- build/arch-options/armhf	1970-01-01 00:00:00 +0000
+++ build/arch-options/armhf	2014-04-11 00:40:43 +0000
@@ -0,0 +1,25 @@
+# This file contains architecture specific variables for
+# the 'armel' architecture
+# It is sourced by the build scripts
+
+# Note that we keep "arm" as archspec (and thus also for conditions)
+# and also continue to use "arm" for arch-specific XML-files in order
+# to minimize impact on translations.
+
+archspec="arm;not-x86;not-s390;not-powerpc"
+arch_listname="arm"
+minimum_memory=32
+# These two options should be set if condition 'smp' is set below
+smp_config_section="N/A"
+smp_config_option="N/A"
+
+# Options below are assembled into one variable 'condition'
+# in the build scripts
+fdisk="fdisk.txt;cfdisk.txt"
+network="supports-tftp;supports-rarp;supports-bootp;supports-nfsroot"
+boot=""
+frontend="newt;not-gtk"
+other="supports-serial-console"
+smp=""
+goodies="supports-lang-chooser"
+status="not-checked"
 
=== modified file 'build/build.sh'
--- build/build.sh	2014-03-21 06:47:29 +0000
+++ build/build.sh	2014-04-11 00:40:43 +0000
@@ -15,8 +15,7 @@
 
 if [ -z "$architectures" ]; then
     # Note: this list is no longer being maintained; see debian/archlist instead
-    # armhf does not build
-    architectures="amd64 i386 powerpc"
+    architectures="amd64 armhf i386 powerpc"
 fi
 
 if [ -z "$destination" ]; then
 
=== modified file 'debian/changelog'
--- debian/changelog	2014-03-31 15:16:56 +0000
+++ debian/changelog	2014-04-11 00:40:43 +0000
@@ -1,4 +1,21 @@
-installation-guide (20100518ubuntu12) trusty; urgency=low
+<<<<<<< TREE
+installation-guide (20100518ubuntu12) trusty; urgency=low
+=======
+installation-guide (20100518ubuntu14) trusty; urgency=low
+
+  * Restore armhf build. Attempt 2.
+  * Try to resolve BZR conflicts.
+
+ -- Doug Smythies <[e-mail]>  Wed, 09 Apr 2014 12:18:12 -0700
+
+installation-guide (20100518ubuntu13) UNRELEASED; urgency=low
+
+  * Restore armhf build.
+
+ -- Doug Smythies <[e-mail]>  Mon, 1 Apr 2014 20:02:03 -0700
+
+installation-guide (20100518ubuntu12) trusty; urgency=low
+>>>>>>> MERGE-SOURCE
 
   * Bump versions and names for Trusty, including kernel and GNOME.
   * armhf does not build. Remove from build.sh