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

Proposed by Martin Wimpress 
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 Approve
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.
Revision history for this message
Brian Murray (brian-murray) wrote :

If I would have known it was that easy.

review: Approve
Revision history for this message
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
=== modified file 'debian/changelog'
--- debian/changelog 2020-04-01 21:31:28 +0000
+++ debian/changelog 2020-04-02 21:11:02 +0000
@@ -1,7 +1,11 @@
1ubiquity-slideshow-ubuntu (158) UNRELEASED; urgency=medium1ubiquity-slideshow-ubuntu (158) UNRELEASED; urgency=medium
22
3 [ Dimitri John Ledkov ]
3 * Update Software Center name, patch from mpt.4 * Update Software Center name, patch from mpt.
45
6 [ Martin Wimpress]
7 * Update to list Thunderbird as "Included software". (LP: #1869008)
8
5 -- Dimitri John Ledkov <xnox@ubuntu.com> Wed, 01 Apr 2020 21:41:13 +02009 -- Dimitri John Ledkov <xnox@ubuntu.com> Wed, 01 Apr 2020 21:41:13 +0200
610
7ubiquity-slideshow-ubuntu (157) focal; urgency=medium11ubiquity-slideshow-ubuntu (157) focal; urgency=medium
812
=== modified file 'slideshows/ubuntu/slides/browse.html'
--- slideshows/ubuntu/slides/browse.html 2020-01-17 01:33:00 +0000
+++ slideshows/ubuntu/slides/browse.html 2020-04-02 21:11:02 +0000
@@ -15,13 +15,13 @@
15 <img class="icon" src="icons/firefox.png" />15 <img class="icon" src="icons/firefox.png" />
16 <p class="caption">Firefox web browser</p>16 <p class="caption">Firefox web browser</p>
17 </li>17 </li>
18</ul>
19<h2 class="subtitle">Supported software</h2>
20<ul>
21 <li>18 <li>
22 <img class="icon" src="icons/thunderbird.png" />19 <img class="icon" src="icons/thunderbird.png" />
23 <p class="caption">Thunderbird</p>20 <p class="caption">Thunderbird</p>
24 </li>21 </li>
22</ul>
23<h2 class="subtitle">Supported software</h2>
24<ul>
25 <li>25 <li>
26 <img class="icon" src="icons/chromium.png" />26 <img class="icon" src="icons/chromium.png" />
27 <p class="caption">Chromium</p>27 <p class="caption">Chromium</p>

Subscribers

People subscribed via source and target branches