From e53ebf63f1c1a639264f4a040215cfd33654b125 Mon Sep 17 00:00:00 2001
From: Josh Suereth <joshua.suereth@gmail.com>
Date: Thu, 5 Sep 2013 17:08:51 -0400
Subject: [PATCH 1/2] There is no scaladoc.

That is, scaladoc is still in the scala-compiler artifact, so let dbuild know
and it won't freak out.
---
 dbuild-meta.json | 43 ++++++++++---------------------------------
 1 file changed, 10 insertions(+), 33 deletions(-)

diff --git a/dbuild-meta.json b/dbuild-meta.json
index faf75a46b5b1..f8f93e6e1a15 100644
--- a/dbuild-meta.json
+++ b/dbuild-meta.json
@@ -46,6 +46,16 @@
                     "name": "scala-reflect",
                     "organization": "org.scala-lang"
                 }
+                {
+                    "extension": "jar",
+                    "name": "scala-xml",
+                    "organization": "org.scala-lang.modules"
+                },
+                {
+                    "extension": "jar",
+                    "name": "scala-parser-combinators",
+                    "organization": "org.scala-lang.modules"
+                }
             ],
             "name": "scala-compiler",
             "organization": "org.scala-lang"
@@ -86,39 +96,6 @@
             "name": "scala-actors",
             "organization": "org.scala-lang"
         },
-        {
-            "artifacts": [
-                {
-                    "extension": "jar",
-                    "name": "scaladoc",
-                    "organization": "org.scala-lang"
-                }
-            ],
-            "dependencies": [
-                {
-                    "extension": "jar",
-                    "name": "scala-compiler",
-                    "organization": "org.scala-lang"
-                },
-                {
-                    "extension": "jar",
-                    "name": "scala-partest",
-                    "organization": "org.scala-lang"
-                },
-                {
-                    "extension": "jar",
-                    "name": "scala-xml",
-                    "organization": "org.scala-lang"
-                },
-                {
-                    "extension": "jar",
-                    "name": "scala-parser-combinators",
-                    "organization": "org.scala-lang"
-                }
-            ],
-            "name": "scaladoc",
-            "organization": "org.scala-lang"
-        },
         {
             "artifacts": [
                 {

From 6a3b46a709aa4707ec23217e6747c92e2fb0a938 Mon Sep 17 00:00:00 2001
From: Josh Suereth <joshua.suereth@gmail.com>
Date: Fri, 6 Sep 2013 11:21:45 -0400
Subject: [PATCH 2/2] Fix syntax issue

---
 dbuild-meta.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/dbuild-meta.json b/dbuild-meta.json
index f8f93e6e1a15..1673029e216d 100644
--- a/dbuild-meta.json
+++ b/dbuild-meta.json
@@ -13,6 +13,7 @@
             "dependencies": [],
             "name": "scala-library",
             "organization": "org.scala-lang"
+
         },
         {
             "artifacts": [
@@ -45,7 +46,7 @@
                     "extension": "jar",
                     "name": "scala-reflect",
                     "organization": "org.scala-lang"
-                }
+                },
                 {
                     "extension": "jar",
                     "name": "scala-xml",