[releng] Add support for duplicated module entries

[Frederic Peters <fpeters src gnome org>]

commit efae8da5f371ee49d60db42c8089d7f8104b8345
Author: Frédéric Péters <fpeters 0d be>
Date:   Tue Jun 22 15:10:32 2010 +0200

    Add support for duplicated module entries
    
    This is necessary to have both GTK+ 2 and 3 versions as the whole stack won't
    be ported in a single release.

 tools/smoketesting/convert-to-tarballs.py    |    4 ++--
 tools/smoketesting/tarball-conversion.config |   16 +++++++++++-----
 2 files changed, 13 insertions(+), 7 deletions(-)
---
diff --git a/tools/smoketesting/convert-to-tarballs.py b/tools/smoketesting/convert-to-tarballs.py
index 9229cb1..f6da3c6 100755
--- a/tools/smoketesting/convert-to-tarballs.py
+++ b/tools/smoketesting/convert-to-tarballs.py
@@ -709,9 +709,9 @@ class ConvertToTarballs:
                 revision = attrs.get('revision').nodeValue
         try:
             name = self.options.translate_name(id)
-            baselocation = self.options.get_download_site(cvsroot, name)
-            max_version = self.options.get_version_limit(name)
             real_name = self.options.get_real_name(name)
+            baselocation = self.options.get_download_site(cvsroot, real_name)
+            max_version = self.options.get_version_limit(name)
             location, version, hash, size = \
                       self.locator.find_tarball(baselocation, real_name, max_version)
             print '  ', location, version, hash, size
diff --git a/tools/smoketesting/tarball-conversion.config b/tools/smoketesting/tarball-conversion.config
index 8279de7..6cfeb42 100644
--- a/tools/smoketesting/tarball-conversion.config
+++ b/tools/smoketesting/tarball-conversion.config
@@ -163,6 +163,7 @@
     <package name="gnome-vfs-monikers"      set="platform"/>
     <!-- In MOBILE too, keep the limits synchronized -->
     <package name="gtk+"                    set="platform" limit="2.23"/>
+    <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"/>
@@ -207,7 +208,8 @@
     <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"/>
+    <package name="gnome-desktop"           set="desktop" limit="2.31"/>
+    <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"/>
@@ -243,9 +245,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"/>
+    <package name="gtk-engines"             set="desktop" limit="2.21"/>
+    <package name="gtk-engines-3"           set="desktop" module="gtk-engines"/>
     <package name="gtkhtml"                 set="desktop"/>
-    <package name="gtksourceview"           set="desktop"/>
+    <package name="gtksourceview"           set="desktop" limit="2.11"/>
+    <package name="gtksourceview-3"         set="desktop" module="gtksourceview"/>
     <package name="gucharmap"               set="desktop"/>
     <package name="gvfs"                    set="desktop"/>
     <package name="hamster-applet"          set="desktop"/>
@@ -257,7 +261,8 @@
     <package name="libgtop"                 set="desktop"/>
     <package name="libgweather"             set="desktop"/>
     <package name="liboobs"                 set="desktop"/>
-    <package name="librsvg"                 set="desktop"/>
+    <package name="librsvg"                 set="desktop" limit="2.27"/>
+    <package name="librsvg-3"               set="desktop" module="librsvg"/>
     <package name="libsoup"                 set="desktop"/>
     <package name="libwnck"                 set="desktop"/>
     <package name="metacity"                set="desktop"/>
@@ -277,7 +282,8 @@
     <package name="totem-pl-parser"         set="desktop"/>
     <package name="vinagre"                 set="desktop"/>
     <package name="vino"                    set="desktop"/>
-    <package name="vte"                     set="desktop"/>
+    <package name="vte"                     set="desktop" limit="0.25"/>
+    <package name="vte-3"                   set="desktop" module="vte"/>
     <package name="yelp"                    set="desktop"/>
     <package name="yelp-xsl"                set="desktop"/>
     <package name="zenity"                  set="desktop"/>