damned-lies r684 - trunk

[gforcada svn gnome org]

Author: gforcada
Date: Tue Jan  8 15:00:36 2008
New Revision: 684
URL: http://svn.gnome.org/viewvc/damned-lies?rev=684&view=rev

Log:
Branched gconf for gnome-2-20 and remove gpdf and giftoxic

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	Tue Jan  8 15:00:36 2008
@@ -389,9 +389,10 @@
     <branch id="HEAD"/>
   </module>
   <module id="gconf">
-    <branch id="HEAD" stringfrozen="true"/>
+    <branch id="HEAD"/>
     <branch id="gnome-2-14" stringfrozen="true"/>
     <branch id="gnome-2-18" stringfrozen="true"/>
+    <branch id="gnome-2-20" stringforzen="true"/>
   </module>
   <module id="gconf-editor">
     <defaults>
@@ -456,9 +457,6 @@
     <branch id="HEAD"/>
     <branch id="gnome-2-20" stringfrozen="true"/>
   </module>
-  <module id="giftoxic">
-    <branch id="HEAD"/>
-  </module>
   <module id="gimmie">
     <branch id="HEAD"/>
   </module>
@@ -1115,9 +1113,6 @@
   <module id="gparted">
     <branch id="HEAD"/>
   </module>
-  <module id="gpdf">
-    <branch id="HEAD"/>
-  </module>
   <module id="gperfmeter">
     <branch id="HEAD"/>
   </module>

Modified: trunk/releases.xml.in
==============================================================================
--- trunk/releases.xml.in	(original)
+++ trunk/releases.xml.in	Tue Jan  8 15:00:36 2008
@@ -154,7 +154,6 @@
     <module id="genius"/>
     <module id="gftp"/>
     <module id="ghex"/>
-    <module id="giftoxic"/>
     <module id="gimmie"/>
     <module id="gimp" branch="gimp-2-4"/>
     <module id="gimp-freetype"/>
@@ -193,7 +192,6 @@
     <module id="goobox"/>
     <module id="gossip"/>
     <module id="gparted"/>
-    <module id="gpdf"/>
     <module id="gperfmeter"/>
     <module id="gtranslator" branch="gtranslator_1_1_8"/>
     <module id="gturing"/>
@@ -446,7 +444,7 @@
       <_description>GNOME developer platform</_description>
       <module id="atk" branch="gnome-2-20"/>
       <module id="gail" branch="gnome-2-20"/>
-      <module id="gconf"/>
+      <module id="gconf" branch="gnome-2-20"/>
       <module id="glib" branch="glib-2-14"/>
       <module id="gnome-vfs" branch="gnome-2-20"/>
       <module id="gtk+" branch="gtk-2-12"/>