installation-guide

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

  1. bionic
  2. Merge into 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
1=== modified file 'build/arch-options/linux'
2--- build/arch-options/linux 2016-03-06 01:09:56 +0000
3+++ build/arch-options/linux 2018-04-25 00:12:57 +0000
4@@ -4,5 +4,5 @@
5 archspec="$archspec;linux-any"
6 arch_kernel="Linux"
7 arch_parttype="Linux"
8-kernelversion="4.4"
9+kernelversion="4.15"
10 kernelpackage="linux-image"
11
12=== modified file 'build/entities/common.ent'
13--- build/entities/common.ent 2016-06-07 15:32:21 +0000
14+++ build/entities/common.ent 2018-04-25 00:12:57 +0000
15@@ -4,7 +4,7 @@
16
17 <!-- current year (to be used for copyright declaration). -->
18 <!-- When changing this, also change in "debian/copyright" file)! -->
19-<!ENTITY current-year "2015">
20+<!ENTITY current-year "2018">
21
22 <!-- short name to use for Debian -->
23 <!-- we substitute Ubuntu's name here, so that we can reduce the number of
24@@ -19,11 +19,11 @@
25
26 <!ENTITY d-i "<classname>debian-installer</classname>">
27
28-<!ENTITY release "16.04">
29-<!ENTITY releasename "xenial">
30-<!ENTITY longreleasename "<quote>Xenial Xerus</quote>">
31-<!ENTITY releasename-cap "Xenial">
32-<!ENTITY releasename-uc "XENIAL">
33+<!ENTITY release "18.04">
34+<!ENTITY releasename "bionic">
35+<!ENTITY longreleasename "<quote>Bionic Beaver</quote>">
36+<!ENTITY releasename-cap "Bionic">
37+<!ENTITY releasename-uc "BIONIC">
38
39 <!ENTITY FIXME
40 "<emphasis>Documentation not complete, text missing.</emphasis>">
41@@ -168,7 +168,7 @@
42 <!ENTITY speakupver "3.1.6">
43
44 <!-- version of GNOME shipping with the current release -->
45-<!ENTITY gnomeversion "3.18">
46+<!ENTITY gnomeversion "3.28">
47
48 <!-- an example of adding another image to lilo.conf, cf
49 en/post-install.sgml etc. -->
50
51=== modified file 'build/preseed.pl'
52--- build/preseed.pl 2016-03-06 01:09:56 +0000
53+++ build/preseed.pl 2018-04-25 00:12:57 +0000
54@@ -72,7 +72,7 @@
55 $text =~ s/&archive-mirror;/archive.ubuntu.com/g;
56 $text =~ s/&releasename;/$release/g;
57 $text =~ s/&kernelpackage;/linux-image/g;
58- $text =~ s/&kernelversion;/4.4/g;
59+ $text =~ s/&kernelversion;/4.15/g;
60 $text =~ s/&gt;/>/g;
61 $text =~ s/&lt;/</g;
62

Subscribers

People subscribed via source and target branches

to all changes: