jhbuild r1809 - in trunk: . modulesets

[vuntz svn gnome org]

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

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

	* modulesets/gnome-2.22.modules: remove swfdec* (swfdec-mozilla is
	still available in freedesktop.modules)
	* modulesets/gnome-external-deps-2.22.modules: add swfdec
	* modulesets/gnome-suites-2.22.modules: move swfdec-gnome here, even
	if it's not yet in GNOME svn.


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:53:49 2008
@@ -1263,36 +1263,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="swfdec" autogen-sh="autoreconf">
-    <branch repo="git.freedesktop.org" module="swfdec/swfdec"
-      	checkoutdir="swfdec"/>
-    <dependencies>
-      <dep package="glib"/>
-      <dep package="pango"/>
-      <dep package="gtk+"/>
-      <dep package="cairo"/>
-      <dep package="liboil"/>
-      <dep package="libsoup"/>
-    </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>
-
-  <autotools id="swfdec-gnome">
-    <branch repo="git.freedesktop.org" module="swfdec/swfdec-gnome"
-      	checkoutdir="swfdec-gnome"/>
-    <dependencies>
-      <dep package="swfdec"/>
-      <dep package="gconf"/>
-    </dependencies>
-  </autotools>
-
   <metamodule id="meta-clutter-core">
     <dependencies>
       <dep package="clutter"/>

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:53:49 2008
@@ -281,6 +281,19 @@
     <branch repo="startup-notification.freedesktop.org"/>
   </tarball>
 
+  <tarball id="swfdec" version="0.5.5">
+    <source href="http://swfdec.freedesktop.org/download/swfdec/0.5/swfdec-0.5.5.tar.gz";
+            md5sum="b988b014e210cee205aeccaca4d6a9a7" size="8667844"/>
+    <dependencies>
+      <dep package="glib"/>
+      <dep package="pango"/>
+      <dep package="gtk+"/>
+      <dep package="cairo"/>
+      <dep package="liboil"/>
+      <dep package="libsoup"/>
+    </dependencies>
+  </tarball>
+
   <tarball id="system-tools-backends" version="2.5.4">
     <source href="http://ftp.gnome.org/pub/GNOME/sources/system-tools-backends/2.5/system-tools-backends-2.5.4.tar.bz2"; md5sum="79af168f73d88614ff5cc45135ef0b5b" size="416023"/>
     <suggests>

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:53:49 2008
@@ -1044,6 +1044,15 @@
     </dependencies>
   </autotools>
 
+  <autotools id="swfdec-gnome">
+    <branch repo="git.freedesktop.org" module="swfdec/swfdec-gnome"
+      	checkoutdir="swfdec-gnome"/>
+    <dependencies>
+      <dep package="swfdec"/>
+      <dep package="gconf"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="tomboy">
     <branch/>
     <dependencies>
@@ -1474,6 +1483,7 @@
       <dep package="pygtksourceview"/>
       <dep package="seahorse"/>
       <dep package="sound-juicer"/>
+      <dep package="swfdec-gnome"/>
       <dep package="tomboy"/>
       <dep package="totem-pl-parser"/>
       <dep package="totem"/>
@@ -1547,7 +1557,6 @@
   <metamodule id="meta-gnome-proposed">
     <dependencies>
       <dep package="mousetweaks"/>
-      <dep package="swfdec-gnome"/>
     </dependencies>
   </metamodule>