GNOME.org
 

[releng] [release] Update for 2.31.6

commit 07f720d655e46106443ecba6ec9f782b611db1fb
Author: Vincent Untz <vuntz gnome org>
Date:   Wed Aug 4 19:28:55 2010 +0200

    [release] Update for 2.31.6
    
    tarball-conversion.config got updated with various changes:
     - libfolks is renamed to folks
     - all the GTK+3-based libraries are commented out until we start
       development of 3.0
     - various modules now have a limit. Some limits are 2.31 because the
       2.31 versions of a module use GTK+ 3. This might need to be
       double-checked later on (hence the FIXME at the top).
     - librsvgmm is removed

 tools/smoketesting/sample-tarball.jhbuildrc  |    7 +-
 tools/smoketesting/tarball-conversion.config |   67 +++++++-------
 tools/versions                               |  121 ++++++++++++--------------
 3 files changed, 93 insertions(+), 102 deletions(-)
---
diff --git a/tools/smoketesting/sample-tarball.jhbuildrc b/tools/smoketesting/sample-tarball.jhbuildrc
index 2999324..daa56a1 100644
--- a/tools/smoketesting/sample-tarball.jhbuildrc
+++ b/tools/smoketesting/sample-tarball.jhbuildrc
@@ -6,7 +6,7 @@
 # what module set should be used.  The default at the moment is 'gnome28',
 # but it can be any of the files in the modulesets directory, or even
 # the URL of a module set file on a web server.
-moduleset = 'gnome-2.31.5'
+moduleset = 'gnome-2.31.6'
 
 # A list of the modules to build.  Defaults to the Gnome Desktop and
 # developer platform.
@@ -65,6 +65,7 @@ skip.append('mozilla')
 skip.append('nspr')
 skip.append('nss')
 skip.append('pulseaudio')
+skip.append('WebKit')
 
 # libxml2, libxslt, and gamin are totally inconsistent with the rest of Gnome
 # about python.  See
@@ -82,10 +83,6 @@ skip.append('pulseaudio')
 # test with anyway.  So I just skip it.
 skip.append('evolution-exchange')
 
-# gnome-disk-utility disable deprecated symbols, but needs them with current
-# glib/gtk+, skip it so the known failure is avoided.
-skip.append('gnome-disk-utility')
-
 # jhbuild no longer automatically looks in /usr/lib/pkgconfig, so we need to
 # tell it to do so
 addpath('PKG_CONFIG_PATH', '/usr/lib/pkgconfig')
diff --git a/tools/smoketesting/tarball-conversion.config b/tools/smoketesting/tarball-conversion.config
index f08446c..032417e 100644
--- a/tools/smoketesting/tarball-conversion.config
+++ b/tools/smoketesting/tarball-conversion.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" ?>
+<!-- FIXME 2.32: eog, epiphany, glade3, gnome-color-manager, gnome-packagekit, gnome-power-manager, nautilus, totem are all at 2.30 (or 3.6 for glade) because the 2.31/2.90 versions depend on GTK+ 3 -->
 <conversioninfo>
   <locations>  FIXME: get a better name
     <site cvs="gnome.org" 
@@ -112,7 +113,7 @@
     <package name="hicolor-icon-theme" note="istarball"/>
     <package name="libchamplain"/>
     <package name="libdaemon"/>
-    <package name="libfolks"/>
+    <package name="folks"/>
     <package name="libgcrypt" note="istarball"/>
     <package name="libgdata"/>
     <package name="libgpg-error" note="istarball"/>
@@ -157,14 +158,15 @@
     <package name="audiofile"               set="platform"/>
     <package name="esound"                  set="platform"/>
     <!-- In MOBILE too, keep the limits synchronized -->
+    <package name="gdk-pixbuf"              set="platform"/>
+    <!-- In MOBILE too, keep the limits synchronized -->
     <package name="glib"                    set="platform"/>
     <package name="gnome-mime-data"         set="platform"/>
     <package name="gnome-vfs"               set="platform"/>
     <package name="gnome-vfs-monikers"      set="platform"/>
     <!-- In MOBILE too, keep the limits synchronized -->
-    <package name="gdk-pixbuf"              set="platform"/>
     <package name="gtk+"                    set="platform" limit="2.23"/>
-    <package name="gtk+-3"                  set="platform" module="gtk+"/>
+    <!-- Uncomment for 3.0 <package name="gtk+-3"                  set="platform" module="gtk+"/> -->
     <!-- In MOBILE too, keep the limits synchronized -->
     <package name="gtk-doc"                 set="platform"/>
     <package name="libIDL"                  set="platform"/>
@@ -191,8 +193,8 @@
     <package name="deskbar-applet"          set="desktop"/>
     <package name="ekiga"                   set="desktop"/>
     <package name="empathy"                 set="desktop"/>
-    <package name="eog"                     set="desktop"/>
-    <package name="epiphany"                set="desktop"/>
+    <package name="eog"                     set="desktop" limit="2.31"/>
+    <package name="epiphany"                set="desktop" limit="2.31"/>
     <package name="evince"                  set="desktop"/>
     <package name="evolution"               set="desktop"/>
     <package name="evolution-data-server"   set="desktop"/>
@@ -203,14 +205,14 @@
     <package name="gcalctool"               set="desktop"/>
     <package name="gconf-editor"            set="desktop"/>
     <package name="gdm"                     set="desktop"/>
-    <package name="gedit"                   set="desktop"/>
+    <package name="gedit"                   set="desktop" limit="2.31"/> <!-- 2.31.x is moving to GTK+ 3 and is for 3.0 -->
     <package name="gnome-applets"           set="desktop"/>
-    <package name="gnome-bluetooth"         set="desktop"/>
+    <package name="gnome-bluetooth"         set="desktop" limit="2.90"/>
     <package name="gnome-backgrounds"       set="desktop"/>
-    <package name="gnome-color-manager"     set="desktop"/>
-    <package name="gnome-control-center"    set="desktop"/>
-    <package name="gnome-desktop"           set="desktop" limit="2.31"/>
-    <package name="gnome-desktop-3"         set="desktop" module="gnome-desktop"/>
+    <package name="gnome-color-manager"     set="desktop" limit="2.31"/>
+    <package name="gnome-control-center"    set="desktop" limit="2.90"/>
+    <package name="gnome-desktop"           set="desktop" limit="2.90"/>
+    <!-- Uncomment for 3.0 <package name="gnome-desktop-3"         set="desktop" module="gnome-desktop"/> -->
     <package name="gnome-disk-utility"      set="desktop"/>
     <package name="gnome-doc-utils"         set="desktop"/>
     <package name="gnome-games"             set="desktop"/>
@@ -218,25 +220,25 @@
     <package name="gnome-icon-theme-symbolic" set="desktop"/>
     <package name="gnome-keyring"           set="desktop"/>
     <package name="gnome-mag"               set="desktop"/>
-    <package name="gnome-media"             set="desktop"/>
+    <package name="gnome-media"             set="desktop" limit="2.90"/>
     <package name="gnome-menus"             set="desktop"/>
     <package name="gnome-netstatus"         set="desktop"/>
     <package name="gnome-nettool"           set="desktop"/>
-    <package name="gnome-packagekit"        set="desktop"/>
+    <package name="gnome-packagekit"        set="desktop" limit="2.31"/>
     <package name="gnome-panel"             set="desktop"/>
-    <package name="gnome-power-manager"     set="desktop"/>
+    <package name="gnome-power-manager"     set="desktop" limit="2.31"/>
     <package name="gnome-python-desktop"    set="desktop"/>
     <package name="gnome-screensaver"       set="desktop"/>
     <package name="gnome-session"           set="desktop"/>
-    <package name="gnome-settings-daemon"   set="desktop"/>
+    <package name="gnome-settings-daemon"   set="desktop" limit="2.90"/>
     <package name="gnome-sharp"             set="desktop"/>
     <package name="gnome-desktop-sharp"     set="desktop"/>
-    <package name="gnome-speech"            set="desktop" limit="0.5" />
+    <package name="gnome-speech"            set="desktop"/>
     <package name="gnome-shell"             set="desktop"/>
     <package name="gnome-system-monitor"    set="desktop"/>
     <package name="gnome-system-tools"      set="desktop"/>
     <package name="gnome-terminal"          set="desktop"/>
-    <package name="gnome-themes"            set="desktop"/>
+    <package name="gnome-themes"            set="desktop" limit="2.90"/>
     <package name="gnome-user-share"        set="desktop"/>
     <package name="gnome-utils"             set="desktop"/>
     <package name="gnome-user-docs"         set="desktop"/>
@@ -246,11 +248,11 @@
     <!-- In MOBILE too, keep the limits synchronized -->
     <package name="gst-plugins-base"        set="desktop"/>
     <package name="gst-plugins-good"        set="desktop"/>
-    <package name="gtk-engines"             set="desktop" limit="2.21"/>
-    <package name="gtk-engines-3"           set="desktop" module="gtk-engines"/>
+    <package name="gtk-engines"             set="desktop" limit="2.90"/>
+    <!-- Uncomment for 3.0 <package name="gtk-engines-3"           set="desktop" module="gtk-engines"/> -->
     <package name="gtkhtml"                 set="desktop"/>
-    <package name="gtksourceview"           set="desktop" limit="2.11"/>
-    <package name="gtksourceview-3"         set="desktop" module="gtksourceview"/>
+    <package name="gtksourceview"           set="desktop" limit="2.11"/> <!-- 2.11.x/2.90.x is moving to GTK+ 3 and is for 3.0 -->
+    <!-- Uncomment for 3.0 <package name="gtksourceview-3"         set="desktop" module="gtksourceview"/> -->
     <package name="gucharmap"               set="desktop"/>
     <package name="gvfs"                    set="desktop"/>
     <package name="hamster-applet"          set="desktop"/>
@@ -260,8 +262,8 @@
     <package name="libgnomeprint"           set="desktop"/>
     <package name="libgnomeprintui"         set="desktop"/>
     <package name="libgtop"                 set="desktop"/>
-    <package name="libgweather"             set="desktop" limit="2.31"/>
-    <package name="libgweather-3"           set="desktop" module="libgweather"/>
+    <package name="libgweather"             set="desktop" limit="2.90"/>
+    <!-- Uncomment for 3.0 <package name="libgweather-3"           set="desktop" module="libgweather"/> -->
     <package name="liboobs"                 set="desktop"/>
     <package name="librsvg"                 set="desktop"/>
     <package name="libsoup"                 set="desktop"/>
@@ -269,8 +271,8 @@
     <package name="metacity"                set="desktop"/>
     <package name="mousetweaks"             set="desktop"/>
     <package name="mutter"                  set="desktop"/>
-    <package name="nautilus"                set="desktop"/>
-    <package name="nautilus-sendto"         set="desktop"/>
+    <package name="nautilus"                set="desktop" limit="2.31"/>
+    <package name="nautilus-sendto"         set="desktop" limit="2.90"/>
     <package name="orca"                    set="desktop"/>
     <package name="pygtksourceview"         set="desktop"/>
     <package name="rygel"                   set="desktop"/>
@@ -279,13 +281,13 @@
     <package name="sound-juicer"            set="desktop"/>
     <package name="swfdec-gnome"            set="desktop"/>
     <package name="tomboy"                  set="desktop"/>
-    <package name="totem"                   set="desktop"/>
+    <package name="totem"                   set="desktop" limit="2.90"/>
     <package name="totem-pl-parser"         set="desktop"/>
-    <package name="vinagre"                 set="desktop"/>
+    <package name="vinagre"                 set="desktop" limit="2.31"/> <!-- 2.31.x is moving to GTK+ 3 and is for 3.0 -->
     <package name="vino"                    set="desktop"/>
     <package name="vte"                     set="desktop" limit="0.25"/>
-    <package name="vte-3"                   set="desktop" module="vte"/>
-    <package name="yelp"                    set="desktop"/>
+    <!-- Uncomment for 3.0 <package name="vte-3"                   set="desktop" module="vte"/> -->
+    <package name="yelp"                    set="desktop" limit="2.31"/> <!-- 2.31.x is moving to GTK+ 3 and is for 3.0 -->
     <package name="yelp-xsl"                set="desktop"/>
     <package name="zenity"                  set="desktop"/>
     ## ADMIN
@@ -293,8 +295,8 @@
     <package name="sabayon"                 set="admin"/>
     ## DEVTOOLS
     <package name="anjuta"                  set="devtools"/>
-    <package name="devhelp"                 set="devtools"/>
-    <package name="gdl"                     set="devtools"/>
+    <package name="devhelp"                 set="devtools" limit="2.90"/>
+    <package name="gdl"                     set="devtools" limit="2.31"/> <!-- 2.31.x/2.90.x is moving to GTK+ 3 and is for 3.0 -->
     <package name="glade3"                  set="devtools" limit="3.7"/>
     <package name="accerciser"              set="devtools"/>
     <package name="gnome-devel-docs"        set="devtools"/>
@@ -302,7 +304,6 @@
     # C++
     <package name="glibmm"             subdir="c++"    set="bindings"/>
     <package name="atkmm"              subdir="c++"    set="bindings"/>
-    <package name="librsvgmm"          subdir="c++"    set="bindings"/>
     <package name="pangomm"            subdir="c++"    set="bindings"/>
     <package name="gtkmm"              subdir="c++"    set="bindings" limit="2.23"/>
     <package name="libglademm"         subdir="c++"    set="bindings"/>
@@ -344,10 +345,10 @@
     <package name="GConf-dbus"                 set="mobile"/>
     <package name="atk"                        set="mobile"/>
     <package name="evolution-data-server"      set="mobile"/>
+    <package name="gdk-pixbuf"                 set="mobile"/>
     <package name="glib"                       set="mobile"/>
     <package name="gstreamer"                  set="mobile"/>
     <package name="gst-plugins-base"           set="mobile"/>
-    <package name="gdk-pixbuf"                 set="mobile"/>
     <package name="gtk+"                       set="mobile" limit="2.23"/>
     <package name="gtk-doc"                    set="mobile"/>
     <package name="pango"                      set="mobile"/>
diff --git a/tools/versions b/tools/versions
index e4ba7fb..ba710d8 100644
--- a/tools/versions
+++ b/tools/versions
@@ -1,17 +1,16 @@
 ## PLATFORM
-platform:GConf:2.31.6:
+platform:GConf:2.31.7:
 platform:ORBit2:2.14.18:
 platform:at-spi:1.31.1:
 platform:atk:1.30.0:
 platform:audiofile:0.2.7:
 platform:esound:0.2.41:
 platform:gdk-pixbuf:2.21.6:
-platform:glib:2.25.11:
+platform:glib:2.25.12:
 platform:gnome-mime-data:2.18.0:
 platform:gnome-vfs:2.24.3:
 platform:gnome-vfs-monikers:2.15.3:
 platform:gtk+:2.21.5:
-platform:gtk+:2.90.5:
 platform:gtk-doc:1.15:
 platform:libIDL:0.8.14:
 platform:libart_lgpl:2.3.21:
@@ -25,78 +24,75 @@ platform:pango:1.28.1:
 
 ## DESKTOP
 desktop:alacarte:0.13.1:
-desktop:at-spi2-atk:0.3.5:
+desktop:at-spi2-atk:0.3.6:
 desktop:at-spi2-core:0.3.4:
 desktop:brasero:2.31.5:
 desktop:bug-buddy:2.31.3:
 desktop:caribou:0.1.5:
-desktop:cheese:2.30.1:
+desktop:cheese:2.31.1:
 desktop:dasher:4.11:
-desktop:dconf:0.4.2:
+desktop:dconf:0.5:
 desktop:deskbar-applet:2.30.1:
 desktop:ekiga:3.2.7:
-desktop:empathy:2.31.5.1:
-desktop:eog:2.31.4:
-desktop:epiphany:2.31.5:
-desktop:evince:2.31.5:
-desktop:evolution:2.31.5:
-desktop:evolution-data-server:2.31.5:
-desktop:evolution-exchange:2.31.5:
-desktop:evolution-mapi:0.31.5:
+desktop:empathy:2.31.6:
+desktop:eog:2.30.2:
+desktop:epiphany:2.30.2:
+desktop:evince:2.31.6.1:
+desktop:evolution:2.31.6:
+desktop:evolution-data-server:2.31.6:
+desktop:evolution-exchange:2.31.6:
+desktop:evolution-mapi:0.31.6:
 desktop:evolution-webcal:2.31.2:
-desktop:file-roller:2.31.4:
-desktop:gcalctool:5.31.5:
+desktop:file-roller:2.31.5:
+desktop:gcalctool:5.31.6:
 desktop:gconf-editor:2.31.5:
 desktop:gdm:2.31.2:
-desktop:gedit:2.31.5:
-desktop:gnome-applets:2.31.5:
+desktop:gedit:2.30.3:
+desktop:gnome-applets:2.31.6:
 desktop:gnome-backgrounds:2.30.0:
-desktop:gnome-bluetooth:2.90.0:
-desktop:gnome-color-manager:2.31.4:
-desktop:gnome-control-center:2.31.5:
-desktop:gnome-desktop:2.30.2:
-desktop:gnome-desktop:2.90.4:
+desktop:gnome-bluetooth:2.31.6:
+desktop:gnome-color-manager:2.30.2:
+desktop:gnome-control-center:2.31.6:
+desktop:gnome-desktop:2.31.6:
 desktop:gnome-desktop-sharp:2.26.0:
 desktop:gnome-disk-utility:2.30.1:
 desktop:gnome-doc-utils:0.20.1:
-desktop:gnome-games:2.31.5:
+desktop:gnome-games:2.31.6:
 desktop:gnome-icon-theme:2.30.3:
 desktop:gnome-icon-theme-symbolic:2.30.0:
 desktop:gnome-keyring:2.31.4:
 desktop:gnome-mag:0.16.1:
-desktop:gnome-media:2.31.5:
+desktop:gnome-media:2.31.6:
 desktop:gnome-menus:2.30.2:
 desktop:gnome-netstatus:2.28.1:
 desktop:gnome-nettool:2.31.5:
-desktop:gnome-packagekit:2.31.4:
-desktop:gnome-panel:2.31.4:
-desktop:gnome-power-manager:2.31.4:
+desktop:gnome-packagekit:2.30.3:
+desktop:gnome-panel:2.31.6:
+desktop:gnome-power-manager:2.30.1:
 desktop:gnome-python-desktop:2.31.1:
 desktop:gnome-screensaver:2.30.0:
-desktop:gnome-session:2.31.2:
-desktop:gnome-settings-daemon:2.31.5.1:
+desktop:gnome-session:2.31.6:
+desktop:gnome-settings-daemon:2.31.6:
 desktop:gnome-sharp:2.24.1:
 desktop:gnome-shell:2.31.5:
 desktop:gnome-speech:0.4.25:
 desktop:gnome-system-monitor:2.28.1:
 desktop:gnome-system-tools:2.31.1:
 desktop:gnome-terminal:2.31.3:
-desktop:gnome-themes:2.31.4:
+desktop:gnome-themes:2.31.6:
 desktop:gnome-user-docs:2.30.1:
 desktop:gnome-user-share:2.30.0:
 desktop:gnome-utils:2.30.0:
-desktop:gobject-introspection:0.9.2:
-desktop:gst-plugins-base:0.10.29:
-desktop:gst-plugins-good:0.10.23:
-desktop:gstreamer:0.10.29:
+desktop:gobject-introspection:0.9.3:
+desktop:gst-plugins-base:0.10.30:
+desktop:gst-plugins-good:0.10.24:
+desktop:gstreamer:0.10.30:
 desktop:gtk-engines:2.20.1:
-desktop:gtk-engines:2.90.3.1:
-desktop:gtkhtml:3.31.5:
+desktop:gtkhtml:3.31.6:
 desktop:gtksourceview:2.10.4:
-desktop:gtksourceview:2.90.4:
 desktop:gucharmap:2.30.2:
 desktop:gvfs:1.6.3:
-desktop:hamster-applet:2.31.5:
+desktop:hamster-applet:2.31.6:
 desktop:libgail-gnome:1.20.3:
 desktop:libgnome-keyring:2.30.1:
 desktop:libgnomekbd:2.31.5:
@@ -105,30 +101,28 @@ desktop:libgnomeprintui:2.18.5:
 desktop:libgtop:2.28.1:
 desktop:libgweather:2.30.2:
 desktop:liboobs:2.31.1:
-desktop:librsvg:2.26.3:
 desktop:librsvg:2.31.0:
-desktop:libsoup:2.31.2:
-desktop:libwnck:2.30.2:
+desktop:libsoup:2.31.6:
+desktop:libwnck:2.30.3:
 desktop:metacity:2.30.1:
-desktop:mousetweaks:2.31.5:
+desktop:mousetweaks:2.31.6:
 desktop:mutter:2.31.5:
-desktop:nautilus:2.31.5:
-desktop:nautilus-sendto:2.90.0:
-desktop:orca:2.31.5:
+desktop:nautilus:2.30.1:
+desktop:nautilus-sendto:2.31.6:
+desktop:orca:2.31.6:
 desktop:pygtksourceview:2.10.1:
-desktop:rygel:0.7.2:
+desktop:rygel:0.7.3:
 desktop:seahorse:2.30.1:
 desktop:seahorse-plugins:2.30.1:
-desktop:sound-juicer:2.31.5:
+desktop:sound-juicer:2.31.6:
 desktop:swfdec-gnome:2.30.0:
 desktop:tomboy:1.3.1:
-desktop:totem:2.90.5:
-desktop:totem-pl-parser:2.30.1:
-desktop:vinagre:2.31.4:
+desktop:totem:2.30.2:
+desktop:totem-pl-parser:2.30.2:
+desktop:vinagre:2.30.2:
 desktop:vino:2.31.4:
-desktop:vte:0.24.2:
-desktop:vte:0.25.1:
-desktop:yelp:2.31.7:
+desktop:vte:0.24.3:
+desktop:yelp:2.30.1:
 desktop:yelp-xsl:2.31.5:
 desktop:zenity:2.31.5:
 
@@ -138,9 +132,9 @@ admin:sabayon:2.30.0:
 
 ## DEVTOOLS
 devtools:accerciser:1.11.1:
-devtools:anjuta:2.31.5.0:
-devtools:devhelp:2.90.5:
-devtools:gdl:2.90.0:
+devtools:anjuta:2.31.6.0:
+devtools:devhelp:2.31.6:
+devtools:gdl:2.30.0:
 devtools:glade3:3.6.7:
 devtools:gnome-devel-docs:2.30.1:
 
@@ -149,14 +143,13 @@ devtools:gnome-devel-docs:2.30.1:
 # C++
 bindings:atkmm:2.21.2:c++
 bindings:gconfmm:2.28.2:c++
-bindings:glibmm:2.25.2:c++
+bindings:glibmm:2.25.3:c++
 bindings:gnome-vfsmm:2.26.0:c++
 bindings:gtkmm:2.21.5:c++
 bindings:libglademm:2.6.7:c++
 bindings:libgnomecanvasmm:2.26.0:c++
 bindings:libgnomemm:2.30.0:c++
 bindings:libgnomeuimm:2.28.0:c++
-bindings:librsvgmm:2.26.1:c++
 bindings:libsigc++:2.2.8:c++
 bindings:libxml++:2.30.1:c++
 bindings:mm-common:0.9.2:c++
@@ -188,7 +181,7 @@ bindings:Pango:1.221:perl
 
 # Python
 bindings:gnome-python:2.28.1:python
-bindings:pyatspi:0.3.4:python
+bindings:pyatspi:0.3.6:python
 bindings:pygobject:2.21.5:python
 bindings:pygtk:2.17.0:python
 bindings:pyorbit:2.24.0:python
@@ -196,11 +189,11 @@ bindings:pyorbit:2.24.0:python
 ## MOBILE
 mobile:GConf-dbus:2.16.0:
 mobile:atk:1.30.0:
-mobile:evolution-data-server:2.31.5:
+mobile:evolution-data-server:2.31.6:
 mobile:gdk-pixbuf:2.21.6:
-mobile:glib:2.25.11:
-mobile:gst-plugins-base:0.10.29:
-mobile:gstreamer:0.10.29:
+mobile:glib:2.25.12:
+mobile:gst-plugins-base:0.10.30:
+mobile:gstreamer:0.10.30:
 mobile:gtk+:2.21.5:
 mobile:gtk-doc:1.15:
 mobile:pango:1.28.1:
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]