Merge lp:~jorge/example-content/jaunty-winners into lp:~ubuntu-core-dev/example-content/ubuntu

[Jorge Castro]

[Jorge Castro (jorge)]

Update with initial winners of the Free Culture Showcase

[Endolith (endolith)]

Better file names:

MoShang - Invocation.ogg
Robbie Ferguson - Spirit of Ubuntu.ogv
Canadian Clouds.jpg

Also the ogg should have metadata (can add with Ex Falso):

    Title: Invocation
    Artist: MoShang
    Website: http://moshang.net/

[lp:~jorge/example-content/jaunty-winners]

57. By Jorge Castro on 2009-03-24

Update announcement URL in About_these_files.odt

=== added file 'Ubuntu_Free_Culture_Showcase/CanadianClouds.jpg'
Binary files Ubuntu_Free_Culture_Showcase/CanadianClouds.jpg	1970-01-01 00:00:00 +0000 and Ubuntu_Free_Culture_Showcase/CanadianClouds.jpg	2009-03-17 18:49:08 +0000 differ
=== added file 'Ubuntu_Free_Culture_Showcase/Invocation.ogg'
Binary files Ubuntu_Free_Culture_Showcase/Invocation.ogg	1970-01-01 00:00:00 +0000 and Ubuntu_Free_Culture_Showcase/Invocation.ogg	2009-03-17 18:49:08 +0000 differ
=== added file 'Ubuntu_Free_Culture_Showcase/SpiritOfUbuntu.ogv'
Binary files Ubuntu_Free_Culture_Showcase/SpiritOfUbuntu.ogv	1970-01-01 00:00:00 +0000 and Ubuntu_Free_Culture_Showcase/SpiritOfUbuntu.ogv	2009-03-17 18:49:08 +0000 differ
=== removed file 'Ubuntu_Free_Culture_Showcase/StopMotionUbuntu.ogv'
Binary files Ubuntu_Free_Culture_Showcase/StopMotionUbuntu.ogv	2008-10-22 07:16:03 +0000 and Ubuntu_Free_Culture_Showcase/StopMotionUbuntu.ogv	1970-01-01 00:00:00 +0000 differ
=== removed file 'Ubuntu_Free_Culture_Showcase/patas_de_trapo.oga'
Binary files Ubuntu_Free_Culture_Showcase/patas_de_trapo.oga	2008-10-22 07:16:03 +0000 and Ubuntu_Free_Culture_Showcase/patas_de_trapo.oga	1970-01-01 00:00:00 +0000 differ
=== renamed file 'Ubuntu_adoption_case_studies/University_of_Oakland.pdf' => 'Ubuntu_adoption_case_studies/Oakland_University.pdf'
=== modified file 'debian/changelog'
--- debian/changelog	2009-03-17 13:33:39 +0000
+++ debian/changelog	2009-03-17 19:11:19 +0000
@@ -1,3 +1,19 @@
+example-content (37) jaunty; urgency=low
+
+  * Update About_These_Files.odt with the new content.
+
+ -- Jorge O. Castro <[e-mail]>  Tue, 17 Mar 2009 15:01:22 -0400
+
+example-content (36) UNRELEASED; urgency=low
+
+  * Rename pdf from "University of Oakland" to the correct "Oakland University"
+  * Add winners from the Free Culture Showcase Competition
+    - Invocation.ogg by MoShang <[e-mail]>
+    - SpiritOfUbuntu.ogv by Robbie Ferguson <[e-mail]>
+    - CanadianClouds.jpg by m0deth <[e-mail]>
+
+ -- Jorge O. Castro <[e-mail]>  Tue, 17 Mar 2009 14:45:00 -0400
+
 example-content (36) UNRELEASED; urgency=low
 
   [ Timo Jyrinki ]

=== modified file 'main/About_these_files.odt'
Binary files main/About_these_files.odt	2009-03-17 13:33:39 +0000 and main/About_these_files.odt	2009-03-17 19:11:19 +0000 differ
=== modified file 'po/example-content.pot'
--- po/example-content.pot	2009-03-12 18:09:45 +0000
+++ po/example-content.pot	2009-03-17 19:11:19 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-12 17:04+0200\n"
+"POT-Creation-Date: 2009-03-17 14:49-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"