damned-lies r954 - trunk

[claudep svn gnome org]

Author: claudep
Date: Tue Aug  5 07:26:31 2008
New Revision: 954
URL: http://svn.gnome.org/viewvc/damned-lies?rev=954&view=rev

Log:
2008-08-05  Claude Paroz  <claude 2xlibre net>

	* people.xml.in: Added Xavier Claessens, empathy's maintainer.
	* gnome-modules.xml.in:
	* releases.xml.in: gnome-vfs and gtksourceview branched for 2.22.
	Empathy is now in the desktop.

Modified:
   trunk/ChangeLog
   trunk/gnome-modules.xml.in
   trunk/people.xml.in
   trunk/releases.xml.in

Modified: trunk/gnome-modules.xml.in
==============================================================================
--- trunk/gnome-modules.xml.in	(original)
+++ trunk/gnome-modules.xml.in	Tue Aug  5 07:26:31 2008
@@ -313,6 +313,8 @@
   </module>
 
   <module id="empathy">
+    <webpage>http://live.gnome.org/Empathy</webpage>
+    <maintainer id="xclaesse"/>
     <branch id="HEAD"/>
   </module>
 
@@ -1307,11 +1309,12 @@
   </module>
 
   <module id="gnome-vfs" >
-    <branch id="HEAD" stringfrozen="true"/>
+    <branch id="HEAD" stringfrozen="false"/>
     <branch id="gnome-2-14" stringfrozen="true"/>
     <branch id="gnome-2-16" stringfrozen="true"/>
     <branch id="gnome-2-18" stringfrozen="true"/>
     <branch id="gnome-2-20" stringfrozen="true"/>
+    <branch id="gnome-2-22" stringfrozen="true"/>
   </module>
 
   <module id="gnome-volume-manager">
@@ -1415,11 +1418,12 @@
   </module>
 
   <module id="gtksourceview">
-    <branch id="HEAD" stringfrozen="true"/>
+    <branch id="HEAD" stringfrozen="false"/>
     <branch id="gnome-2-14" stringfrozen="true"/>
     <branch id="gnome-2-16" stringfrozen="true"/>
     <branch id="gnome-2-18" stringfrozen="true"/>
     <branch id="gnome-2-20" stringfrozen="true"/>
+    <branch id="gnome-2-22" stringfrozen="true"/>
   </module>
 
   <module id="gtranslator">

Modified: trunk/people.xml.in
==============================================================================
--- trunk/people.xml.in	(original)
+++ trunk/people.xml.in	Tue Aug  5 07:26:31 2008
@@ -164,6 +164,12 @@
     <icon>http://planet.gnome.org/heads/uws.png</icon>
     <bugzilla-account>wbolster gnome org</bugzilla-account>
   </person>
+  <person id="xclaesse">
+    <name>Xavier Claessens</name>
+    <email>xclaesse gmail com</email>
+    <nick>Zdra</nick>
+    <icon>http://planete.gnomefr.org/heads/Zdra.png</icon>
+  </person>
 
 <!-- non-GNOME people -->
   <person id="xdg-ivan">

Modified: trunk/releases.xml.in
==============================================================================
--- trunk/releases.xml.in	(original)
+++ trunk/releases.xml.in	Tue Aug  5 07:26:31 2008
@@ -146,7 +146,6 @@
     <module id="drivel"/>
     <module id="drwright"/>
     <module id="eggcups"/>
-    <module id="empathy"/>
     <module id="eog-plugins"/>
     <module id="epiphany-extensions"/>
     <module id="epiphany-mono"/>
@@ -578,7 +577,7 @@
       <module id="gail" branch="gnome-2-22"/>
       <module id="gconf" branch="gnome-2-22"/>
       <module id="glib" branch="glib-2-16"/>
-      <module id="gnome-vfs"/>
+      <module id="gnome-vfs" branch="gnome-2-22"/>
       <module id="gtk+" branch="gtk-2-12"/>
       <module id="libbonobo" branch="gnome-2-22"/>
       <module id="libbonoboui"/>
@@ -637,7 +636,7 @@
       <module id="gok"/>
       <module id="gtk-engines" branch="gtk-engines-2-14"/>
       <module id="gtkhtml" branch="gnome-2-22"/>
-      <module id="gtksourceview"/>
+      <module id="gtksourceview" branch="gnome-2-22"/>
       <module id="gucharmap" branch="gnome-2-22"/>
       <module id="gvfs" branch="gnome-2-22"/>
       <module id="libgnomekbd" branch="gnome-2-22"/>
@@ -709,6 +708,7 @@
       <module id="deskbar-applet"/>
       <module id="eel"/>
       <module id="ekiga"/>
+      <module id="empathy"/>
       <module id="eog"/>
       <module id="epiphany" branch="gnome-2-24"/>
       <module id="evince"/>
@@ -794,11 +794,11 @@
       <module id="gnome-devel-docs"/>
     </category>
 
-    <category id="proposed">
+<!--    <category id="proposed">
       <_description>New module proposals</_description>
       <module id="empathy"/>
       <module id="conduit"/>
-    </category>
+    </category> -->
   </release>
 
   <release id="fifth-toe" status="unofficial">