[jhbuild] [3.0] rename libwnck-3 to libwnck, all core migrated

[Frederic Peters <fpeters src gnome org>]

commit e3778d4c4c0b1d2ab86ab5670c304cd6f829f842
Author: Frédéric Péters <fpeters 0d be>
Date:   Fri Mar 18 14:37:53 2011 +0100

    [3.0] rename libwnck-3 to libwnck, all core migrated

 modulesets/gnome-apps-3.0.modules             |   14 ++++++++++++--
 modulesets/gnome-suites-core-3.0.modules      |    4 ++--
 modulesets/gnome-suites-core-deps-3.0.modules |   11 +----------
 modulesets/gnome-world-3.0.modules            |   10 +++++-----
 4 files changed, 20 insertions(+), 19 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.0.modules b/modulesets/gnome-apps-3.0.modules
index b65883b..c98b07a 100644
--- a/modulesets/gnome-apps-3.0.modules
+++ b/modulesets/gnome-apps-3.0.modules
@@ -241,6 +241,16 @@
     </dependencies>
   </autotools>
 
+  <autotools id="libwnck-2">
+    <branch revision="gnome-2-30" checkoutdir="libwnck-2" module="libwnck"/>
+    <dependencies>
+      <dep package="intltool"/>
+      <dep package="gtk+"/>
+      <dep package="startup-notification"/>
+    </dependencies>
+  </autotools>
+
+
   <autotools id="libxml++">
     <branch/>
     <dependencies>
@@ -384,7 +394,7 @@
       <dep package="intltool"/>
       <dep package="pygtk"/>
       <dep package="pyatspi2"/>
-      <dep package="libwnck"/>
+      <dep package="libwnck-2"/>
     </dependencies>
   </autotools>
 
@@ -826,7 +836,7 @@
       <dep package="gconf"/>
       <dep package="gnome-doc-utils"/>
       <dep package="intltool"/>
-      <dep package="libwnck"/>
+      <dep package="libwnck-2"/>
       <dep package="pyatspi2"/>
       <dep package="pycairo"/>
       <dep package="pygtk"/>
diff --git a/modulesets/gnome-suites-core-3.0.modules b/modulesets/gnome-suites-core-3.0.modules
index c382043..52af617 100644
--- a/modulesets/gnome-suites-core-3.0.modules
+++ b/modulesets/gnome-suites-core-3.0.modules
@@ -429,7 +429,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="gnome-desktop"/>
-      <dep package="libwnck-3"/>
+      <dep package="libwnck"/>
       <dep package="evolution-data-server"/>
       <dep package="gnome-menus"/>
       <dep package="gnome-doc-utils"/>
@@ -535,7 +535,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="libwnck-3"/>
+      <dep package="libwnck"/>
       <dep package="libgtop"/>
       <dep package="gtk+-3"/>
       <dep package="gnome-icon-theme"/>
diff --git a/modulesets/gnome-suites-core-deps-3.0.modules b/modulesets/gnome-suites-core-deps-3.0.modules
index c231ce7..9ae1869 100644
--- a/modulesets/gnome-suites-core-deps-3.0.modules
+++ b/modulesets/gnome-suites-core-deps-3.0.modules
@@ -1250,16 +1250,7 @@
   </tarball>
 
   <autotools id="libwnck">
-    <branch revision="gnome-2-30"/>
-    <dependencies>
-      <dep package="intltool"/>
-      <dep package="gtk+"/>
-      <dep package="startup-notification"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="libwnck-3">
-    <branch checkoutdir="libwnck-3" module="libwnck"/>
+    <branch/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+-3"/>
diff --git a/modulesets/gnome-world-3.0.modules b/modulesets/gnome-world-3.0.modules
index b2fb699..469325e 100644
--- a/modulesets/gnome-world-3.0.modules
+++ b/modulesets/gnome-world-3.0.modules
@@ -1356,7 +1356,7 @@
     <branch/>
     <dependencies>
       <dep package="gtk+"/>
-      <dep package="libwnck"/>
+      <dep package="libwnck-2"/>
     </dependencies>
   </autotools>
 
@@ -1412,7 +1412,7 @@
     <dependencies>
       <dep package="gtk+"/>
       <dep package="gconf"/>
-      <dep package="libwnck"/>
+      <dep package="libwnck-2"/>
       <dep package="libfakekey"/>
     </dependencies>
   </autotools>
@@ -1424,7 +1424,7 @@
     <dependencies>
       <dep package="gnome-panel"/>
       <dep package="gconf"/>
-      <dep package="libwnck"/>
+      <dep package="libwnck-2"/>
       <dep package="gtk+"/>
     </dependencies>
   </autotools>
@@ -1437,7 +1437,7 @@
       <dep package="gnome-panel"/>
       <dep package="gnome-desktop-2"/>
       <dep package="gconf"/>
-      <dep package="libwnck"/>
+      <dep package="libwnck-2"/>
       <dep package="gtk+"/>
     </dependencies>
   </autotools>
@@ -1452,7 +1452,7 @@
       <dep package="startup-notification"/>
       <dep package="gnome-desktop-2"/>
       <dep package="gnome-menus"/>
-      <dep package="libwnck"/>
+      <dep package="libwnck-2"/>
       <dep package="gconf"/>
       <dep package="gtk+"/>
       <dep package="pango"/>