From: Igor Wiedler <igor@wiedler.ch>
Date: Sun, 8 Apr 2012 12:07:23 +0000 (+0200)
Subject: [composer] Add branch alias for dev-master, adjust some other things
X-Git-Url: http://git.silmor.de/gitweb/?a=commitdiff_plain;h=72d3c19e7173ec814487411f46bacc9fac7597de;p=web%2Fkonrad%2Ftwig.git

[composer] Add branch alias for dev-master, adjust some other things

* branch alias allows installation of dev-master by requiring 1.7.*, which is important since most packages depend on twig "<2.0.0"
* remove the version field, the version is determined by branch names and tags only
* change license to BSD-3, this is more explicit and the preferred format for BSD licenses
---

diff --git a/composer.json b/composer.json
index 0138ed0..f828a4a 100644
--- a/composer.json
+++ b/composer.json
@@ -4,8 +4,7 @@
     "description": "Twig, the flexible, fast, and secure template language for PHP",
     "keywords": ["templating"],
     "homepage": "http://twig.sensiolabs.org",
-    "version": "1.7.0",
-    "license": "BSD",
+    "license": "BSD-3",
     "authors": [
         {
             "name": "Fabien Potencier",
@@ -23,5 +22,10 @@
         "psr-0" : {
             "Twig_" : "lib/"
         }
+    },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.7-dev"
+        }
     }
 }