jhbuild r2100 - in trunk: . modulesets

[murrayc svn gnome org]

Author: murrayc
Date: Sun May 18 12:59:33 2008
New Revision: 2100
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2100&view=rev

Log:
2008-05-18  Murray Cumming  <murrayc murrayc com>

* modulesets/freedesktop-2.22.modules:
* modulesets/freedesktop-2.24.modules: Removed goocanvas
* modulesets/gnome-2.22.modules: Added goocanvas here
* modulesets/gnome-2.24.modules: and changed the (duplicate) goocanvas 
here, because it has moved from cvs.cairographics.org to svn.gnome.org.

Modified:
   trunk/ChangeLog
   trunk/modulesets/freedesktop-2.22.modules
   trunk/modulesets/freedesktop-2.24.modules
   trunk/modulesets/gnome-2.22.modules
   trunk/modulesets/gnome-2.24.modules

Modified: trunk/modulesets/freedesktop-2.22.modules
==============================================================================
--- trunk/modulesets/freedesktop-2.22.modules	(original)
+++ trunk/modulesets/freedesktop-2.22.modules	Sun May 18 12:59:33 2008
@@ -123,12 +123,6 @@
     </dependencies>
   </perl>
 
-  <autotools id="goocanvas">
-    <branch repo="cairo.freedesktop.org" />
-    <dependencies>
-      <dep package="gtk+"/>
-    </dependencies>
-  </autotools>
 <!--
   <autotools id="xdg-user-dirs">
     <branch repo="user-dirs.freedesktop.org" />

Modified: trunk/modulesets/freedesktop-2.24.modules
==============================================================================
--- trunk/modulesets/freedesktop-2.24.modules	(original)
+++ trunk/modulesets/freedesktop-2.24.modules	Sun May 18 12:59:33 2008
@@ -133,12 +133,6 @@
     </dependencies>
   </perl>
 
-  <autotools id="goocanvas">
-    <branch repo="cairo.freedesktop.org" />
-    <dependencies>
-      <dep package="gtk+"/>
-    </dependencies>
-  </autotools>
 <!--
   <autotools id="xdg-user-dirs">
     <branch repo="user-dirs.freedesktop.org" />

Modified: trunk/modulesets/gnome-2.22.modules
==============================================================================
--- trunk/modulesets/gnome-2.22.modules	(original)
+++ trunk/modulesets/gnome-2.22.modules	Sun May 18 12:59:33 2008
@@ -1611,6 +1611,13 @@
    </dependencies>    
  </autotools>
 
+  <autotools id="goocanvas">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+"/>
+    </dependencies>
+  </autotools>
+
  <autotools id="moap">
    <branch repo="svn.thomas.apestaart.org" 
            module="trunk" 

Modified: trunk/modulesets/gnome-2.24.modules
==============================================================================
--- trunk/modulesets/gnome-2.24.modules	(original)
+++ trunk/modulesets/gnome-2.24.modules	Sun May 18 12:59:33 2008
@@ -1966,9 +1966,8 @@
     </suggests>
   </autotools> 
 
-  <!-- This is needed to render the canvas in conduits Gtk and Hildon GUIs -->
   <autotools id="goocanvas">
-    <branch repo="cvs.cairographics.org" module="goocanvas"/>
+    <branch/>
     <dependencies>
       <dep package="gtk+"/>
     </dependencies>