[jhbuild] 3.10: Move gitg to meta-gnome-apps-tested

[Matthias Clasen <matthiasc src gnome org>]

commit b64a1a8b1da8f36cf3fe0416a2d881b844219424
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Aug 14 18:03:57 2013 -0400

    3.10: Move gitg to meta-gnome-apps-tested
    
    It is part of our 3.10 feature list, so it should be in the featured
    apps list. Move its dependencies along too: libgit2 and libgit2-glib.
    gtkspell-3 is turned into a sysdep instead (because I don't have hg
    here, locally...).

 modulesets/gnome-apps-3.10.modules    |   36 ++++++++++++++++++++++++
 modulesets/gnome-sysdeps-3.10.modules |    4 +++
 modulesets/gnome-world-3.10.modules   |   48 ---------------------------------
 3 files changed, 40 insertions(+), 48 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.10.modules b/modulesets/gnome-apps-3.10.modules
index b6be664..5990b7f 100644
--- a/modulesets/gnome-apps-3.10.modules
+++ b/modulesets/gnome-apps-3.10.modules
@@ -321,6 +321,19 @@
     </dependencies>
   </autotools>
 
+  <cmake id="libgit2"
+         cmakeargs="-DTHREADSAFE:BOOL=1">
+    <branch repo="github.com" module="libgit2/libgit2.git" checkoutdir="libgit2" revision="master"/>
+  </cmake>
+
+  <autotools id="libgit2-glib">
+    <branch/>
+    <dependencies>
+      <dep package="libgit2"/>
+      <dep package="glib"/>
+    </dependencies>
+  </autotools>
+
   <!-- Apps start here -->
 
   <autotools id="accerciser">
@@ -533,6 +546,28 @@
     </suggests>
   </autotools>
 
+  <autotools id="gitg">
+    <branch/>
+    <dependencies>
+      <dep package="gtk+"/>
+      <dep package="glib"/>
+      <dep package="gobject-introspection"/>
+      <dep package="gtksourceview"/>
+      <dep package="gsettings-desktop-schemas"/>
+      <dep package="json-glib"/>
+      <dep package="libgee"/>
+      <dep package="libgit2-glib"/>
+      <dep package="libpeas"/>
+      <dep package="vala"/>
+      <dep package="WebKit"/>
+      <dep package="gtkspell-3"/>
+    </dependencies>
+    <suggests>
+      <dep package="glade"/>
+      <dep package="pygobject"/>
+    </suggests>
+  </autotools>
+
   <autotools id="gnome-boxes" autogenargs="--enable-vala">
     <branch/>
     <dependencies>
@@ -973,6 +1008,7 @@
       <dep package="five-or-more"/>
       <dep package="four-in-a-row"/>
       <dep package="gedit"/>
+      <dep package="gitg"/>
       <dep package="glade"/>
       <dep package="gnome-boxes"/>
       <dep package="gnome-clocks"/>
diff --git a/modulesets/gnome-sysdeps-3.10.modules b/modulesets/gnome-sysdeps-3.10.modules
index ae3092c..eba41fc 100644
--- a/modulesets/gnome-sysdeps-3.10.modules
+++ b/modulesets/gnome-sysdeps-3.10.modules
@@ -767,4 +767,8 @@
     <pkg-config>xfont.pc</pkg-config>
   </systemmodule>
 
+  <systemmodule id="gtkspell-3">
+    <branch repo="system"/>
+    <pkg-config>gtkspell3-3.0.pc</pkg-config>
+  </systemmodule>
 </moduleset>
diff --git a/modulesets/gnome-world-3.10.modules b/modulesets/gnome-world-3.10.modules
index 6bb44cf..6f16c34 100644
--- a/modulesets/gnome-world-3.10.modules
+++ b/modulesets/gnome-world-3.10.modules
@@ -92,8 +92,6 @@
       href="git://gitorious.org/"/>
   <repository type="tarball" name="samba.org"
       href="http://samba.org/samba/ftp/"/>
-  <repository type="hg" name="hg.code.sf.net"
-    href="http://hg.code.sf.net/p/"/>
   <repository type="tarball" name="sourceforge.net"
       href="http://prdownloads.sourceforge.net/sourceforge/"/>
   <repository type="svn" name="xchat.sf.net"
@@ -431,41 +429,6 @@
     </suggests>
   </autotools>
 
-  <cmake id="libgit2"
-         cmakeargs="-DTHREADSAFE:BOOL=1">
-    <branch repo="github.com" module="libgit2/libgit2.git" checkoutdir="libgit2" revision="master"/>
-  </cmake>
-
-  <autotools id="libgit2-glib">
-    <branch/>
-    <dependencies>
-      <dep package="libgit2"/>
-      <dep package="glib"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gitg">
-    <branch/>
-    <dependencies>
-      <dep package="gtk+"/>
-      <dep package="glib"/>
-      <dep package="gobject-introspection"/>
-      <dep package="gtksourceview"/>
-      <dep package="gsettings-desktop-schemas"/>
-      <dep package="json-glib"/>
-      <dep package="libgee"/>
-      <dep package="libgit2-glib"/>
-      <dep package="libpeas"/>
-      <dep package="vala"/>
-      <dep package="WebKit"/>
-      <dep package="gtkspell-3"/>
-    </dependencies>
-    <suggests>
-      <dep package="glade"/>
-      <dep package="pygobject"/>
-    </suggests>
-  </autotools>
-
   <autotools id="memprof">
     <branch/>
   </autotools>
@@ -1568,17 +1531,6 @@
     </suggests>
   </tarball>
 
-  <autotools id="gtkspell-3">
-    <branch repo="hg.code.sf.net"
-            module="gtkspell/code"
-            checkoutdir="gtkspell"/>
-    <dependencies>
-      <dep package="gtk+"/>
-      <dep package="gtk-doc"/>
-      <dep package="pango"/>
-    </dependencies>
-  </autotools>
-
   <tarball id="gtkspell" version="2.0.16">
     <source href="http://sourceforge.net/projects/gtkspell/files/2.0.16/gtkspell-2.0.16.tar.gz";
             hash="sha256:8fc7dc560167b2cb7193e76aca625a152dc19b0ebf49816b78539cbb90d80d02"