Merge lp:~gilir/ubiquity-slideshow-ubuntu/lubuntu-1204-update into lp:ubiquity-slideshow-ubuntu

Proposed by Julien Lavergne
Status: Merged
Merged at revision: 465
Proposed branch: lp:~gilir/ubiquity-slideshow-ubuntu/lubuntu-1204-update
Merge into: lp:ubiquity-slideshow-ubuntu
Diff against target: 51 lines (+10/-3)
3 files modified
debian/changelog (+7/-0)
slideshows/lubuntu/slides/help.html (+1/-1)
slideshows/lubuntu/slides/install.html (+2/-2)
To merge this branch: bzr merge lp:~gilir/ubiquity-slideshow-ubuntu/lubuntu-1204-update
Reviewer Review Type Date Requested Status
Ubiquity Slideshow Pending
Review via email: mp+104774@code.launchpad.net

This proposal supersedes a proposal from 2012-05-04.

To post a comment you must log in.

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 2012-04-17 15:12:12 +0000
3+++ debian/changelog 2012-05-04 16:45:25 +0000
4@@ -1,3 +1,10 @@
5+ubiquity-slideshow-ubuntu (59) UNRELEASED; urgency=low
6+
7+ * Lubuntu: Replacing Synaptic by Lubuntu-Software-Center (LP: #958880)
8+ * Lubuntu: Change the link to the mailing list
9+
10+ -- Julien Lavergne <gilir@ubuntu.com> Fri, 04 May 2012 18:41:41 +0200
11+
12 ubiquity-slideshow-ubuntu (58) precise; urgency=low
13
14 [ Dylan McCall ]
15
16=== modified file 'slideshows/lubuntu/slides/help.html'
17--- slideshows/lubuntu/slides/help.html 2011-09-28 13:35:02 +0000
18+++ slideshows/lubuntu/slides/help.html 2012-05-04 16:45:25 +0000
19@@ -13,7 +13,7 @@
20 </div>
21
22 <div>
23- <li>On the mailing list, subscribe on <a href="https://launchpad.net/~lubuntu-desktop">the page</a>.</li>
24+ <li>On the mailing list, subscribe on <a href="https://lists.ubuntu.com/mailman/listinfo/Lubuntu-users">the page</a>.</li>
25 </div>
26
27 <div>
28
29=== modified file 'slideshows/lubuntu/slides/install.html'
30--- slideshows/lubuntu/slides/install.html 2011-09-28 13:35:02 +0000
31+++ slideshows/lubuntu/slides/install.html 2012-05-04 16:45:25 +0000
32@@ -9,7 +9,7 @@
33 </div>
34
35 <div>
36- <p>Go to the menu, click on System Tools and <em>Synaptic Software Manager</em>.</p>
37+ <p>Go to the menu, click on System Tools and <em>Lubuntu Software Center</em>.</p>
38 </div>
39
40 <div>
41@@ -18,6 +18,6 @@
42
43 </div>
44
45-<img class="screenshot" src="screenshots/slide_synaptic.png"/>
46+<img class="screenshot" src="screenshots/slide_lsc.png"/>
47
48 </div>
49
50=== added file 'slideshows/lubuntu/slides/screenshots/slide_lsc.png'
51Binary files slideshows/lubuntu/slides/screenshots/slide_lsc.png 1970-01-01 00:00:00 +0000 and slideshows/lubuntu/slides/screenshots/slide_lsc.png 2012-05-04 16:45:25 +0000 differ

Subscribers

People subscribed via source and target branches