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

Proposed by Doug Smythies
Status: Merged
Merged at revision: 544
Proposed branch: lp:~dsmythies/installation-guide/bionic
Merge into: lp:~ubuntu-core-dev/installation-guide/ubuntu
Diff against target: 61 lines (+9/-9)
3 files modified
build/arch-options/linux (+1/-1)
build/entities/common.ent (+7/-7)
build/preseed.pl (+1/-1)
To merge this branch: bzr merge lp:~dsmythies/installation-guide/bionic
Reviewer Review Type Date Requested Status
Mathieu Trudel-Lapierre Approve
Review via email: mp+344199@code.launchpad.net

Commit message

Bump versions for bionic so that the HTML can be built for the pending 18.04 LTS publication on help.ubuntu.com

To post a comment you must log in.
Revision history for this message
Mathieu Trudel-Lapierre (cyphermox) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'build/arch-options/linux'
--- build/arch-options/linux 2016-03-06 01:09:56 +0000
+++ build/arch-options/linux 2018-04-25 00:12:57 +0000
@@ -4,5 +4,5 @@
4archspec="$archspec;linux-any"4archspec="$archspec;linux-any"
5arch_kernel="Linux"5arch_kernel="Linux"
6arch_parttype="Linux"6arch_parttype="Linux"
7kernelversion="4.4"7kernelversion="4.15"
8kernelpackage="linux-image"8kernelpackage="linux-image"
99
=== modified file 'build/entities/common.ent'
--- build/entities/common.ent 2016-06-07 15:32:21 +0000
+++ build/entities/common.ent 2018-04-25 00:12:57 +0000
@@ -4,7 +4,7 @@
44
5<!-- current year (to be used for copyright declaration). -->5<!-- current year (to be used for copyright declaration). -->
6<!-- When changing this, also change in "debian/copyright" file)! -->6<!-- When changing this, also change in "debian/copyright" file)! -->
7<!ENTITY current-year "2015">7<!ENTITY current-year "2018">
88
9<!-- short name to use for Debian -->9<!-- short name to use for Debian -->
10<!-- we substitute Ubuntu's name here, so that we can reduce the number of10<!-- we substitute Ubuntu's name here, so that we can reduce the number of
@@ -19,11 +19,11 @@
1919
20<!ENTITY d-i "<classname>debian-installer</classname>">20<!ENTITY d-i "<classname>debian-installer</classname>">
2121
22<!ENTITY release "16.04">22<!ENTITY release "18.04">
23<!ENTITY releasename "xenial">23<!ENTITY releasename "bionic">
24<!ENTITY longreleasename "<quote>Xenial Xerus</quote>">24<!ENTITY longreleasename "<quote>Bionic Beaver</quote>">
25<!ENTITY releasename-cap "Xenial">25<!ENTITY releasename-cap "Bionic">
26<!ENTITY releasename-uc "XENIAL">26<!ENTITY releasename-uc "BIONIC">
2727
28<!ENTITY FIXME28<!ENTITY FIXME
29 "<emphasis>Documentation not complete, text missing.</emphasis>">29 "<emphasis>Documentation not complete, text missing.</emphasis>">
@@ -168,7 +168,7 @@
168<!ENTITY speakupver "3.1.6">168<!ENTITY speakupver "3.1.6">
169169
170<!-- version of GNOME shipping with the current release -->170<!-- version of GNOME shipping with the current release -->
171<!ENTITY gnomeversion "3.18">171<!ENTITY gnomeversion "3.28">
172172
173<!-- an example of adding another image to lilo.conf, cf173<!-- an example of adding another image to lilo.conf, cf
174 en/post-install.sgml etc. -->174 en/post-install.sgml etc. -->
175175
=== modified file 'build/preseed.pl'
--- build/preseed.pl 2016-03-06 01:09:56 +0000
+++ build/preseed.pl 2018-04-25 00:12:57 +0000
@@ -72,7 +72,7 @@
72 $text =~ s/&archive-mirror;/archive.ubuntu.com/g;72 $text =~ s/&archive-mirror;/archive.ubuntu.com/g;
73 $text =~ s/&releasename;/$release/g;73 $text =~ s/&releasename;/$release/g;
74 $text =~ s/&kernelpackage;/linux-image/g;74 $text =~ s/&kernelpackage;/linux-image/g;
75 $text =~ s/&kernelversion;/4.4/g;75 $text =~ s/&kernelversion;/4.15/g;
76 $text =~ s/&gt;/>/g;76 $text =~ s/&gt;/>/g;
77 $text =~ s/&lt;/</g;77 $text =~ s/&lt;/</g;
7878

Subscribers

People subscribed via source and target branches

to all changes: