Ubiquity Slideshow

Merge lp:~len-ovenwerks/ubiquity-slideshow-ubuntu/ubiquity-slideshow-ubuntu into lp:ubiquity-slideshow-ubuntu

  1. ubiquity-slideshow-ubuntu
  2. Merge into html
Proposed by Len Ovens
Status: Merged
Merged at revision: 519
Proposed branch: lp:~len-ovenwerks/ubiquity-slideshow-ubuntu/ubiquity-slideshow-ubuntu
Merge into: lp:ubiquity-slideshow-ubuntu
Diff against target: 64 lines (+14/-1)
4 files modified
debian/changelog (+11/-0)
slideshows/ubuntustudio/slides/02_video.html (+1/-0)
slideshows/ubuntustudio/slides/03_graphics.html (+1/-0)
slideshows/ubuntustudio/slides/04_photography.html (+1/-1)
To merge this branch: bzr merge lp:~len-ovenwerks/ubiquity-slideshow-ubuntu/ubiquity-slideshow-ubuntu
Reviewer Review Type Date Requested Status
Pasi Lallinaho Approve
Kaj Ailomaa (community) Approve
Review via email: mp+152600@code.launchpad.net

Description of the change

Updated UbuntuStudio slideshoe for 13.04

To post a comment you must log in.
Revision history for this message
Kaj Ailomaa (zequence) wrote :

Looks good to me.

review: Approve
Revision history for this message
Pasi Lallinaho (knome) :
review: Approve

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 2013-03-04 16:18:05 +0000
3+++ debian/changelog 2013-03-10 23:03:22 +0000
4@@ -1,3 +1,14 @@
5+ubiquity-slideshow-ubuntu (68) UNRELEASED; urgency=low
6+
7+ [ Len Ovens ]
8+ * UbuntuStudio Slideshow
9+ - Fixed text on Video, Graphics and Photogrphy slides
10+ - Used new desk background on first and last slide
11+ (LP: #1153032)
12+ * UbuuntuStudio Slideshow changed slide 1 png
13+
14+ -- Len Ovens <len@ovenwerks.net> Sat, 09 Mar 2013 23:45:05 -0800
15+
16 ubiquity-slideshow-ubuntu (67) raring; urgency=low
17
18 [ Julien Lavergne ]
19
20=== modified file 'slideshows/ubuntustudio/slides/02_video.html'
21--- slideshows/ubuntustudio/slides/02_video.html 2012-03-19 22:01:22 +0000
22+++ slideshows/ubuntustudio/slides/02_video.html 2013-03-10 23:03:22 +0000
23@@ -9,6 +9,7 @@
24 <h2 class="subtitle">Included software</h2>
25 <ul>
26 <li><img class="icon" src="icons/blender.png" />Blender Sequence Editor and Compositing</li>
27+ <li><img class="icon" src="icons/kdenlive.png" />Kdenlive Video Editor</li>
28 <li><img class="icon" src="icons/openshot.png" />Open Shot Video Editor</li>
29 </ul>
30 </div>
31
32=== modified file 'slideshows/ubuntustudio/slides/03_graphics.html'
33--- slideshows/ubuntustudio/slides/03_graphics.html 2012-03-19 22:01:22 +0000
34+++ slideshows/ubuntustudio/slides/03_graphics.html 2013-03-10 23:03:22 +0000
35@@ -10,6 +10,7 @@
36 <ul>
37 <li><img class="icon" src="icons/blender.png" />Blender 3D Content Creation Suite</li>
38 <li><img class="icon" src="icons/inkscape.png" />Inkscape Scalable Vector Graphics Editor</li>
39+ <li><img class="icon" src="icons/calligrakrita.png" />Krita Paint Studio</li>
40 <li><img class="icon" src="icons/gimp.png" />GIMP Image Editor</li>
41 </ul>
42 </div>
43
44=== modified file 'slideshows/ubuntustudio/slides/04_photography.html'
45--- slideshows/ubuntustudio/slides/04_photography.html 2012-03-19 22:01:22 +0000
46+++ slideshows/ubuntustudio/slides/04_photography.html 2013-03-10 23:03:22 +0000
47@@ -8,7 +8,7 @@
48 <div class="featured">
49 <h2 class="subtitle">Included software</h2>
50 <ul>
51- <li><img class="icon" src="icons/darkroom.png" />Darkroom Photo Editor</li>
52+ <li><img class="icon" src="icons/darktable.png" />Darktable Photo Editor</li>
53 <li><img class="icon" src="icons/rawtherapee.png" />RawTherapee Raw Image Processor</li>
54 <li><img class="icon" src="icons/shotwell.png" />Shotwell Photo Manager</li>
55 <li><img class="icon" src="icons/gimp.png" />GIMP Image Editor</li>
56
57=== added file 'slideshows/ubuntustudio/slides/icons/calligrakrita.png'
58Binary files slideshows/ubuntustudio/slides/icons/calligrakrita.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntustudio/slides/icons/calligrakrita.png 2013-03-10 23:03:22 +0000 differ
59=== added file 'slideshows/ubuntustudio/slides/icons/darktable.png'
60Binary files slideshows/ubuntustudio/slides/icons/darktable.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntustudio/slides/icons/darktable.png 2013-03-10 23:03:22 +0000 differ
61=== added file 'slideshows/ubuntustudio/slides/icons/kdenlive.png'
62Binary files slideshows/ubuntustudio/slides/icons/kdenlive.png 1970-01-01 00:00:00 +0000 and slideshows/ubuntustudio/slides/icons/kdenlive.png 2013-03-10 23:03:22 +0000 differ
63=== modified file 'slideshows/ubuntustudio/slides/shots/00_ubuntustudio.png'
64Binary files slideshows/ubuntustudio/slides/shots/00_ubuntustudio.png 2012-03-19 22:01:22 +0000 and slideshows/ubuntustudio/slides/shots/00_ubuntustudio.png 2013-03-10 23:03:22 +0000 differ

Subscribers

People subscribed via source and target branches