jhbuild r1803 - in trunk: . modulesets

[lferrett svn gnome org]

Author: lferrett
Date: Fri Jan 11 20:40:30 2008
New Revision: 1803
URL: http://svn.gnome.org/viewvc/jhbuild?rev=1803&view=rev

Log:
2008-01-11  Luca Ferretti  <elle uca libero it>

	* modulesets/gnome-2.22.modules: move gnome-keyring-manager
	definition here.
	* modulesets/gnome-suites-2.22.modules: removed definition from
	here and removed g-k-m from meta-gnome-desktop-suite.

	Its features are now provided by seahorse. Again, see [1].



Modified:
   trunk/ChangeLog
   trunk/modulesets/gnome-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	Fri Jan 11 20:40:30 2008
@@ -1443,4 +1443,14 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-keyring-manager" autogenargs="--disable-more-warnings">
+    <branch/>
+    <dependencies>
+      <dep package="libgnomeui"/>
+      <dep package="gnome-keyring"/>
+      <dep package="gconf"/>
+      <dep package="gnome-doc-utils"/>
+    </dependencies>
+  </autotools>
+
 </moduleset>

Modified: trunk/modulesets/gnome-suites-2.22.modules
==============================================================================
--- trunk/modulesets/gnome-suites-2.22.modules	(original)
+++ trunk/modulesets/gnome-suites-2.22.modules	Fri Jan 11 20:40:30 2008
@@ -568,17 +568,7 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-keyring-manager" autogenargs="--disable-more-warnings">
-    <branch/>
-    <dependencies>
-      <dep package="libgnomeui"/>
-      <dep package="gnome-keyring"/>
-      <dep package="gconf"/>
-      <dep package="gnome-doc-utils"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-netstatus">
+g  <autotools id="gnome-netstatus">
     <branch/>
     <dependencies>
       <dep package="libgnomeui"/>
@@ -1422,7 +1412,6 @@
       <dep package="gnome-games"/>
       <dep package="gnome-icon-theme"/>
       <dep package="gnome-keyring"/>
-      <dep package="gnome-keyring-manager"/>
       <dep package="gnome-netstatus"/>
       <dep package="gnome-nettool"/>
       <dep package="gnome-mag"/>