damned-lies r1013 - trunk

[claudep svn gnome org]

Author: claudep
Date: Fri Sep 26 16:36:31 2008
New Revision: 1013
URL: http://svn.gnome.org/viewvc/damned-lies?rev=1013&view=rev

Log:
2008-09-26  Claude Paroz  <claude 2xlibre net>

	* gnome-modules.xml.in:
	* releases.xml.in: gnome-desktop, gnome-settings-daemon,
	gnome-control-center, hamster-applet, gtk-engines branched for 2.24.

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	Fri Sep 26 16:36:31 2008
@@ -829,12 +829,13 @@
   </module>
 
   <module id="gnome-control-center">
-    <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"/>
+    <branch id="gnome-2-24" stringfrozen="true"/>
   </module>
 
   <module id="gnome-cups-manager">
@@ -862,12 +863,13 @@
         </document>
       </branch>
     </defaults>
-    <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"/>
+    <branch id="gnome-2-24" stringfrozen="true"/>
   </module>
 
   <module id="gnome-devel-docs">
@@ -1193,8 +1195,9 @@
   </module>
 
   <module id="gnome-settings-daemon">
-    <branch id="HEAD" stringfrozen="true"/>
+    <branch id="HEAD" stringfrozen="false"/>
     <branch id="gnome-2-22" stringfrozen="true"/>
+    <branch id="gnome-2-24" stringfrozen="true"/>
   </module>
 
   <module id="gnome-sharing">
@@ -1446,10 +1449,11 @@
   </module>
 
   <module id="gtk-engines">
-    <branch id="HEAD" stringfrozen="true"/>
+    <branch id="HEAD" stringfrozen="false"/>
     <branch id="gtk-engines-2-10" stringfrozen="true"/>
     <branch id="gtk-engines-2-12" stringfrozen="true"/>
     <branch id="gtk-engines-2-14" stringfrozen="true"/>
+    <branch id="gtk-engines-2-16" stringfrozen="true"/>
   </module>
 
   <module id="gtkhtml">
@@ -1508,7 +1512,8 @@
   </module>
 
   <module id="hamster-applet">
-     <branch id="HEAD" stringfrozen="true"/>
+     <branch id="HEAD" stringfrozen="false"/>
+     <branch id="gnome-2-24" stringfrozen="true"/>
   </module>
 
   <module id="hardware-monitor">

Modified: trunk/releases.xml.in
==============================================================================
--- trunk/releases.xml.in	(original)
+++ trunk/releases.xml.in	Fri Sep 26 16:36:31 2008
@@ -724,8 +724,8 @@
       <module id="gedit"/>
       <module id="gnome-applets" branch="gnome-2-24"/>
       <module id="gnome-backgrounds"/>
-      <module id="gnome-control-center"/>
-      <module id="gnome-desktop"/>
+      <module id="gnome-control-center" branch="gnome-2-24"/>
+      <module id="gnome-desktop" branch="gnome-2-24"/>
       <module id="gnome-doc-utils"/>
       <module id="gnome-games" branch="gnome-2-24"/>
       <module id="gnome-icon-theme"/>
@@ -739,7 +739,7 @@
       <module id="gnome-power-manager" branch="gnome-2-24"/>
       <module id="gnome-screensaver"/>
       <module id="gnome-session"/>
-      <module id="gnome-settings-daemon"/>
+      <module id="gnome-settings-daemon" branch="gnome-2-24"/>
       <module id="gnome-system-monitor"/>
       <module id="gnome-system-tools"/>
       <module id="gnome-terminal" branch="gnome-2-24"/>
@@ -748,12 +748,12 @@
       <module id="gnome-utils"/>
       <module id="gnome-volume-manager"/>
       <module id="gok" branch="gnome-2-24"/>
-      <module id="gtk-engines"/>
+      <module id="gtk-engines" branch="gtk-engines-2-16"/>
       <module id="gtkhtml" branch="gnome-2-24"/>
       <module id="gtksourceview"/>
       <module id="gucharmap" branch="gnome-2-24"/>
       <module id="gvfs" branch="gnome-2-24"/>
-      <module id="hamster-applet"/>
+      <module id="hamster-applet" branch="gnome-2-24"/>
       <module id="libgnomekbd"/>
       <module id="libgnomeprint"/>
       <module id="libgnomeprintui"/>