[jhbuild] Move gnome-builder and uncrustify to gnome-apps

[Michael Catanzaro <mcatanzaro src gnome org>]

commit 75f29fd3f1ccdae969ebc6b463d846c33c937186
Author: Michael Catanzaro <mcatanzaro gnome org>
Date:   Fri Jun 19 20:59:26 2015 -0500

    Move gnome-builder and uncrustify to gnome-apps

 modulesets/gnome-apps-3.18.modules |   31 +++++++++++++++++++++++++++++++
 modulesets/gnome-world.modules     |   29 -----------------------------
 2 files changed, 31 insertions(+), 29 deletions(-)
---
diff --git a/modulesets/gnome-apps-3.18.modules b/modulesets/gnome-apps-3.18.modules
index 1c135b4..0ca6f7c 100644
--- a/modulesets/gnome-apps-3.18.modules
+++ b/modulesets/gnome-apps-3.18.modules
@@ -33,6 +33,8 @@
       href="http://devel.freebsoft.org/pub/projects/speechd/"/>
   <repository type="tarball" name="tarball.github.com"
     href="https://github.com/"/>
+  <repository type="tarball" name="downloads.sourceforge.net"
+      href="http://downloads.sourceforge.net/"/>
 
   <include href="gnome-suites-core-3.18.modules"/>
 
@@ -401,6 +403,17 @@
     </dependencies>
   </autotools>
 
+  <autotools id="uncrustify">
+    <branch repo="downloads.sourceforge.net"
+            module="project/uncrustify/uncrustify/uncrustify-0.61/uncrustify-0.61.tar.gz"
+            version="0.61"
+            hash="sha256:1df0e5a2716e256f0a4993db12f23d10195b3030326fdf2e07f8e6421e172df9"
+            size="1143946"/>
+    <dependencies>
+      <dep package="c++"/>
+    </dependencies>
+  </autotools>
+
   <!-- Apps start here -->
 
   <autotools id="accerciser">
@@ -707,6 +720,24 @@
     </dependencies>
   </autotools>
 
+  <autotools id="gnome-builder">
+    <branch/>
+    <dependencies>
+      <dep package="devhelp"/>
+      <dep package="gjs"/>
+      <dep package="glib"/>
+      <dep package="gnome-code-assistance"/>
+      <dep package="gtk+"/>
+      <dep package="gtksourceview"/>
+      <dep package="libgit2-glib"/>
+      <dep package="libpeas"/>
+      <dep package="librsvg"/>
+      <dep package="pygobject"/>
+      <dep package="uncrustify"/>
+      <dep package="vte"/>
+    </dependencies>
+  </autotools>
+
   <autotools id="gnome-clocks">
     <branch/>
     <dependencies>
diff --git a/modulesets/gnome-world.modules b/modulesets/gnome-world.modules
index 9569bc7..ef773e2 100644
--- a/modulesets/gnome-world.modules
+++ b/modulesets/gnome-world.modules
@@ -219,35 +219,6 @@
     </dependencies>
   </autotools>
 
-  <autotools id="uncrustify">
-    <branch repo="downloads.sourceforge.net"
-            module="project/uncrustify/uncrustify/uncrustify-0.61/uncrustify-0.61.tar.gz"
-            version="0.61"
-            hash="sha256:1df0e5a2716e256f0a4993db12f23d10195b3030326fdf2e07f8e6421e172df9"
-            size="1143946"/>
-    <dependencies>
-      <dep package="c++"/>
-    </dependencies>
-  </autotools>
-
-  <autotools id="gnome-builder">
-    <branch/>
-    <dependencies>
-      <dep package="devhelp"/>
-      <dep package="gjs"/>
-      <dep package="glib"/>
-      <dep package="gnome-code-assistance"/>
-      <dep package="gtk+"/>
-      <dep package="gtksourceview"/>
-      <dep package="libgit2-glib"/>
-      <dep package="libpeas"/>
-      <dep package="librsvg"/>
-      <dep package="pygobject"/>
-      <dep package="uncrustify"/>
-      <dep package="vte"/>
-    </dependencies>
-  </autotools>
-
   <autotools id="gnome-chat">
     <branch/>
     <dependencies>