← Back to team overview

ubiquity-slideshow team mailing list archive

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

 

Len Ovens has proposed merging lp:~len-ovenwerks/ubiquity-slideshow-ubuntu/ubiquity-slideshow-ubuntu into lp:ubiquity-slideshow-ubuntu.

Requested reviews:
  Ubiquity Slideshow (ubiquity-slideshow)
Related bugs:
  Bug #1153032 in ubiquity-slideshow-ubuntu (Ubuntu): "ubiquity slideshow for ubuntustudio is out of date and incorrect"
  https://bugs.launchpad.net/ubuntu/+source/ubiquity-slideshow-ubuntu/+bug/1153032

For more details, see:
https://code.launchpad.net/~len-ovenwerks/ubiquity-slideshow-ubuntu/ubiquity-slideshow-ubuntu/+merge/152600

Updated UbuntuStudio slideshoe for 13.04
-- 
https://code.launchpad.net/~len-ovenwerks/ubiquity-slideshow-ubuntu/ubiquity-slideshow-ubuntu/+merge/152600
Your team Ubiquity Slideshow is requested to review the proposed merge of lp:~len-ovenwerks/ubiquity-slideshow-ubuntu/ubiquity-slideshow-ubuntu into lp:ubiquity-slideshow-ubuntu.
=== modified file 'debian/changelog'
--- debian/changelog	2013-03-04 16:18:05 +0000
+++ debian/changelog	2013-03-10 23:03:22 +0000
@@ -1,3 +1,14 @@
+ubiquity-slideshow-ubuntu (68) UNRELEASED; urgency=low
+
+  [ Len Ovens ]
+  * UbuntuStudio Slideshow
+    - Fixed text on Video, Graphics and Photogrphy slides
+    - Used new desk background on first and last slide
+      (LP: #1153032)
+  * UbuuntuStudio Slideshow changed slide 1 png
+
+ -- Len Ovens <len@xxxxxxxxxxxxx>  Sat, 09 Mar 2013 23:45:05 -0800
+
 ubiquity-slideshow-ubuntu (67) raring; urgency=low
 
   [ Julien Lavergne ]

=== modified file 'slideshows/ubuntustudio/slides/02_video.html'
--- slideshows/ubuntustudio/slides/02_video.html	2012-03-19 22:01:22 +0000
+++ slideshows/ubuntustudio/slides/02_video.html	2013-03-10 23:03:22 +0000
@@ -9,6 +9,7 @@
 		<h2 class="subtitle">Included software</h2>
 		<ul>
 			<li><img class="icon" src="icons/blender.png" />Blender Sequence Editor and Compositing</li>
+			<li><img class="icon" src="icons/kdenlive.png" />Kdenlive Video Editor</li>
 			<li><img class="icon" src="icons/openshot.png" />Open Shot Video Editor</li>
 		</ul>
 		</div>

=== modified file 'slideshows/ubuntustudio/slides/03_graphics.html'
--- slideshows/ubuntustudio/slides/03_graphics.html	2012-03-19 22:01:22 +0000
+++ slideshows/ubuntustudio/slides/03_graphics.html	2013-03-10 23:03:22 +0000
@@ -10,6 +10,7 @@
 		<ul>
 			<li><img class="icon" src="icons/blender.png" />Blender 3D Content Creation Suite</li>
 			<li><img class="icon" src="icons/inkscape.png" />Inkscape Scalable Vector Graphics Editor</li>
+			<li><img class="icon" src="icons/calligrakrita.png" />Krita Paint Studio</li>
 			<li><img class="icon" src="icons/gimp.png" />GIMP Image Editor</li>
 		</ul>
 		</div>

=== modified file 'slideshows/ubuntustudio/slides/04_photography.html'
--- slideshows/ubuntustudio/slides/04_photography.html	2012-03-19 22:01:22 +0000
+++ slideshows/ubuntustudio/slides/04_photography.html	2013-03-10 23:03:22 +0000
@@ -8,7 +8,7 @@
 		<div class="featured">
 		<h2 class="subtitle">Included software</h2>
 		<ul>
-			<li><img class="icon" src="icons/darkroom.png" />Darkroom Photo Editor</li>
+			<li><img class="icon" src="icons/darktable.png" />Darktable Photo Editor</li>
 			<li><img class="icon" src="icons/rawtherapee.png" />RawTherapee Raw Image Processor</li>
 			<li><img class="icon" src="icons/shotwell.png" />Shotwell Photo Manager</li>
 			<li><img class="icon" src="icons/gimp.png" />GIMP Image Editor</li>

=== added file 'slideshows/ubuntustudio/slides/icons/calligrakrita.png'
Binary 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
=== added file 'slideshows/ubuntustudio/slides/icons/darktable.png'
Binary 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
=== added file 'slideshows/ubuntustudio/slides/icons/kdenlive.png'
Binary 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
=== modified file 'slideshows/ubuntustudio/slides/shots/00_ubuntustudio.png'
Binary 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

Follow ups