jhbuild r2026 - in trunk: . modulesets

[malureau svn gnome org]

Author: malureau
Date: Tue Apr 15 21:11:31 2008
New Revision: 2026
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2026&view=rev

Log:
2008-04-15  Marc-Andre Lureau  <marcandre lureau gmail com>

	* modulesets/freedesktop-2.14.modules:
	* modulesets/freedesktop-2.24.modules:
	Moved geoclue, gypsy, and swfdec-mozilla.


Modified:
   trunk/ChangeLog
   trunk/modulesets/freedesktop-2.14.modules
   trunk/modulesets/freedesktop-2.24.modules

Modified: trunk/modulesets/freedesktop-2.14.modules
==============================================================================
--- trunk/modulesets/freedesktop-2.14.modules	(original)
+++ trunk/modulesets/freedesktop-2.14.modules	Tue Apr 15 21:11:31 2008
@@ -45,8 +45,6 @@
 
   <repository type="git" name="david.freedesktop.org"
       href="git://people.freedesktop.org/~david/"/>
-  <repository type="svn" name="gypsy.o-hand.com"
-      href="http://svn.o-hand.com/repos/gypsy"/>
 
   <repository type="tarball" name="cpan" href="http://search.cpan.org/CPAN/"; />
 
@@ -227,23 +225,6 @@
     <branch repo="git.freedesktop.org" module="fontconfig" />
   </autotools>
 
-  <autotools id="gypsy">
-    <branch repo="gypsy.o-hand.com" module="gypsy/trunk/gypsy"/>
-    <dependencies>
-      <dep package="dbus-glib"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="geoclue">
-    <branch repo="git.freedesktop.org"/>
-    <dependencies>
-      <dep package="dbus-glib"/>
-      <dep package="gconf"/>
-      <dep package="NetworkManager"/>
-      <dep package="gypsy"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="icon-slicer">
     <branch repo="icon-theme.freedesktop.org"/>
   </autotools>

Modified: trunk/modulesets/freedesktop-2.24.modules
==============================================================================
--- trunk/modulesets/freedesktop-2.24.modules	(original)
+++ trunk/modulesets/freedesktop-2.24.modules	Tue Apr 15 21:11:31 2008
@@ -37,6 +37,8 @@
       href="http://projects.collabora.co.uk/darcs/telepathy/"/>
   <repository type="svn" name="mission-control.sf.net"
       href="http://mission-control.svn.sourceforge.net/svnroot/mission-control/"/>
+  <repository type="svn" name="gypsy.o-hand.com"
+      href="http://svn.o-hand.com/repos/gypsy"/>
 
   <repository type="tarball" name="cpan" href="http://search.cpan.org/CPAN/"; />
  
@@ -251,4 +253,29 @@
     </suggests>
   </autotools>
 
+  <autotools id="geoclue">
+    <branch repo="git.freedesktop.org"/>
+    <dependencies>
+      <dep package="dbus-glib"/>
+      <dep package="gconf"/>
+      <dep package="NetworkManager"/>
+      <dep package="gypsy"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="gypsy">
+    <branch repo="gypsy.o-hand.com" module="gypsy/trunk/gypsy"/>
+    <dependencies>
+      <dep package="dbus-glib"/>
+    </dependencies>
+  </autotools>
+
+  <autotools id="swfdec-mozilla" autogen-sh="autoreconf">
+    <branch repo="git.freedesktop.org" module="swfdec/swfdec-mozilla"
+	    checkoutdir="swfdec-mozilla"/>
+    <dependencies>
+      <dep package="swfdec"/>
+    </dependencies>
+  </autotools>
+
 </moduleset>