installation-guide

Merge lp:~mwhudson/installation-guide/no-i386 into lp:~ubuntu-core-dev/installation-guide/ubuntu

  1. no-i386
  2. Merge into ubuntu
Proposed by Michael Hudson-Doyle
Status: Merged
Merged at revision: 559
Proposed branch: lp:~mwhudson/installation-guide/no-i386
Merge into: lp:~ubuntu-core-dev/installation-guide/ubuntu
Diff against target: 55 lines (+16/-10)
3 files modified
debian/archlist (+1/-1)
debian/changelog (+6/-0)
debian/control (+9/-9)
To merge this branch: bzr merge lp:~mwhudson/installation-guide/no-i386
Reviewer Review Type Date Requested Status
Ubuntu Core Development Team Pending
Review via email: mp+385018@code.launchpad.net

Commit message

Do not build i386 installation guide as it cannot be installed at all as of 20.04.

To post a comment you must log in.
lp:~mwhudson/installation-guide/no-i386 updated
559. By Michael Hudson-Doyle

merge ubuntu

560. By Michael Hudson-Doyle

add changelog entry

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/archlist'
2--- debian/archlist 2020-06-16 01:19:10 +0000
3+++ debian/archlist 2020-06-16 01:29:18 +0000
4@@ -3,7 +3,7 @@
5 # Remember to also update the control file when arches are added/dropped!
6
7 #Code Name
8-i386 Intel x86
9+#i386 Intel x86
10 amd64 AMD64
11 arm64 ARM
12 armhf ARM
13
14=== modified file 'debian/changelog'
15--- debian/changelog 2020-06-16 01:19:10 +0000
16+++ debian/changelog 2020-06-16 01:29:18 +0000
17@@ -1,3 +1,9 @@
18+installation-guide (20160121ubuntu10) UNRELEASED; urgency=medium
19+
20+ * Stop building the i386 installation guide.
21+
22+ -- Michael Hudson-Doyle <michael.hudson@ubuntu.com> Tue, 16 Jun 2020 13:20:53 +1200
23+
24 installation-guide (20160121ubuntu9) eoan; urgency=medium
25
26 * Drop powerpc from the arch list.
27
28=== modified file 'debian/control'
29--- debian/control 2016-01-26 07:14:43 +0000
30+++ debian/control 2020-06-16 01:29:18 +0000
31@@ -74,15 +74,15 @@
32 # .
33 # A shorter reference, the installation HOWTO, is included in an appendix.
34
35-Package: installation-guide-i386
36-Architecture: all
37-Depends: ${misc:Depends}
38-Conflicts: installation-guide
39-Description: Ubuntu installation guide for i386
40- This package contains the Ubuntu installation guide for the Intel x86
41- architecture, in a variety of languages.
42- .
43- A shorter reference, the installation HOWTO, is included in an appendix.
44+#Package: installation-guide-i386
45+#Architecture: all
46+#Depends: ${misc:Depends}
47+#Conflicts: installation-guide
48+#Description: Ubuntu installation guide for i386
49+# This package contains the Ubuntu installation guide for the Intel x86
50+# architecture, in a variety of languages.
51+# .
52+# A shorter reference, the installation HOWTO, is included in an appendix.
53
54 Package: installation-guide-powerpc
55 Architecture: all

Subscribers

People subscribed via source and target branches