jhbuild r1800 - in trunk: . modulesets

[lferrett svn gnome org]

Author: lferrett
Date: Fri Jan 11 20:24:48 2008
New Revision: 1800
URL: http://svn.gnome.org/viewvc/jhbuild?rev=1800&view=rev

Log:
2008-01-11  Luca Ferretti  <elle uca libero it>

	* modulesets/gnome-2.22.modules:

	Moved chesse, gvfs, vinagre, and anjuta module definitions
	from here...
	
	* modulesets/gnome-suites-2.22.modules:

	...to here. Those modules are now officially[1] part of GNOME
	Desktop and are developed on svn.gnome.org.

	External deps are not updated (for example vinagre still use
	gtk-vnc from mercurial repository, not from released package)

	[1] 
http://mail.gnome.org/archives/devel-announce-list/2008-January/msg00001.html



Modified:
   trunk/ChangeLog
   trunk/modulesets/gnome-2.22.modules
   trunk/modulesets/gnome-suites-2.22.modules

Modified: trunk/modulesets/gnome-2.22.modules
==============================================================================
--- trunk/modulesets/gnome-2.22.modules	(original)
+++ trunk/modulesets/gnome-2.22.modules	Fri Jan 11 20:24:48 2008
@@ -824,17 +824,6 @@
       <dep package="guile"/>
     </dependencies>
   </tarball>
-  <autotools id="anjuta">
-    <branch/>
-    <dependencies>
-      <dep package="libbonoboui"/>
-      <dep package="libgnomeprintui"/>
-      <dep package="vte"/>
-      <dep package="gnome-build"/>
-      <dep package="autogen"/>
-      <dep package="devhelp"/>
-    </dependencies>
-  </autotools>  
   <autotools id="OpenApplet">
     <branch/>
     <dependencies>
@@ -1178,17 +1167,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="vinagre">
-    <branch/>
-    <dependencies>
-      <dep package="avahi"/>
-      <dep package="gtk+"/>
-      <dep package="libglade"/>
-      <dep package="gconf"/>
-      <dep package="gtk-vnc"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="xdg-user-dirs-gtk">
     <branch/>
     <dependencies>
@@ -1231,13 +1209,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gvfs">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="dbus"/>
-    </dependencies>
-  </autotools>
+
 
   <autotools id="gio-standalone">
     <branch/>
@@ -1389,22 +1361,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="cheese">
-    <branch/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="libglade"/>
-      <dep package="gconf"/>
-      <dep package="hal"/>
-      <dep package="gstreamer"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="gst-plugins-good"/>
-      <dep package="gnome-vfs"/>
-      <dep package="libgnomeui"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="elisa">
     <branch repo="elisa.code.fluendo.com" module="trunk" />
     <dependencies>

Modified: trunk/modulesets/gnome-suites-2.22.modules
==============================================================================
--- trunk/modulesets/gnome-suites-2.22.modules	(original)
+++ trunk/modulesets/gnome-suites-2.22.modules	Fri Jan 11 20:24:48 2008
@@ -265,6 +265,22 @@
     </suggests>
   </autotools>
 
+  <autotools id="cheese">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="libglade"/>
+      <dep package="gconf"/>
+      <dep package="hal"/>
+      <dep package="gstreamer"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="gst-plugins-good"/>
+      <dep package="gnome-vfs"/>
+      <dep package="libgnomeui"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-control-center" autogenargs="--enable-gstreamer=0.10"
              supports-non-srcdir-builds="no">
     <branch/>
@@ -858,6 +874,15 @@
     </dependencies>
   </autotools>
 
+ <autotools id="gvfs">
+    <branch/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="dbus"/>
+      <dep package="libsoup"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="libgail-gnome">
     <branch/>
     <dependencies>
@@ -1057,6 +1082,17 @@
     </dependencies>
   </autotools>
 
+  <autotools id="vinagre">
+    <branch/>
+    <dependencies>
+      <dep package="avahi"/>
+      <dep package="gtk+"/>
+      <dep package="libglade"/>
+      <dep package="gconf"/>
+      <dep package="gtk-vnc"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="vte">
     <branch/>
     <dependencies>
@@ -1280,6 +1316,18 @@
     </dependencies>
   </autotools>
 
+  <autotools id="anjuta">
+    <branch/>
+    <dependencies>
+      <dep package="libbonoboui"/>
+      <dep package="libgnomeprintui"/>
+      <dep package="vte"/>
+      <dep package="gnome-build"/>
+      <dep package="autogen"/>
+      <dep package="devhelp"/>
+    </dependencies>
+  </autotools>  
+
   <autotools id="gnome-devel-docs">
     <branch/>
     <dependencies>
@@ -1337,6 +1385,7 @@
     <dependencies>
       <dep package="alacarte"/>
       <dep package="bug-buddy"/>
+      <dep package="cheese"/>
       <dep package="gnome-control-center"/>
       <dep package="dasher"/>
       <dep package="deskbar-applet"/>
@@ -1389,6 +1438,7 @@
       <dep package="gtkhtml"/>
       <dep package="gtksourceview"/>
       <dep package="gucharmap"/>
+      <dep package="gvfs"/>
       <dep package="libgail-gnome"/>
       <dep package="libgnomekbd"/>
       <dep package="libgtop"/>
@@ -1406,6 +1456,7 @@
       <dep package="tomboy"/>
       <dep package="totem"/>
       <dep package="vino"/>
+      <dep package="vinagre"/>
       <dep package="vte"/>
       <dep package="yelp"/>
       <dep package="zenity"/>
@@ -1455,6 +1506,7 @@
       <dep package="devhelp"/>
       <dep package="glade3"/>
       <dep package="accerciser"/>
+      <dep package="anjuta"/>
       <dep package="gnome-devel-docs"/>
     </dependencies>
   </metamodule>
@@ -1470,16 +1522,8 @@
 
   <metamodule id="meta-gnome-proposed">
     <dependencies>
-      <dep package="empathy"/>
-      <dep package="gimmie"/>
       <dep package="mousetweaks"/>
-      <dep package="vinagre"/>
       <dep package="swfdec-gnome"/>
-      <dep package="anjuta"/>
-      <dep package="cheese"/>
-      <dep package="gvfs"/>
-      <dep package="PolicyKit"/>
-      <dep package="PolicyKit-gnome"/>
     </dependencies>
   </metamodule>