From 044081691f5dbed9039c436a00ba1a0f87ffc3fc Mon Sep 17 00:00:00 2001
From: Jordi Boggiano <j.boggiano@seld.be>
Date: Tue, 27 Sep 2011 01:09:48 +0200
Subject: [PATCH] Update json-schema

---
 doc/composer-schema.json | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/doc/composer-schema.json b/doc/composer-schema.json
index 8d80ccf53..ecd07840e 100644
--- a/doc/composer-schema.json
+++ b/doc/composer-schema.json
@@ -37,7 +37,7 @@
             "required": true
         },
         "license": {
-            "type": "string",
+            "type": ["string", "array"],
             "description": "License name",
             "optional": true
         },
@@ -73,6 +73,31 @@
             "additionalProperties": true,
             "optional": true
         },
+        "replace": {
+            "type": "object",
+            "additionalProperties": true,
+            "optional": true
+        },
+        "conflict": {
+            "type": "object",
+            "additionalProperties": true,
+            "optional": true
+        },
+        "provide": {
+            "type": "object",
+            "additionalProperties": true,
+            "optional": true
+        },
+        "recommend": {
+            "type": "object",
+            "additionalProperties": true,
+            "optional": true
+        },
+        "suggest": {
+            "type": "object",
+            "additionalProperties": true,
+            "optional": true
+        },
         "extra": {
             "type": ["object", "array"],
             "additionalProperties": true,