[jhbuild] [3.0] renamed gtk+-3.0 to gtk+



commit 36088bb13dba85a2168ffb42b9d09911be076d6d
Author: Frédéric Péters <fpeters 0d be>
Date:   Fri Mar 18 15:24:18 2011 +0100

    [3.0] renamed gtk+-3.0 to gtk+

 modulesets/gnome-apps-3.0.modules             |   64 ++++++------
 modulesets/gnome-suites-core-3.0.modules      |   70 +++++++-------
 modulesets/gnome-suites-core-deps-3.0.modules |   44 ++++----
 modulesets/gnome-world-3.0.modules            |  136 ++++++++++++------------
 4 files changed, 157 insertions(+), 157 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.0.modules b/modulesets/gnome-apps-3.0.modules
index 6b3c5b0..88edb86 100644
--- a/modulesets/gnome-apps-3.0.modules
+++ b/modulesets/gnome-apps-3.0.modules
@@ -70,7 +70,7 @@
       <dep package="glib"/>
       <dep package="cairo"/>
       <dep package="pango"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="librsvg"/>
     </dependencies>
   </autotools>
@@ -81,7 +81,7 @@
       <dep package="intltool"/>
       <dep package="dbus"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="libgcrypt"/>
       <dep package="libtasn1"/>
     </dependencies>
@@ -109,7 +109,7 @@
     <branch/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="enchant"/>
       <dep package="iso-codes"/>
       <dep package="libsoup"/>
@@ -122,7 +122,7 @@
             revision="gtk-sharp-2-12-branch"/>
     <dependencies>
       <dep package="mono"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
     </dependencies>
   </autotools>
 
@@ -132,7 +132,7 @@
       <dep package="intltool"/>
       <dep package="libxml2"/>
       <dep package="shared-mime-info"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
     </dependencies>
   </autotools>
 
@@ -141,7 +141,7 @@
             hash="sha256:b9870d923d636d2e7547267d01c8cafdc06ad5b5b4987003ea3cd567bfbb6377"
             md5sum="38d3fbacb5d00e630f939e88858206f1" size="446486"/>
     <dependencies>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
     </dependencies>
   </tarball>
 
@@ -259,7 +259,7 @@
             hash="sha256:e5c8041cef8e33c55732f06a292381cb345db946cf792a4ae18aa5c66cdd4fbb"
             md5sum="7955769ef31f1bc4f83446dbb3625e6d" size="335534"/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="dbus-glib"/>
     </dependencies>
   </autotools>
@@ -268,7 +268,7 @@
     <branch revision="gnome-2-30" checkoutdir="libwnck-2" module="libwnck"/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="startup-notification"/>
     </dependencies>
   </autotools>
@@ -354,7 +354,7 @@
     <branch/>
     <dependencies>
       <dep package="pygobject"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="pycairo"/>
     </dependencies>
   </autotools>
@@ -388,7 +388,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="librsvg"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
     </dependencies>
   </autotools>
 
@@ -398,7 +398,7 @@
     <branch repo="svn.abisource.com"/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="libxml2"/>
       <dep package="libgsf"/>
       <dep package="wv"/>
@@ -448,7 +448,7 @@
       <dep package="gconf"/>
       <dep package="glib"/>
       <dep package="gnome-keyring-2"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="libnotify"/>
       <dep package="libunique-1"/>
       <dep package="nautilus"/>
@@ -467,14 +467,14 @@
   <autotools id="gthumb">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
     </dependencies>
   </autotools>
 
   <autotools id="gimp" autogenargs="--disable-print --without-gnomevfs">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="intltool"/>
       <dep package="gegl"/>
     </dependencies>
@@ -492,7 +492,7 @@
   <autotools id="gnome-scan">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="gconf"/>
       <dep package="gegl"/>
       <dep package="gimp"/>
@@ -533,7 +533,7 @@
   <autotools id="libgnome-media-profiles">
     <branch/>
     <dependencies>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="gconf"/>
       <dep package="gst-plugins-base"/>
     </dependencies>
@@ -554,7 +554,7 @@
     <branch/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="gconf"/>
       <dep package="WebKit"/>
     </dependencies>
@@ -565,7 +565,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="librsvg"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
     </dependencies>
   </autotools>
 
@@ -576,7 +576,7 @@
       <dep package="gnome-common"/>
       <dep package="gnome-doc-utils"/>
       <dep package="gtk-doc" />
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="libxml2"/>
     </dependencies>
   </autotools>
@@ -609,7 +609,7 @@
     <dependencies>
       <dep package="dbus-glib"/>
       <dep package="gconf"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
     </dependencies>
   </autotools>
 
@@ -630,7 +630,7 @@
       <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="gdk-pixbuf"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="vte"/>
       <dep package="gdl"/>
       <dep package="libgda"/>
@@ -647,7 +647,7 @@
   <autotools id="brasero" autogenargs="--with-gtk=3.0">
     <branch/>
     <dependencies>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="gconf"/>
       <dep package="gst-plugins-base"/>
       <dep package="libcanberra"/>
@@ -665,7 +665,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="gconf"/>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
@@ -692,7 +692,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="libxml2"/>
       <dep package="libsigc++2"/>
       <dep package="opal" />
@@ -713,7 +713,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="telepathy-glib"/>
       <dep package="folks"/>
@@ -738,7 +738,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="libxml2"/>
       <dep package="gnome-icon-theme"/>
       <dep package="poppler"/>
@@ -756,7 +756,7 @@
     <branch/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="evolution-data-server"/>
       <dep package="gtkhtml"/>
       <dep package="gnome-desktop"/>
@@ -807,7 +807,7 @@
       <dep package="intltool"/>
       <dep package="librsvg"/>
       <dep package="rarian"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="pygtk"/>
       <dep package="clutter"/>
       <dep package="clutter-gtk"/>
@@ -820,7 +820,7 @@
   <autotools id="gnome-nettool">
     <branch/>
     <dependencies>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="gconf"/>
       <dep package="gnome-doc-utils"/>
     </dependencies>
@@ -842,7 +842,7 @@
     <branch revision="gnome-3-0"/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="dbus-glib"/>
       <dep package="evolution-data-server"/>
     </dependencies>
@@ -892,7 +892,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="gconf"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="glib"/>
       <dep package="dbus-glib"/>
     </dependencies>
@@ -927,7 +927,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="libxml2"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="gtk-vnc"/>
       <dep package="libpeas"/>
       <dep package="libgnome-keyring"/>
diff --git a/modulesets/gnome-suites-core-3.0.modules b/modulesets/gnome-suites-core-3.0.modules
index 90f31a6..690925f 100644
--- a/modulesets/gnome-suites-core-3.0.modules
+++ b/modulesets/gnome-suites-core-3.0.modules
@@ -50,7 +50,7 @@
     <branch/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="dbus"/>
       <dep package="vala"/>
       <dep package="libxml2"/>
@@ -63,7 +63,7 @@
       <dep package="intltool"/>
       <dep package="libsoup"/>
       <dep package="libxml2"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="gconf"/>
       <dep package="sqlite3"/>
       <dep package="libgweather"/>
@@ -82,7 +82,7 @@
   <autotools id="gnome-bluetooth">
     <branch/>
     <dependencies>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="glib"/>
       <dep package="gconf"/>
       <dep package="dbus-glib"/>
@@ -96,7 +96,7 @@
       <dep package="intltool"/>
       <dep package="iso-codes"/>
       <dep package="glib"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="gnome-desktop"/>
       <dep package="libxml2"/>
       <dep package="gnome-menus"/>
@@ -120,7 +120,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="startup-notification"/>
       <dep package="gnome-doc-utils"/>
       <dep package="gsettings-desktop-schemas"/>
@@ -160,7 +160,7 @@
       <dep package="intltool"/>
       <dep package="dbus"/>
       <dep package="glib"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="libgcrypt"/>
       <dep package="libtasn1"/>
     </dependencies>
@@ -182,7 +182,7 @@
     <branch/>
     <dependencies>
       <dep package="PackageKit"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="libnotify"/>
       <dep package="gnome-menus"/>
       <dep package="libcanberra"/>
@@ -200,7 +200,7 @@
       <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="dbus-glib"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="libgnome-keyring"/>
       <dep package="gconf"/>
       <dep package="intltool"/>
@@ -216,7 +216,7 @@
     <branch/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="dbus-glib"/>
       <dep package="gnome-menus"/>
       <dep package="gnome-desktop"/>
@@ -231,7 +231,7 @@
     <branch/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="gconf"/>
       <dep package="dbus-glib"/>
       <dep package="startup-notification"/>
@@ -249,7 +249,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="gconf"/>
       <dep package="gnome-desktop"/>
       <dep package="libgnomekbd"/>
@@ -274,7 +274,7 @@
       <dep package="gnome-menus"/>
       <dep package="gnome-settings-daemon"/>
       <dep package="gobject-introspection"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="libcanberra"/>
       <dep package="libcroco"/>
       <dep package="mutter"/>
@@ -328,7 +328,7 @@
   <autotools id="mousetweaks">
     <branch />
     <dependencies>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="gsettings-desktop-schemas"/>
       <dep package="intltool"/>
     </dependencies>
@@ -339,7 +339,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="gdk-pixbuf"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="gconf"/>
       <dep package="intltool"/>
       <dep package="zenity"/>
@@ -357,7 +357,7 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="dbus-glib"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="gconf"/>
       <dep package="gnome-keyring"/>
       <dep package="NetworkManager"/>
@@ -416,7 +416,7 @@
       <dep package="intltool"/>
       <dep package="ORBit2"/>
       <dep package="libxml2"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="dbus-glib"/>
     </dependencies>
     <suggests>
@@ -448,7 +448,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="gdk-pixbuf"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="gconf"/>
       <dep package="intltool"/>
       <dep package="libcanberra"/>
@@ -462,7 +462,7 @@
       <dep package="dbus"/>
       <dep package="dbus-glib"/>
       <dep package="glib"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="libcanberra"/>
     </dependencies>
   </autotools>
@@ -475,7 +475,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="gnome-desktop"/>
       <dep package="gnome-icon-theme"/>
       <dep package="libpeas"/>
@@ -493,7 +493,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="iso-codes"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="dbus-glib"/>
       <dep package="gnome-doc-utils"/>
       <dep package="startup-notification"/>
@@ -512,7 +512,7 @@
     <branch/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="gnome-doc-utils"/>
     </dependencies>
   </autotools>
@@ -521,7 +521,7 @@
     <branch/>
     <dependencies>
       <dep package="avahi"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="dbus-glib"/>
       <dep package="libatasmart"/>
       <dep package="libgnome-keyring"/>
@@ -537,7 +537,7 @@
       <dep package="glib"/>
       <dep package="libwnck"/>
       <dep package="libgtop"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="gnome-icon-theme"/>
       <dep package="gtkmm"/>
       <dep package="libxml2"/>
@@ -550,7 +550,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="gconf"/>
       <dep package="vte"/>
       <dep package="startup-notification"/>
@@ -570,7 +570,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="gnome-doc-utils"/>
       <dep package="libgtop"/>
     </dependencies>
@@ -581,7 +581,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="gnome-doc-utils"/>
     </dependencies>
     <suggests>
@@ -594,7 +594,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="pango"/>
       <dep package="libxml2"/>
       <dep package="gnome-desktop"/>
@@ -613,7 +613,7 @@
     <branch/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="gstreamer"/>
       <dep package="gst-plugins-base"/>
       <dep package="gst-plugins-good"/>
@@ -634,7 +634,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="libxml2"/>
       <dep package="libxslt"/>
       <dep package="WebKit"/>
@@ -657,7 +657,7 @@
     <branch/>
     <dependencies>
       <dep package="avahi"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="libnotify"/>
       <dep package="gconf"/>
       <dep package="gnome-bluetooth"/>
@@ -671,7 +671,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="libsoup"/>
     </dependencies>
     <suggests>
@@ -704,7 +704,7 @@
             md5sum="d0143a5aa3265019072e53ab497818d0" size="1238660"/>
     <patch file="avahi-build-fix.patch" strip="1"/>
     <dependencies>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="libdaemon"/>
     </dependencies>
   </tarball>
@@ -744,7 +744,7 @@
     <branch/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="dbus-glib"/>
       <dep package="gnome-settings-daemon"/>
       <dep package="gnome-session"/>
@@ -772,7 +772,7 @@
     <branch repo="packagekit.gitorious.org" checkoutdir="PackageKit" module="packagekit"/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="dbus"/>
       <dep package="dbus-glib"/>
     </dependencies>
@@ -929,7 +929,7 @@
       <dep package="at-spi2-core"/>
       <dep package="at-spi2-atk"/>
       <dep package="glib"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="pango"/>
     </dependencies>
   </metamodule>
diff --git a/modulesets/gnome-suites-core-deps-3.0.modules b/modulesets/gnome-suites-core-deps-3.0.modules
index 3cf61a5..894eaa6 100644
--- a/modulesets/gnome-suites-core-deps-3.0.modules
+++ b/modulesets/gnome-suites-core-deps-3.0.modules
@@ -191,8 +191,8 @@
     </dependencies>
   </autotools>
 
-  <autotools id="gtk+-3">
-    <branch checkoutdir="gtk+-3" module="gtk+" revision="gtk-3-0"/>
+  <autotools id="gtk+">
+    <branch revision="gtk-3-0"/>
     <dependencies>
       <dep package="atk"/>
       <dep package="glib"/>
@@ -234,7 +234,7 @@
   <autotools id="clutter-gtk">
     <branch repo="git.clutter-project.org"/>
     <dependencies>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="clutter"/>
     </dependencies>
   </autotools>
@@ -424,7 +424,7 @@
     <branch repo="gstreamer.freedesktop.org" module="gst-plugins-base"/>
     <dependencies>
       <dep package="gstreamer"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="liboil"/>
     </dependencies>
     <suggests>
@@ -510,7 +510,7 @@
     <dependencies>
       <dep package="pangomm"/>
       <dep package="atkmm"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="glib"/>
     </dependencies>
   </autotools>
@@ -574,7 +574,7 @@
     </dependencies>
     <after>
       <dep package="gtk+"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+-2"/>
       <dep package="pulseaudio"/>
       <dep package="gstreamer"/>
     </after>
@@ -586,7 +586,7 @@
      <dep package="glib"/>
      <dep package="cairo"/>
      <dep package="clutter"/>
-     <dep package="gtk+-3"/>
+     <dep package="gtk+"/>
      <dep package="sqlite3"/>
    </dependencies>
    <suggests>
@@ -653,7 +653,7 @@
     <branch/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="gtk+-3" />
+      <dep package="gtk+" />
       <dep package="libxklavier" />
     </dependencies>
   </autotools>
@@ -664,7 +664,7 @@
       <dep package="intltool"/>
       <dep package="libxml2"/>
       <dep package="gconf"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="libsoup"/>
     </dependencies>
   </autotools>
@@ -716,7 +716,7 @@
     <branch/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="gobject-introspection"/>
     </dependencies>
   </autotools>
@@ -731,7 +731,7 @@
     <branch/>
     <dependencies>
       <dep package="gobject-introspection"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
     </dependencies>
     <suggests>
       <dep package="pygobject"/>
@@ -804,7 +804,7 @@
             hash="sha256:6e30bc877c5c683e7f1bb67a96d396ceaa0501730555881d9678e8061f4639db"
             md5sum="b9d27909765ccdb0e9941cb484bc2137" size="366601"/>
     <dependencies>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="dbus-glib"/>
     </dependencies>
   </autotools>
@@ -923,7 +923,7 @@
             checkoutdir="mozilla-1.9.2.15">
     </branch>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="nss"/>
       <dep package="nspr"/>
       <dep package="dbus"/>
@@ -943,7 +943,7 @@
     </branch>
   </autotools>
 
-  <autotools id="polkit-gnome">
+  <autotools id="polkit-gnome" autogenargs="--with-gtk=3.0">
     <branch checkoutdir="polkit-gnome" module="PolicyKit-gnome"/>
     <dependencies>
       <dep package="polkit"/>
@@ -964,7 +964,7 @@
       <dep package="poppler-data"/>
     </suggests>
     <after>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="gdk-pixbuf"/>
     </after>
   </tarball>
@@ -1135,7 +1135,7 @@
       <dep package="cairo"/>
       <dep package="fontconfig"/>
       <dep package="libxml2"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="pango"/>
       <dep package="libsoup"/>
       <dep package="gobject-introspection"/>
@@ -1153,7 +1153,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
     </dependencies>
   </autotools>
 
@@ -1170,7 +1170,7 @@
     <branch/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="gnome-doc-utils"/>
     </dependencies>
   </autotools>
@@ -1189,8 +1189,8 @@
 
   <!-- Deprecated dependencies -->
 
-  <autotools id="gtk+">
-    <branch revision="gtk-2-24"/>
+  <autotools id="gtk+-2">
+    <branch checkoutdir="gtk+-2" module="gtk+" revision="gtk-2-24"/>
     <dependencies>
       <dep package="glib"/>
       <dep package="cairo"/>
@@ -1207,7 +1207,7 @@
   <autotools id="gtk-engines">
     <branch revision="gtk-engines-2-22"/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
     </dependencies>
   </autotools>
 
@@ -1231,7 +1231,7 @@
     <branch/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="startup-notification"/>
     </dependencies>
   </autotools>
diff --git a/modulesets/gnome-world-3.0.modules b/modulesets/gnome-world-3.0.modules
index 94cc620..300e9b2 100644
--- a/modulesets/gnome-world-3.0.modules
+++ b/modulesets/gnome-world-3.0.modules
@@ -127,7 +127,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="gconf"/>
       <dep package="startup-notification"/>
       <dep package="rarian"/>
@@ -139,7 +139,7 @@
   <autotools id="cairo-gtk-engine">
     <branch repo="cairo.freedesktop.org"/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="cairo"/>
     </dependencies>
   </autotools>
@@ -147,7 +147,7 @@
   <autotools id="libbtctl">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="glib"/>
     </dependencies>
   </autotools>
@@ -155,7 +155,7 @@
   <autotools id="phonemgr">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="glib"/>
       <dep package="libbtctl"/>
       <dep package="gnome-bluetooth"/>
@@ -170,7 +170,7 @@
   <autotools id="gtkhtml2">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="libxml2"/>
     </dependencies>
   </autotools>
@@ -223,7 +223,7 @@
   <autotools id="giggle">
     <branch/>
     <dependencies>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="glib"/>
       <dep package="gtksourceview"/>
       <dep package="gnome-doc-utils"/>
@@ -237,7 +237,7 @@
   <autotools id="gitg">
     <branch revision="gtk3"/>
     <dependencies>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="glib"/>
       <dep package="gtksourceview"/>
     </dependencies>
@@ -258,7 +258,7 @@
     <branch/>
     <dependencies>
       <dep package="librep"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
     </dependencies>
   </autotools>
 
@@ -329,7 +329,7 @@
     <branch/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="gmime"/>
       <dep package="gnome-keyring-2"/>
       <dep package="gconf"/>
@@ -340,7 +340,7 @@
     <branch/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="libxml2"/>
       <dep package="gtkspell"/>
     </dependencies>
@@ -522,14 +522,14 @@
     <branch/>
     <dependencies>
       <dep package="libglade"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
     </dependencies>
   </autotools>
 
   <autotools id="gthumb">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
     </dependencies>
   </autotools>
 
@@ -538,7 +538,7 @@
     <dependencies>
       <dep package="gnome-keyring-2"/>
       <dep package="dbus"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="intltool"/>
       <dep package="libglade"/>
       <dep package="nautilus"/>
@@ -548,7 +548,7 @@
   <autotools id="libsexy">
     <branch repo="osiris.chipx86.com" module="trunk/libsexy"/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="libxml2"/>
       <dep package="iso-codes"/>
     </dependencies>
@@ -557,7 +557,7 @@
   <autotools id="sodipodi">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="libgnomeprintui"/>
       <dep package="libxml2"/>
     </dependencies>
@@ -605,7 +605,7 @@
   <autotools id="xchat">
     <branch repo="xchat.sf.net" module="xchat" />
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="libxml2"/>
     </dependencies>
   </autotools>
@@ -613,7 +613,7 @@
   <autotools id="camorama">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="gconf"/>
       <dep package="libglade"/>
     </dependencies>
@@ -622,7 +622,7 @@
   <autotools id="gtk-engines-cleanice">
     <branch repo="elysium-project.sf.net"/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
     </dependencies>
   </autotools>
 
@@ -750,7 +750,7 @@
   <autotools id="atomix">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="libxml2"/>
     </dependencies>
   </autotools>
@@ -758,7 +758,7 @@
   <autotools id="istanbul">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="gnome-python-extras"/>
       <dep package="pygtk"/>
       <dep package="gstreamer"/>
@@ -769,7 +769,7 @@
   <autotools id="muine">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="gstreamer"/>
     </dependencies>
   </autotools>
@@ -805,7 +805,7 @@
   <autotools id="xchat-gnome">
     <branch/>
     <dependencies>
-      <dep package="gtk+" />
+      <dep package="gtk+-2" />
       <dep package="gconf" />
       <dep package="libglade" />
       <dep package="libsexy" />
@@ -835,7 +835,7 @@
   <autotools id="gnome-scan">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="gconf"/>
       <dep package="gegl"/>
       <dep package="gimp"/>
@@ -878,14 +878,14 @@
   <autotools id="xdg-user-dirs-gtk">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
     </dependencies>
   </autotools>
 
   <autotools id="ghex">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="libgnomeprintui"/>
     </dependencies>
   </autotools>
@@ -893,7 +893,7 @@
   <autotools id="dia">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="libxml2"/>
       <dep package="libxslt"/>
     </dependencies>
@@ -910,7 +910,7 @@
     <dependencies>
       <dep package="vala"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
     </dependencies>
   </autotools>
 
@@ -957,7 +957,7 @@
     <branch repo="gitorious.org" module="gupnp/gupnp-tools"/>
     <dependencies>
       <dep package="gupnp"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="gnome-icon-theme"/>
     </dependencies>
   </autotools>
@@ -965,7 +965,7 @@
   <autotools id="gupnp-ui">
     <branch repo="gitorious.org" module="gupnp/gupnp-ui"/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="gupnp"/>
     </dependencies>
   </autotools>
@@ -975,7 +975,7 @@
     <dependencies>
       <dep package="rhythmbox"/>
       <dep package="gupnp-av"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
     </dependencies>
   </autotools>
 
@@ -1002,7 +1002,7 @@
   <autotools id="pigment">
     <branch repo="pigment.code.fluendo.com" module="trunk" />
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="pygtk"/>
     </dependencies>
   </autotools>
@@ -1022,7 +1022,7 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="dbus-glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="gconf"/>
       <dep package="libnotify"/>
       <dep package="dbus"/>
@@ -1034,7 +1034,7 @@
     <dependencies>
       <dep package="libxml2"/>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="evolution-data-server"/>
     </dependencies>
   </autotools>
@@ -1119,7 +1119,7 @@
  <autotools id="netspeed">
    <branch/>
    <dependencies>
-     <dep package="gtk+"/>
+     <dep package="gtk+-2"/>
      <dep package="gnome-panel"/>
    </dependencies>
  </autotools>
@@ -1232,7 +1232,7 @@
             md5sum="dcb81aa203f9ae4167b5045b7b8177e1" size="2059415"/>
     <suggests>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
     </suggests>
   </tarball>
 
@@ -1241,7 +1241,7 @@
             hash="sha256:8fc7dc560167b2cb7193e76aca625a152dc19b0ebf49816b78539cbb90d80d02"
             md5sum="f75dcc9338f182c571b321d37c606a94" size="351277"/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="pango"/>
       <dep package="gtk-doc"/>
     </dependencies>
@@ -1252,7 +1252,7 @@
             module="trunk"
             checkoutdir="transmission"/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="intltool"/>
     </dependencies>
     <suggests>
@@ -1264,7 +1264,7 @@
   <autotools id="goocanvas">
     <branch/>
     <dependencies>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
     </dependencies>
   </autotools>
 
@@ -1355,7 +1355,7 @@
   <autotools id="devilspie">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="libwnck-2"/>
     </dependencies>
   </autotools>
@@ -1363,7 +1363,7 @@
   <autotools id="murrine">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="intltool"/>
     </dependencies>
   </autotools>
@@ -1371,7 +1371,7 @@
   <autotools id="gtk-css-engine">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
     </dependencies>
   </autotools>
 
@@ -1402,7 +1402,7 @@
             module="~netbook-remix-team/netbook-remix/maximus"
             checkoutdir="maximus"/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="gconf"/>
       <dep package="libwnck-2"/>
       <dep package="libfakekey"/>
@@ -1417,7 +1417,7 @@
       <dep package="gnome-panel"/>
       <dep package="gconf"/>
       <dep package="libwnck-2"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
     </dependencies>
   </autotools>
 
@@ -1430,7 +1430,7 @@
       <dep package="gnome-desktop-2"/>
       <dep package="gconf"/>
       <dep package="libwnck-2"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
     </dependencies>
   </autotools>
 
@@ -1446,7 +1446,7 @@
       <dep package="gnome-menus"/>
       <dep package="libwnck-2"/>
       <dep package="gconf"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="pango"/>
       <dep package="glib"/>
     </dependencies>
@@ -1457,7 +1457,7 @@
            module="~netbook-remix-team/netbook-remix/desktop-switcher"
            checkoutdir="desktop-switcher"/>
    <dependencies>
-     <dep package="gtk+"/>
+     <dep package="gtk+-2"/>
      <dep package="gconf"/>
    </dependencies>
  </autotools>
@@ -1478,7 +1478,7 @@
     <branch/>
     <dependencies>
       <dep package="intltool"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="gconf"/>
       <dep package="sqlite3"/>
     </dependencies>
@@ -1526,7 +1526,7 @@
  <autotools id="quick-lounge-applet">
     <branch />
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="gnome-panel"/>
       <dep package="gnome-menus"/>
     </dependencies>
@@ -1536,7 +1536,7 @@
     <branch />
     <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="gconf"/>
     </dependencies>
   </autotools>
@@ -1589,7 +1589,7 @@
             module="liferea/trunk/liferea"
             checkoutdir="liferea"/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="intltool"/>
       <dep package="glib"/>
       <dep package="pango"/>
@@ -1610,7 +1610,7 @@
   <autotools id="krb5-auth-dialog">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="dbus-glib"/>
       <dep package="glib"/>
       <dep package="gconf"/>
@@ -1625,7 +1625,7 @@
   <autotools id="contacts">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="evolution-data-server"/>
       <dep package="gconf"/>
     </dependencies>
@@ -1634,7 +1634,7 @@
   <autotools id="dates">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="evolution-data-server"/>
       <dep package="gconf"/>
     </dependencies>
@@ -1643,7 +1643,7 @@
   <autotools id="tasks">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="evolution-data-server"/>
     </dependencies>
     <suggests>
@@ -1665,7 +1665,7 @@
              autogenargs="--disable-libetpan">
     <branch repo="cvs.claws-mail" revision="gtk2" module="claws" checkoutdir="claws-mail"/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="glib"/>
       <dep package="enchant"/>
     </dependencies>
@@ -1679,7 +1679,7 @@
   <autotools id="midori">
     <branch repo="git.xfce.org" branch="kalikiana/midori"/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="WebKit"/>
       <dep package="libsoup"/>
       <dep package="libxml2"/>
@@ -1743,7 +1743,7 @@
     <branch repo="git.dronelabs.com" />
     <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
     </dependencies>
   </autotools>
 
@@ -1760,7 +1760,7 @@
     <branch />
     <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="gconf"/>
       <dep package="libchamplain"/>
       <dep package="ethos"/>
@@ -1772,7 +1772,7 @@
     <branch/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="libxml2"/>
       <dep package="pango"/>
       <dep package="cairo"/>
@@ -1828,7 +1828,7 @@
     <branch/>
     <dependencies>
       <dep package="glib"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
     </dependencies>
   </autotools>
 
@@ -1839,7 +1839,7 @@
     </dependencies>
     <suggests>
       <dep package="gobject-introspection"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="gconf"/>
       <dep package="vala"/>
       <dep package="libsoup"/>
@@ -1902,7 +1902,7 @@
     <dependencies>
       <dep package="intltool"/>
       <dep package="libgnomeprint"/>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="gnome-icon-theme"/>
     </dependencies>
   </autotools>
@@ -1991,7 +1991,7 @@
   <autotools id="genius">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="glib"/>
     </dependencies>
     <suggests>
@@ -2068,7 +2068,7 @@
   <autotools id="libglade">
     <branch/>
     <dependencies>
-      <dep package="gtk+"/>
+      <dep package="gtk+-2"/>
       <dep package="libxml2"/>
     </dependencies>
   </autotools>
@@ -2078,7 +2078,7 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="dbus-glib"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="gconf"/>
       <dep package="gnome-keyring"/>
       <dep package="NetworkManager"/>
@@ -2092,7 +2092,7 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="dbus-glib"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="gconf"/>
       <dep package="gnome-keyring"/>
       <dep package="NetworkManager"/>
@@ -2106,7 +2106,7 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="dbus-glib"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="gconf"/>
       <dep package="gnome-keyring"/>
       <dep package="NetworkManager"/>
@@ -2120,7 +2120,7 @@
     <dependencies>
       <dep package="glib"/>
       <dep package="dbus-glib"/>
-      <dep package="gtk+-3"/>
+      <dep package="gtk+"/>
       <dep package="gconf"/>
       <dep package="gnome-keyring"/>
       <dep package="NetworkManager"/>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]