[jhbuild] [3.0] rename gnome-keyring-3 to gnome-keyring, core has moved

[Frederic Peters <fpeters src gnome org>]

commit 28baccef6373707b3b2ef4ba977cdee5baba14dc
Author: Frédéric Péters <fpeters 0d be>
Date:   Fri Mar 18 14:51:29 2011 +0100

    [3.0] rename gnome-keyring-3 to gnome-keyring, core has moved

 modulesets/gnome-apps-3.0.modules             |   18 +++++++++++++++---
 modulesets/gnome-suites-core-3.0.modules      |   10 +++++-----
 modulesets/gnome-suites-core-deps-3.0.modules |   12 ------------
 modulesets/gnome-world-3.0.modules            |   16 ++++++++--------
 4 files changed, 28 insertions(+), 28 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.0.modules b/modulesets/gnome-apps-3.0.modules
index a031dbb..6b3c5b0 100644
--- a/modulesets/gnome-apps-3.0.modules
+++ b/modulesets/gnome-apps-3.0.modules
@@ -75,6 +75,18 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-keyring-2" autogenargs="--with-gtk=2.0">
+    <branch checkoutdir="gnome-keyring-2" module="gnome-keyring" revision="gnome-3-0"/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="dbus"/>
+      <dep package="glib"/>
+      <dep package="gtk+"/>
+      <dep package="libgcrypt"/>
+      <dep package="libtasn1"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="goffice">
     <branch/>
     <dependencies>
@@ -435,7 +447,7 @@
       <dep package="dbus-glib"/>
       <dep package="gconf"/>
       <dep package="glib"/>
-      <dep package="gnome-keyring"/>
+      <dep package="gnome-keyring-2"/>
       <dep package="gtk+"/>
       <dep package="libnotify"/>
       <dep package="libunique-1"/>
@@ -471,7 +483,7 @@
       <dep package="gtkhtml2"/>
       <dep package="librsvg"/>
       <dep package="poppler"/>
-      <dep package="gnome-keyring"/>
+      <dep package="gnome-keyring-2"/>
       <dep package="dbus-glib"/>
       <dep package="pygtk"/>
     </suggests>
@@ -710,7 +722,7 @@
       <dep package="evolution-data-server"/>
       <dep package="libcanberra"/>
       <dep package="telepathy-farsight"/>
-      <dep package="gnome-keyring-3"/>
+      <dep package="gnome-keyring"/>
       <dep package="libnotify"/>
     </dependencies>
     <suggests>
diff --git a/modulesets/gnome-suites-core-3.0.modules b/modulesets/gnome-suites-core-3.0.modules
index 4eb6917..90f31a6 100644
--- a/modulesets/gnome-suites-core-3.0.modules
+++ b/modulesets/gnome-suites-core-3.0.modules
@@ -154,8 +154,8 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gnome-keyring-3" autogenargs="--with-gtk=3.0">
-    <branch checkoutdir="gnome-keyring-3" module="gnome-keyring" revision="gnome-3-0"/>
+  <autotools id="gnome-keyring" autogenargs="--with-gtk=3.0">
+    <branch revision="gnome-3-0"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="dbus"/>
@@ -359,7 +359,7 @@
       <dep package="dbus-glib"/>
       <dep package="gtk+-3"/>
       <dep package="gconf"/>
-      <dep package="gnome-keyring-3"/>
+      <dep package="gnome-keyring"/>
       <dep package="NetworkManager"/>
       <dep package="libnotify"/>
       <dep package="polkit"/>
@@ -402,7 +402,7 @@
       <dep package="dbus"/>
       <dep package="dbus-glib"/>
       <dep package="telepathy-glib"/>
-      <dep package="gnome-keyring-3"/>
+      <dep package="gnome-keyring"/>
       <dep package="gconf"/>
     </dependencies>
   </tarball>
@@ -842,7 +842,7 @@
       <dep package="gnome-icon-theme"/>
       <dep package="gnome-icon-theme-symbolic"/>
       <dep package="gnome-icon-theme-extras"/>
-      <dep package="gnome-keyring-3"/>
+      <dep package="gnome-keyring"/>
       <dep package="gnome-menus"/>
       <dep package="gnome-packagekit"/>
       <dep package="gnome-power-manager"/>
diff --git a/modulesets/gnome-suites-core-deps-3.0.modules b/modulesets/gnome-suites-core-deps-3.0.modules
index d5adb4e..3cf61a5 100644
--- a/modulesets/gnome-suites-core-deps-3.0.modules
+++ b/modulesets/gnome-suites-core-deps-3.0.modules
@@ -1189,18 +1189,6 @@
 
   <!-- Deprecated dependencies -->
 
-  <autotools id="gnome-keyring" autogenargs="--with-gtk=2.0">
-    <branch/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="dbus"/>
-      <dep package="glib"/>
-      <dep package="gtk+"/>
-      <dep package="libgcrypt"/>
-      <dep package="libtasn1"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gtk+">
     <branch revision="gtk-2-24"/>
     <dependencies>
diff --git a/modulesets/gnome-world-3.0.modules b/modulesets/gnome-world-3.0.modules
index 2de753e..786f581 100644
--- a/modulesets/gnome-world-3.0.modules
+++ b/modulesets/gnome-world-3.0.modules
@@ -331,7 +331,7 @@
       <dep package="glib"/>
       <dep package="gtk+"/>
       <dep package="gmime"/>
-      <dep package="gnome-keyring"/>
+      <dep package="gnome-keyring-2"/>
       <dep package="gconf"/>
     </dependencies>
   </autotools>
@@ -536,7 +536,7 @@
   <autotools id="gnome-mount" autogenargs="--enable-nautilus-extension">
     <branch/>
     <dependencies>
-      <dep package="gnome-keyring"/>
+      <dep package="gnome-keyring-2"/>
       <dep package="dbus"/>
       <dep package="gtk+"/>
       <dep package="intltool"/>
@@ -1042,7 +1042,7 @@
   <autotools id="gnome-keyring-manager" autogenargs="--disable-more-warnings">
     <branch/>
     <dependencies>
-      <dep package="gnome-keyring"/>
+      <dep package="gnome-keyring-2"/>
       <dep package="gconf"/>
       <dep package="gnome-doc-utils"/>
     </dependencies>
@@ -1828,7 +1828,7 @@
       <dep package="libsoup"/>
       <dep package="dbus-glib"/>
       <dep package="json-glib"/>
-      <dep package="gnome-keyring"/>
+      <dep package="gnome-keyring-2"/>
     </dependencies>
   </autotools>
 
@@ -2088,7 +2088,7 @@
       <dep package="dbus-glib"/>
       <dep package="gtk+-3"/>
       <dep package="gconf"/>
-      <dep package="gnome-keyring-3"/>
+      <dep package="gnome-keyring"/>
       <dep package="NetworkManager"/>
       <dep package="libnotify"/>
       <dep package="network-manager-applet"/>
@@ -2102,7 +2102,7 @@
       <dep package="dbus-glib"/>
       <dep package="gtk+-3"/>
       <dep package="gconf"/>
-      <dep package="gnome-keyring-3"/>
+      <dep package="gnome-keyring"/>
       <dep package="NetworkManager"/>
       <dep package="libnotify"/>
       <dep package="network-manager-applet"/>
@@ -2116,7 +2116,7 @@
       <dep package="dbus-glib"/>
       <dep package="gtk+-3"/>
       <dep package="gconf"/>
-      <dep package="gnome-keyring-3"/>
+      <dep package="gnome-keyring"/>
       <dep package="NetworkManager"/>
       <dep package="libnotify"/>
       <dep package="network-manager-applet"/>
@@ -2130,7 +2130,7 @@
       <dep package="dbus-glib"/>
       <dep package="gtk+-3"/>
       <dep package="gconf"/>
-      <dep package="gnome-keyring-3"/>
+      <dep package="gnome-keyring"/>
       <dep package="NetworkManager"/>
       <dep package="libnotify"/>
       <dep package="network-manager-applet"/>