jhbuild r2489 - in trunk: . modulesets

[fpeters svn gnome org]

Author: fpeters
Date: Sun Nov  9 16:56:57 2008
New Revision: 2489
URL: http://svn.gnome.org/viewvc/jhbuild?rev=2489&view=rev

Log:
* modulesets/gnome-2.26.modules, modulesets/gnome-suites-2.26.modules:
removed duplicated (brasero, gnome-user-share, unique) modules from
gnome-2.26, added brasero to proposed modules.



Modified:
   trunk/ChangeLog
   trunk/modulesets/gnome-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	Sun Nov  9 16:56:57 2008
@@ -1209,27 +1209,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="brasero">
-    <branch/>
-    <dependencies>
-      <dep package="libgnomeui"/>
-      <dep package="gst-plugins-base"/>
-    </dependencies>
-    <suggests>
-      <dep package="libnotify"/>
-      <dep package="totem"/>
-    </suggests>
-  </autotools>
-
-  <tarball id="unique" version="1.0.2">
-    <source href="http://www.gnome.org/~ebassi/source/unique-1.0.2.tar.gz";
-            size="448032" md5sum="3064930a9dd5f382641bbb2072d13563"/>
-    <dependencies>
-      <dep package="gtk+"/>
-      <dep package="dbus-glib"/>
-    </dependencies>
-  </tarball>
-
   <autotools id="libipoddevice">
     <branch/>
     <dependencies>
@@ -1895,16 +1874,6 @@
     </dependencies>
   </autotools>
 
- <autotools id="gnome-user-share">
-   <branch/>
-   <dependencies>
-     <dep package="avahi"/>
-     <dep package="gtk+"/>
-     <dep package="libglade"/>
-     <dep package="gconf"/>
-   </dependencies>
- </autotools>
-
  <autotools id="netspeed">
    <branch/>
    <dependencies>

Modified: trunk/modulesets/gnome-suites-2.26.modules
==============================================================================
--- trunk/modulesets/gnome-suites-2.26.modules	(original)
+++ trunk/modulesets/gnome-suites-2.26.modules	Sun Nov  9 16:56:57 2008
@@ -1711,6 +1711,18 @@
     </dependencies>
   </autotools>
 
+  <autotools id="brasero">
+    <branch/>
+    <dependencies>
+      <dep package="libgnomeui"/>
+      <dep package="gst-plugins-base"/>
+    </dependencies>
+    <suggests>
+      <dep package="libnotify"/>
+      <dep package="totem"/>
+    </suggests>
+  </autotools>
+
 <!-- Meta Modules -->
 
   <metamodule id="meta-gnome-devel-platform-upcoming-deprecations">
@@ -1927,6 +1939,7 @@
   <metamodule id="meta-gnome-proposed">
     <dependencies>
       <dep package="gnome-user-share"/>
+      <dep package="brasero"/>
     </dependencies>
   </metamodule>