jhbuild r1871 - in trunk: . modulesets

[fpeters svn gnome org]

Author: fpeters
Date: Wed Jan 23 10:05:49 2008
New Revision: 1871
URL: http://svn.gnome.org/viewvc/jhbuild?rev=1871&view=rev

Log:
* modulesets/gnome-2.22.modules, modulesets/gnome-suites-2.22.modules,
modulesets/gnome-external-deps-2.22.modules: moved gtk-sharp and
gnome-sharp to gnome-suites-2.22 module set, to match what is done for
other bindings.  Added gnome-sharp dependency to tomboy.



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	Wed Jan 23 10:05:49 2008
@@ -1433,24 +1433,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-sharp">
-    <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"/>
-      <dep package="libgnomecanvas"/>
-      <dep package="libgnomeui"/>
-      <dep package="gnome-panel"/>
-      <dep package="libgnomeprintui"/>
-      <dep package="librsvg"/>
-      <dep package="gtkhtml"/>
-      <dep package="vte"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gsf-sharp">
     <branch repo="svn.mono-project.com" module="trunk/gsf-sharp"/>
     <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	Wed Jan 23 10:05:49 2008
@@ -416,16 +416,5 @@
       <dep package="mono"/>
     </dependencies>
   </tarball>
-
-  <tarball id="gtk-sharp" version="2.10.0">
-    <source href="http://ftp.gnome.org/pub/GNOME/bindings/2.16/2.16.0/sources/mono/gtk-sharp-2.10.0.tar.bz2";
-            size= "1434673" md5sum="7786801c53537e8c208fb9f46c22f18b"/>
-    <dependencies>
-      <dep package="mono"/>
-      <dep package="monodoc"/>	
-      <dep package="gtk+"/>
-      <dep package="libglade"/>
-    </dependencies>
-  </tarball>
  
 </moduleset>

Modified: trunk/modulesets/gnome-suites-2.22.modules
==============================================================================
--- trunk/modulesets/gnome-suites-2.22.modules	(original)
+++ trunk/modulesets/gnome-suites-2.22.modules	Wed Jan 23 10:05:49 2008
@@ -13,6 +13,8 @@
       password=""/>
   <repository type="git" name="git.freedesktop.org"
       href="git://anongit.freedesktop.org/git/"/>
+  <repository type="svn" name="svn.mono-project.com"
+      href="http://anonsvn.mono-project.com/source/"/>
 
 <!-- This is a special module: it's needed to build from svn, but not
      needed to build from tarballs, so it doesn't need to be in our suites
@@ -1081,6 +1083,7 @@
     <branch/>
     <dependencies>
       <dep package="gtk-sharp"/>
+      <dep package="gnome-sharp"/>
       <dep package="ndesk-dbus"/>
       <dep package="ndesk-dbus-glib"/>
       <dep package="libgnomeprintui"/>
@@ -1396,6 +1399,34 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gtk-sharp">
+    <branch repo="svn.mono-project.com" module="branches/gtk-sharp-2-10-branch"/>
+    <dependencies>
+      <dep package="mono"/>
+      <dep package="monodoc"/>	
+      <dep package="gtk+"/>
+      <dep package="libglade"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gnome-sharp">
+    <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"/>
+      <dep package="libgnomecanvas"/>
+      <dep package="libgnomeui"/>
+      <dep package="gnome-panel"/>
+      <dep package="libgnomeprintui"/>
+      <dep package="librsvg"/>
+      <dep package="gtkhtml"/>
+      <dep package="vte"/>
+    </dependencies>
+  </autotools>
+
 <!-- Proposed Modules -->
 
 <!-- Meta Modules -->
@@ -1551,10 +1582,18 @@
     </dependencies>
   </metamodule>
 
+  <metamodule id="meta-gnome-bindings-mono">
+    <dependencies>
+      <dep package="gtk-sharp"/>
+      <dep package="gnome-sharp"/>
+    </dependencies>
+  </metamodule>
+
   <metamodule id="meta-gnome-bindings">
     <dependencies>
       <dep package="meta-gnome-bindings-c++"/>
       <dep package="meta-gnome-bindings-python"/>
+      <dep package="meta-gnome-bindings-mono"/>
     </dependencies>
   </metamodule>