Merge lp:~flexiondotorg/ubiquity-slideshow-ubuntu/lp1869008 into lp:ubiquity-slideshow-ubuntu

Proposed by Martin Wimpress on 2020-04-02
Status: Merged
Merged at revision: 874
Proposed branch: lp:~flexiondotorg/ubiquity-slideshow-ubuntu/lp1869008
Merge into: lp:ubiquity-slideshow-ubuntu
Diff against target: 36 lines (+7/-3)
2 files modified
debian/changelog (+4/-0)
slideshows/ubuntu/slides/browse.html (+3/-3)
To merge this branch: bzr merge lp:~flexiondotorg/ubiquity-slideshow-ubuntu/lp1869008
Reviewer Review Type Date Requested Status
Brian Murray 2020-04-02 Approve on 2020-04-02
Review via email: mp+381605@code.launchpad.net

Description of the change

This merge proposals lists Thunderbird as "Included software" (LP: #1869008) and update Software Center name.

To post a comment you must log in.
Brian Murray (brian-murray) wrote :

If I would have known it was that easy.

review: Approve
Sebastien Bacher (seb128) wrote :

One note, the change from Dimitri stacked in the Vcs is a string change that would undo translations so that probably needs to be left out of an upload to focal

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2020-04-01 21:31:28 +0000
3+++ debian/changelog 2020-04-02 21:11:02 +0000
4@@ -1,7 +1,11 @@
5 ubiquity-slideshow-ubuntu (158) UNRELEASED; urgency=medium
6
7+ [ Dimitri John Ledkov ]
8 * Update Software Center name, patch from mpt.
9
10+ [ Martin Wimpress]
11+ * Update to list Thunderbird as "Included software". (LP: #1869008)
12+
13 -- Dimitri John Ledkov <xnox@ubuntu.com> Wed, 01 Apr 2020 21:41:13 +0200
14
15 ubiquity-slideshow-ubuntu (157) focal; urgency=medium
16
17=== modified file 'slideshows/ubuntu/slides/browse.html'
18--- slideshows/ubuntu/slides/browse.html 2020-01-17 01:33:00 +0000
19+++ slideshows/ubuntu/slides/browse.html 2020-04-02 21:11:02 +0000
20@@ -15,13 +15,13 @@
21 <img class="icon" src="icons/firefox.png" />
22 <p class="caption">Firefox web browser</p>
23 </li>
24-</ul>
25-<h2 class="subtitle">Supported software</h2>
26-<ul>
27 <li>
28 <img class="icon" src="icons/thunderbird.png" />
29 <p class="caption">Thunderbird</p>
30 </li>
31+</ul>
32+<h2 class="subtitle">Supported software</h2>
33+<ul>
34 <li>
35 <img class="icon" src="icons/chromium.png" />
36 <p class="caption">Chromium</p>

Subscribers

People subscribed via source and target branches