jhbuild r1808 - in trunk: . modulesets

[vuntz svn gnome org]

Author: vuntz
Date: Sun Jan 13 17:45:15 2008
New Revision: 1808
URL: http://svn.gnome.org/viewvc/jhbuild?rev=1808&view=rev

Log:
2008-01-13  Vincent Untz  <vuntz gnome org>

	* modulesets/gnome-2.22.modules: move gtk-vnc to external dependencies
	move gdl and gnome-build to gnome suites
	* modulesets/gnome-external-deps-2.22.modules: add libxml2 and libxslt
	(was decided to move them from the platform to external deps at the
	beginning of the cycle), add gtk-vnc
	* modulesets/gnome-suites-2.22.modules: remove libxml2/libxslt,
	keep only one gnome-settings-daemon definition, remove libsexy dep for
	file-roller: it's not needed and libsexy is not a blessed dependency,
	add libgweather, reorder the devtools part and add gdl/gnome-build
	there


Modified:
   trunk/ChangeLog
   trunk/modulesets/gnome-2.22.modules
   trunk/modulesets/gnome-external-deps-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	Sun Jan 13 17:45:15 2008
@@ -37,8 +37,6 @@
     href="https://svn.tinymail.org/svn/tinymail/"; />
   <repository type="svn" name="svn.modest"
     href="https://garage.maemo.org/svn/modest/"; />
-  <repository type="hg" name="hg.gtk-vnc"
-    href="http://gtk-vnc.codemonkey.ws/hg/"; />
   <repository type="svn" name="svn.o-hand.com"
       href="http://svn.o-hand.com/repos/clutter/"/>
   <repository type="git" name="git.freedesktop.org"
@@ -371,21 +369,6 @@
       <dep package="libgnomeprint"/>
     </dependencies>
   </autotools>
-  <autotools id="gdl">
-    <branch/>
-    <dependencies>
-      <dep package="libgnomeui"/>
-      <dep package="librsvg"/>
-    </dependencies>
-  </autotools>
-  <autotools id="gnome-build">
-    <branch/>
-    <dependencies>
-      <dep package="gdl"/>
-      <dep package="gnome-vfs"/>
-      <dep package="gtkhtml2"/>
-    </dependencies>
-  </autotools>
   <autotools id="scaffold">
     <branch/>
     <dependencies>
@@ -1153,13 +1136,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gtk-vnc">
-    <branch repo="hg.gtk-vnc" module="outgoing.hg" checkoutdir="gtk-vnc"/>
-    <dependencies>
-      <dep package="gtk+"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="xdg-user-dirs-gtk">
     <branch/>
     <dependencies>

Modified: trunk/modulesets/gnome-external-deps-2.22.modules
==============================================================================
--- trunk/modulesets/gnome-external-deps-2.22.modules	(original)
+++ trunk/modulesets/gnome-external-deps-2.22.modules	Sun Jan 13 17:45:15 2008
@@ -201,6 +201,28 @@
     </dependencies>
   </tarball>
 
+  <tarball id="libxml2" version="2.6.31">
+    <source href="ftp://xmlsoft.org/libxml2/libxml2-2.6.31.tar.gz";
+            md5sum="714b0683b1ec4bdc63bc356d729f9b18" size="4734599"/>
+  </tarball>
+
+  <tarball id="libxslt" version="1.1.22">
+    <source href="ftp://xmlsoft.org/libxml2/libxslt-1.1.22.tar.gz";
+            md5sum="d6a9a020a76a3db17848d769d6c9c8a9" size="2783003"/>
+    <dependencies>
+      <dep package="libxml2"/>
+      <dep package="libgcrypt"/>
+    </dependencies>
+  </tarball>
+
+  <tarball id="gtk-vnc" version="0.3.2">
+    <source href="http://puzzle.dl.sourceforge.net/sourceforge/gtk-vnc/gtk-vnc-0.3.2.tar.gz";
+            md5sum="d87f4921c031c77335907c19ca1dbf03" size="387691"/>
+    <dependencies>
+      <dep package="gtk+"/>
+    </dependencies>
+  </tarball>
+
   <tarball autogen-sh="configure" id="opal" version="2.2.11"
       autogenargs="PWLIBDIR=../pwlib-1.10.10">
     <source href="http://download.gnome.org/sources/opal/2.2/opal-2.2.11.tar.bz2";

Modified: trunk/modulesets/gnome-suites-2.22.modules
==============================================================================
--- trunk/modulesets/gnome-suites-2.22.modules	(original)
+++ trunk/modulesets/gnome-suites-2.22.modules	Sun Jan 13 17:45:15 2008
@@ -129,18 +129,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="libxml2">
-    <branch/>
-  </autotools>
-
-  <autotools id="libxslt">
-    <branch/>
-    <dependencies>
-      <dep package="libxml2"/>
-      <dep package="libgcrypt"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="pango">
     <branch/>
     <dependencies>
@@ -281,19 +269,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-settings-daemon" supports-non-srcdir-builds="no">
-    <branch/>
-    <dependencies>
-      <dep package="libgnomeui"/>
-      <dep package="esound"/>
-      <dep package="gnome-desktop"/>
-      <dep package="libgnomekbd"/>
-      <dep package="gnome-doc-utils"/>
-      <dep package="gst-plugins-base"/>
-      <dep package="dbus-glib"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gnome-control-center" autogenargs="--enable-gstreamer=0.10"
              supports-non-srcdir-builds="no">
     <branch/>
@@ -461,9 +436,6 @@
       <dep package="gnome-doc-utils"/>
       <dep package="nautilus"/>
     </dependencies>
-    <after>
-      <dep package="libsexy"/>
-    </after>
   </autotools>
 
   <autotools id="gcalctool" supports-non-srcdir-builds="no">
@@ -717,13 +689,16 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-settings-daemon">
+  <autotools id="gnome-settings-daemon" supports-non-srcdir-builds="no">
     <branch/>
     <dependencies>
-      <dep package="glib"/>
-      <dep package="dbus"/>
-      <dep package="gtk+"/>
-      <dep package="gconf"/>
+      <dep package="libgnomeui"/>
+      <dep package="esound"/>
+      <dep package="gnome-desktop"/>
+      <dep package="libgnomekbd"/>
+      <dep package="gnome-doc-utils"/>
+      <dep package="gst-plugins-base"/>
+      <dep package="dbus-glib"/>
     </dependencies>
   </autotools>
 
@@ -929,6 +904,15 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libgweather">
+    <branch/>
+    <dependencies>
+      <dep package="gconf"/>
+      <dep package="gnome-vfs"/>
+      <dep package="gtk+"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="liboobs">
     <branch/>
     <dependencies>
@@ -1305,6 +1289,29 @@
 
 <!-- Developer Tools -->
 
+  <autotools id="accerciser">
+    <branch/>
+    <dependencies>
+      <dep package="pygtk"/>
+      <dep package="gnome-python"/>
+      <dep package="gnome-python-desktop"/>
+      <dep package="libglade"/>
+      <dep package="at-spi"/>
+    </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="devhelp">
     <branch/>
     <dependencies>
@@ -1316,38 +1323,31 @@
     </dependencies>
   </autotools>
 
-  <autotools id="glade3">
+  <autotools id="gdl">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
-      <dep package="libxml2"/>
-      <dep package="libbonoboui"/>
       <dep package="libgnomeui"/>
+      <dep package="librsvg"/>
     </dependencies>
   </autotools>
 
-  <autotools id="accerciser">
+  <autotools id="glade3">
     <branch/>
     <dependencies>
-      <dep package="pygtk"/>
-      <dep package="gnome-python"/>
-      <dep package="gnome-python-desktop"/>
-      <dep package="libglade"/>
-      <dep package="at-spi"/>
+      <dep package="gtk+"/>
+      <dep package="libxml2"/>
+      <dep package="libbonoboui"/>
+      <dep package="libgnomeui"/>
     </dependencies>
   </autotools>
 
-  <autotools id="anjuta">
+  <autotools id="gnome-build">
     <branch/>
     <dependencies>
-      <dep package="libbonoboui"/>
-      <dep package="libgnomeprintui"/>
-      <dep package="vte"/>
-      <dep package="gnome-build"/>
-      <dep package="autogen"/>
-      <dep package="devhelp"/>
+      <dep package="gdl"/>
+      <dep package="gnome-vfs"/>
     </dependencies>
-  </autotools>  
+  </autotools>
 
   <autotools id="gnome-devel-docs">
     <branch/>
@@ -1525,10 +1525,12 @@
 
   <metamodule id="meta-gnome-devtools-suite">
     <dependencies>
-      <dep package="devhelp"/>
-      <dep package="glade3"/>
       <dep package="accerciser"/>
       <dep package="anjuta"/>
+      <dep package="devhelp"/>
+      <dep package="gdl"/>
+      <dep package="glade3"/>
+      <dep package="gnome-build"/>
       <dep package="gnome-devel-docs"/>
     </dependencies>
   </metamodule>