[jhbuild] 3.8: Fix up various references to 3.6

[Matthias Clasen <matthiasc src gnome org>]

commit c583640a55ebfbaa3b8343654b115d07d58e1813
Author: Matthias Clasen <mclasen redhat com>
Date:   Thu Sep 27 08:37:58 2012 -0400

    3.8: Fix up various references to 3.6
    
    Both git branches and cross-module references were still pointing
    at 3.6 versions.

 modulesets/gnome-apps-3.8.modules                  |    4 ----
 modulesets/gnome-suites-core-3.8.modules           |    4 ----
 modulesets/gnome-suites-core-deps-3.8.modules      |    2 +-
 modulesets/gnome-suites-core-deps-base-3.8.modules |    2 +-
 modulesets/gnome-world-3.8.modules                 |    2 +-
 5 files changed, 3 insertions(+), 11 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.8.modules b/modulesets/gnome-apps-3.8.modules
index c1308a2..62594e2 100644
--- a/modulesets/gnome-apps-3.8.modules
+++ b/modulesets/gnome-apps-3.8.modules
@@ -222,7 +222,6 @@
   </autotools>
 
   <autotools id="gtkhtml">
-    <branch revision="gnome-3-6"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
@@ -919,7 +918,6 @@
   </autotools>
 
   <autotools id="evolution" autogenargs="--disable-pst-import">
-    <branch revision="gnome-3-6"/>
     <dependencies>
       <dep package="evolution-data-server"/>
       <dep package="gnome-desktop"/>
@@ -1110,7 +1108,6 @@
   </cmake>
 
   <autotools id="nautilus-sendto">
-    <branch revision="gnome-3-6"/>
     <branch/>
     <dependencies>
       <dep package="glib"/>
@@ -1141,7 +1138,6 @@
   </autotools>
 
   <autotools id="orca">
-    <branch revision="gnome-3-6"/>
     <dependencies>
       <dep package="gtk+"/>
       <dep package="at-spi2-atk"/> <!-- to make Orca's gui accessible -->
diff --git a/modulesets/gnome-suites-core-3.8.modules b/modulesets/gnome-suites-core-3.8.modules
index f201096..0bc122c 100644
--- a/modulesets/gnome-suites-core-3.8.modules
+++ b/modulesets/gnome-suites-core-3.8.modules
@@ -66,7 +66,6 @@
   <autotools id="evolution-data-server"
              supports-non-srcdir-builds="no"
              autogenargs="--enable-vala-bindings">
-    <branch revision="gnome-3-6"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="libsoup"/>
@@ -107,7 +106,6 @@
   </autotools>
 
   <autotools id="gnome-online-accounts">
-    <branch revision="gnome-3-6"/>
     <dependencies>
       <dep package="gtk+"/>
       <dep package="WebKit"/>
@@ -736,7 +734,6 @@
   </autotools>
 
   <autotools id="gnome-terminal" autogenargs="--with-gtk=3.0">
-    <branch revision="gnome-3-6"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="glib"/>
@@ -801,7 +798,6 @@
   </autotools>
 
   <autotools id="totem">
-    <branch revision="gnome-3-6"/>
     <dependencies>
       <dep package="intltool"/>
       <dep package="gtk+"/>
diff --git a/modulesets/gnome-suites-core-deps-3.8.modules b/modulesets/gnome-suites-core-deps-3.8.modules
index b6c5908..08d8955 100644
--- a/modulesets/gnome-suites-core-deps-3.8.modules
+++ b/modulesets/gnome-suites-core-deps-3.8.modules
@@ -58,7 +58,7 @@
 <repository type="tarball" name="ibus"
     href="http://ibus.googlecode.com/files/"/>
 
-<include href="gnome-suites-core-deps-base-3.6.modules"/>
+<include href="gnome-suites-core-deps-base-3.8.modules"/>
 
 <!-- Please try to keep organized alphabetically by section -->
 
diff --git a/modulesets/gnome-suites-core-deps-base-3.8.modules b/modulesets/gnome-suites-core-deps-base-3.8.modules
index be18e3f..ddd2c76 100644
--- a/modulesets/gnome-suites-core-deps-base-3.8.modules
+++ b/modulesets/gnome-suites-core-deps-base-3.8.modules
@@ -46,7 +46,7 @@
 <repository type="tarball" name="complang.org"
     href="http://www.complang.org/"/>
 
-  <include href="gnome-sysdeps-3.6.modules"/>
+  <include href="gnome-sysdeps-3.8.modules"/>
 
 <!-- Please try to keep organized alphabetically -->
 
diff --git a/modulesets/gnome-world-3.8.modules b/modulesets/gnome-world-3.8.modules
index b510975..9fa427a 100644
--- a/modulesets/gnome-world-3.8.modules
+++ b/modulesets/gnome-world-3.8.modules
@@ -108,7 +108,7 @@
   <repository type="git" name="yorba.org"
       href="git://yorba.org/"/>
 
-  <include href="gnome-apps-3.6.modules"/>
+  <include href="gnome-apps-3.8.modules"/>
 
   <autotools id="alacarte">
     <branch/>