damned-lies r787 - trunk

[gforcada svn gnome org]

Author: gforcada
Date: Mon Mar 10 14:01:53 2008
New Revision: 787
URL: http://svn.gnome.org/viewvc/damned-lies?rev=787&view=rev

Log:
vinagre, evolution, evolution-data-server, evolution-exchange and gtkhml branched for 2.22

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

Modified: trunk/gnome-modules.xml.in
==============================================================================
--- trunk/gnome-modules.xml.in	(original)
+++ trunk/gnome-modules.xml.in	Mon Mar 10 14:01:53 2008
@@ -296,11 +296,12 @@
     <branch id="gnome-2-20" stringfrozen="true"/>
   </module>
   <module id="evolution">
-    <branch id="HEAD" stringfrozen="true"/>
+    <branch id="HEAD"/>
     <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="evolution-brainread">
     <branch id="HEAD"/>
@@ -309,18 +310,20 @@
     <branch id="HEAD"/>
   </module>
   <module id="evolution-data-server">
-    <branch id="HEAD" stringfrozen="true"/>
+    <branch id="HEAD"/>
     <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="evolution-exchange">
-    <branch id="HEAD" stringfrozen="true"/>
+    <branch id="HEAD"/>
     <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="evolution-jescs">
     <branch id="HEAD"/>
@@ -1157,11 +1160,12 @@
     <branch id="gtk-engines-2-12" stringfrozen="true"/>
   </module>
   <module id="gtkhtml">
-    <branch id="HEAD" stringfrozen="true"/>
+    <branch id="HEAD"/>
     <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="gtksourceview">
     <branch id="HEAD" stringfrozen="true"/>
@@ -1590,7 +1594,8 @@
     <branch id="HEAD"/>
   </module>
   <module id="vinagre">
-    <branch id="HEAD" stringfrozen="true"/>
+    <branch id="HEAD"/>
+    <branch id="gnome-2-22" stringfrozen="true"/>
   </module>
   <module id="vino">
     <branch id="HEAD" stringfrozen="true"/>

Modified: trunk/releases.xml.in
==============================================================================
--- trunk/releases.xml.in	(original)
+++ trunk/releases.xml.in	Mon Mar 10 14:01:53 2008
@@ -559,9 +559,9 @@
       <module id="eog" branch="gnome-2-22"/>
       <module id="epiphany" branch="gnome-2-22"/>
       <module id="evince"/>
-      <module id="evolution"/>
-      <module id="evolution-data-server"/>
-      <module id="evolution-exchange"/>
+      <module id="evolution" branch="gnome-2-22"/>
+      <module id="evolution-data-server" branch="gnome-2-22"/>
+      <module id="evolution-exchange" branch="gnome-2-22"/>
       <module id="evolution-webcal"/>
       <module id="fast-user-switch-applet"/>
       <module id="file-roller"/>
@@ -596,7 +596,7 @@
       <module id="gnome-volume-manager"/>
       <module id="gok"/>
       <module id="gtk-engines"/>
-      <module id="gtkhtml"/>
+      <module id="gtkhtml" branch="gnome-2-22"/>
       <module id="gtksourceview"/>
       <module id="gucharmap" branch="gnome-2-22"/>
       <module id="gvfs"/>
@@ -617,7 +617,7 @@
       <module id="tomboy"/>
       <module id="totem" branch="gnome-2-22"/>
       <module id="totem-pl-parser" branch="gnome-2-22"/>
-      <module id="vinagre"/>
+      <module id="vinagre" branch="gnome-2-22"/>
       <module id="vino"/>
       <module id="vte"/>
       <module id="yelp"/>