From 992c6e998a09eb2dedbb0a11cf11de0072bb42c3 Mon Sep 17 00:00:00 2001
From: Vincent Untz <vuntz@gnome.org>
Date: Wed, 5 May 2010 11:15:11 +0200
Subject: [PATCH] Add Collabora to adboard and add news item about that

---
 foundation.gnome.org/about/index.wml         |   1 +
 foundation.gnome.org/img/logos/Makefile.am   |   1 +
 foundation.gnome.org/img/logos/collabora.png | Bin 0 -> 5727 bytes
 foundation.gnome.org/index.wml               |  31 +++++++++----------
 foundation.gnome.org/news/index.wml          |  13 ++++++++
 5 files changed, 30 insertions(+), 16 deletions(-)
 create mode 100644 foundation.gnome.org/img/logos/collabora.png

diff --git a/foundation.gnome.org/about/index.wml b/foundation.gnome.org/about/index.wml
index 4e3da1d..59ef2eb 100644
--- a/foundation.gnome.org/about/index.wml
+++ b/foundation.gnome.org/about/index.wml
@@ -118,6 +118,7 @@
 
     <ul>
       <li>Canonical</li>
+      <li>Collabora</li>
       <li>Debian Project</li>
       <li>Free Software Foundation</li>
       <li>Google</li>
diff --git a/foundation.gnome.org/img/logos/Makefile.am b/foundation.gnome.org/img/logos/Makefile.am
index a5719bf..b2af533 100644
--- a/foundation.gnome.org/img/logos/Makefile.am
+++ b/foundation.gnome.org/img/logos/Makefile.am
@@ -4,6 +4,7 @@ page_SCRIPTS =
 
 page_DATA = \
 	canonical.png \
+	collabora.png \
 	debian.gif \
 	fluendo.png \
 	fsf.png \
diff --git a/foundation.gnome.org/img/logos/collabora.png b/foundation.gnome.org/img/logos/collabora.png
new file mode 100644
index 0000000000000000000000000000000000000000..cedd422803eae862b0be7d92a9b1d22a09808057
GIT binary patch
literal 5727
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

literal 0
HcmV?d00001

diff --git a/foundation.gnome.org/index.wml b/foundation.gnome.org/index.wml
index e1e4ede..7fc6648 100644
--- a/foundation.gnome.org/index.wml
+++ b/foundation.gnome.org/index.wml
@@ -40,6 +40,19 @@
     <h2>News</h2>
     <ul>
 
+      <li>
+        <strong>Collabora Joins the GNOME Foundation Advisory Board</strong>
+        <small>(05/05/2010)</small>
+        <blockquote>
+	  Collabora is joining the GNOME Foundation advisory board today. A
+	  long time supporter of GNOME and member of the GNOME community,
+	  Collabora contributes directly to GNOME projects like Empathy,
+	  PiTiVi, Totem and Epiphany. Read the <a
+	  href="http://www.gnome.org/press/releases/2010-05-collabora-joins.html">press
+	  release</a>.
+        </blockquote>
+      </li>
+
       <li>
         <strong>GNOME Quarterly Report Q1 2010 released</strong>
         <small>(23/04/2010)</small>
@@ -70,28 +83,14 @@
         </blockquote>
       </li>
 
-      <li>
-        <strong>Mozilla Sponsors GNOME Accessibility Efforts</strong>
-        <small>(04/02/2010)</small>
-        <blockquote>
-	  The GNOME Foundation has received a substantial donation from the
-	  Mozilla Corporation to benefit accessibility (a11y) efforts. The
-	  donation will help continue the collaborative efforts between GNOME
-	  and Mozilla on a11y. The donation of $10,000 will be used in part to
-	  send GNOME developers to the 25th Annual International CSUN
-	  Technology &amp; Persons with Disabilities Conference. Read the <a
-	  href="http://www.gnome.org/press/releases/2010-02-mozilla-accessibility.html">press
-	  release</a>.
-        </blockquote>
-      </li>
-
     </ul>
 
     <p>You can also find more informal news at the <a href="http://blogs.gnome.org/foundation/">Foundation Blog</a>, or read <a href="news/">previous news</a>.</p>
 
     <h2>Sponsors</h2>
     <div class="center">
-      <a href="http://www.canonical.com/"><img src="img/logos/canonical.png" alt="Debian" border="0" hspace="8" vspace="5" align="middle" /></a>
+      <a href="http://www.canonical.com/"><img src="img/logos/canonical.png" alt="Canonical" border="0" hspace="8" vspace="5" align="middle" /></a>
+      <a href="http://www.collabora.co.uk/"><img src="img/logos/collabora.png" alt="Collabora" border="0" hspace="8" vspace="5" align="middle" /></a>
       <a href="http://www.debian.org/"><img src="img/logos/debian.gif" alt="Debian" border="0" hspace="8" vspace="5" align="middle" /></a>
       <a href="http://www.fsf.org/"><img src="img/logos/fsf.png" alt="Free Software Foundation" border="0" hspace="8" vspace="5" align="middle" /></a>
       <a href="http://www.google.com/"><img src="img/logos/google.png" alt="Google" border="0" hspace="8" vspace="5" align="middle" /></a>
diff --git a/foundation.gnome.org/news/index.wml b/foundation.gnome.org/news/index.wml
index 75a1789..4330122 100644
--- a/foundation.gnome.org/news/index.wml
+++ b/foundation.gnome.org/news/index.wml
@@ -15,6 +15,19 @@
 
     <ul>
 
+      <li>
+        <strong>Collabora Joins the GNOME Foundation Advisory Board</strong>
+        <small>(05/05/2010)</small>
+        <blockquote>
+	  Collabora is joining the GNOME Foundation advisory board today. A
+	  long time supporter of GNOME and member of the GNOME community,
+	  Collabora contributes directly to GNOME projects like Empathy,
+	  PiTiVi, Totem and Epiphany. Read the <a
+	  href="http://www.gnome.org/press/releases/2010-05-collabora-joins.html">press
+	  release</a>.
+        </blockquote>
+      </li>
+
       <li>
         <strong>GNOME Quarterly Report Q1 2010 released</strong>
         <small>(23/04/2010)</small>