jhbuild r2710 - in trunk: . modulesets

[fpeters svn gnome org]

Author: fpeters
Date: Tue Feb 10 12:12:07 2009
New Revision: 2710
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2710&view=rev

Log:
* modulesets/gnome-2.26.modules:
* modulesets/gnome-external-deps-2.26.modules:
* modulesets/gnome-suites-2.26.modules: updated to mono 2.2, which
provides monodoc.



Modified:
   trunk/ChangeLog
   trunk/modulesets/gnome-2.26.modules
   trunk/modulesets/gnome-external-deps-2.26.modules
   trunk/modulesets/gnome-suites-2.26.modules

Modified: trunk/modulesets/gnome-2.26.modules
==============================================================================
--- trunk/modulesets/gnome-2.26.modules	(original)
+++ trunk/modulesets/gnome-2.26.modules	Tue Feb 10 12:12:07 2009
@@ -1633,7 +1633,6 @@
     <branch repo="svn.mono-project.com" module="trunk/mono-tools"/>
     <dependencies>
       <dep package="mono"/>
-      <dep package="monodoc"/>
       <dep package="gtk-sharp"/>
       <dep package="gnome-sharp"/>
       <!-- <dep package="gecko-sharp"/> -->
@@ -1645,7 +1644,6 @@
     <dependencies>
       <dep package="gtksourceview"/>
       <dep package="mono"/>
-      <dep package="monodoc"/>
       <dep package="gnome-sharp"/>
     </dependencies>
   </autotools>
@@ -1655,7 +1653,6 @@
     <dependencies>
       <dep package="desktop-file-utils"/>
       <dep package="mono"/>
-      <dep package="monodoc"/>
       <dep package="gtk-sharp"/>
       <dep package="gnome-sharp"/>
       <dep package="gtksourceview-sharp"/>
@@ -1713,7 +1710,6 @@
         md5sum="aa2c344760c8f4d878957fd4600155a5" size="352463"/>
     <dependencies>
       <dep package="mono"/>
-      <dep package="monodoc"/>
       <dep package="gnome-sharp"/>
     </dependencies>
   </autotools>
@@ -1727,7 +1723,6 @@
       <dep package="gst-plugins-base"/>
       <dep package="gst-plugins-good"/>
       <dep package="mono"/>
-      <dep package="monodoc"/>
       <dep package="gtk-sharp"/>
       <dep package="taglib-sharp"/>
       <dep package="mono-addins"/>
@@ -1843,7 +1838,6 @@
     <branch repo="hg.circular-chaos.org"/>
     <dependencies>
       <dep package="mono"/>
-      <dep package="monodoc"/>
       <dep package="gtk-sharp"/>
       <dep package="ndesk-dbus"/>
       <dep package="ndesk-dbus-glib"/>

Modified: trunk/modulesets/gnome-external-deps-2.26.modules
==============================================================================
--- trunk/modulesets/gnome-external-deps-2.26.modules	(original)
+++ trunk/modulesets/gnome-external-deps-2.26.modules	Tue Feb 10 12:12:07 2009
@@ -555,11 +555,9 @@
   </autotools>
 
   <autotools id="mono">
-    <branch module="mono/mono-1.2.6.tar.bz2" version="1.2.6"
+    <branch module="mono/mono-2.2.tar.bz2" version="2.2"
             repo="mono.net" 
-            md5sum="391f85b4f962269e044ceac2b5235310" size="18163130">
-      <patch file="mono.remove-arg_max-check.patch" strip="1"/>
-    </branch>
+            md5sum="da147e24d14a73d8ad52775dd4a3d165" size="24360722"/>
     <dependencies>
       <dep package="libgdiplus"/>
       <dep package="sqlite3"/>
@@ -576,16 +574,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="monodoc">
-    <branch module="monodoc/monodoc-1.2.6.zip" version="1.2.6"
-            repo="mono.net" 
-            md5sum="bd4c9619ebf3b41803b7ca9097be7fc1" size="14976182">
-    </branch>
-    <dependencies>
-      <dep package="mono"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="sqlite3"
 	     autogenargs="--enable-threadsafe --disable-tcl" check-target="false">
     <branch module="sqlite-3.5.9.tar.gz" version="3.5.9"

Modified: trunk/modulesets/gnome-suites-2.26.modules
==============================================================================
--- trunk/modulesets/gnome-suites-2.26.modules	(original)
+++ trunk/modulesets/gnome-suites-2.26.modules	Tue Feb 10 12:12:07 2009
@@ -1644,7 +1644,6 @@
     <branch repo="svn.mono-project.com" module="trunk/gtk-sharp"/>
     <dependencies>
       <dep package="mono"/>
-      <dep package="monodoc"/>	
       <dep package="gtk+"/>
       <dep package="libglade"/>
     </dependencies>
@@ -1654,7 +1653,6 @@
     <branch repo="svn.mono-project.com" module="trunk/gnome-sharp"/>
     <dependencies>
       <dep package="mono"/>
-      <dep package="monodoc"/>
       <dep package="gtk-sharp"/>
       <dep package="libart_lgpl"/>
       <dep package="gnome-vfs"/>
@@ -1669,7 +1667,6 @@
     <branch repo="svn.mono-project.com" module="trunk/gnome-desktop-sharp"/>
     <dependencies>
       <dep package="mono"/>
-      <dep package="monodoc"/>
       <dep package="gtk-sharp"/>
       <dep package="librsvg"/>
       <dep package="libwnck"/>