Julien Lavergne has proposed merging lp:~gilir/ubiquity-slideshow-ubuntu/lubuntu-1204-update into lp:ubiquity-slideshow-ubuntu.
Requested reviews: Ubiquity Slideshow (ubiquity-slideshow) Related bugs: Bug #958880 in ubiquity-slideshow-ubuntu (Ubuntu): "[UIFe] Update of Lubuntu Slideshow for 12.04" https://bugs.launchpad.net/ubuntu/+source/ubiquity-slideshow-ubuntu/+bug/958880 For more details, see: https://code.launchpad.net/~gilir/ubiquity-slideshow-ubuntu/lubuntu-1204-update/+merge/104773 -- https://code.launchpad.net/~gilir/ubiquity-slideshow-ubuntu/lubuntu-1204-update/+merge/104773 Your team Ubiquity Slideshow is requested to review the proposed merge of lp:~gilir/ubiquity-slideshow-ubuntu/lubuntu-1204-update into lp:ubiquity-slideshow-ubuntu.
=== modified file 'debian/changelog' --- debian/changelog 2012-04-17 15:12:12 +0000 +++ debian/changelog 2012-05-04 16:38:19 +0000 @@ -1,3 +1,4 @@ +<<<<<<< TREE ubiquity-slideshow-ubuntu (58) precise; urgency=low [ Dylan McCall ] @@ -47,6 +48,15 @@ -- Stéphane Graber <[email protected]> Wed, 21 Mar 2012 12:26:41 -0400 +======= +ubiquity-slideshow-ubuntu (55) UNRELEASED; urgency=low + + * Lubuntu: Replacing Synaptic by Lubuntu-Software-Center (LP: #958880) + * Lubuntu: Change the link to the mailing list + + -- Julien Lavergne <[email protected]> Mon, 19 Mar 2012 00:06:07 +0100 + +>>>>>>> MERGE-SOURCE ubiquity-slideshow-ubuntu (54) precise; urgency=low [ Stéphane Graber ] === modified file 'slideshows/lubuntu/slides/help.html' --- slideshows/lubuntu/slides/help.html 2011-09-28 13:35:02 +0000 +++ slideshows/lubuntu/slides/help.html 2012-05-04 16:38:19 +0000 @@ -13,7 +13,7 @@ </div> <div> - <li>On the mailing list, subscribe on <a href="https://launchpad.net/~lubuntu-desktop";>the page</a>.</li> + <li>On the mailing list, subscribe on <a href="https://lists.ubuntu.com/mailman/listinfo/Lubuntu-users";>the page</a>.</li> </div> <div> === modified file 'slideshows/lubuntu/slides/install.html' --- slideshows/lubuntu/slides/install.html 2011-09-28 13:35:02 +0000 +++ slideshows/lubuntu/slides/install.html 2012-05-04 16:38:19 +0000 @@ -9,7 +9,7 @@ </div> <div> - <p>Go to the menu, click on System Tools and <em>Synaptic Software Manager</em>.</p> + <p>Go to the menu, click on System Tools and <em>Lubuntu Software Center</em>.</p> </div> <div> @@ -18,6 +18,6 @@ </div> -<img class="screenshot" src="screenshots/slide_synaptic.png"/> +<img class="screenshot" src="screenshots/slide_lsc.png"/> </div> === added file 'slideshows/lubuntu/slides/screenshots/slide_lsc.png' Binary 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:38:19 +0000 differ
_______________________________________________ Mailing list: https://launchpad.net/~ubiquity-slideshow Post to : [email protected] Unsubscribe : https://launchpad.net/~ubiquity-slideshow More help : https://help.launchpad.net/ListHelp
