From 6a6f315339dd403d66ea53bde63242dcb219cb45 Mon Sep 17 00:00:00 2001
From: Jerome TAMARELLE <jtamarelle@groupe-exp.com>
Date: Wed, 2 Oct 2013 12:06:59 +0200
Subject: [PATCH] Alias branch master branch to version 1.5 for tagging

---
 composer.json                         | 7 ++++++-
 lib/autoload/sfCoreAutoload.class.php | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 4253f55a5..015913ae3 100755
--- a/composer.json
+++ b/composer.json
@@ -3,12 +3,17 @@
     "description": "Fork of symfony 1.4 with dic, form enhancements, latest swiftmailer and better performance",
     "license": "MIT",
     "require": {
-        "swiftmailer/swiftmailer": "4.2.*",
+        "swiftmailer/swiftmailer": ">=4.2.2,<5.1.0-dev",
         "lexpress/doctrine1": "*"
     },
     "type": "library",
     "autoload": {
         "files": ["autoload.php"]
     },
+    "extra": {
+        "branch-alias": {
+            "dev-master": "1.5-dev"
+        }
+    },
     "bin": ["data/bin/symfony"]
 }
diff --git a/lib/autoload/sfCoreAutoload.class.php b/lib/autoload/sfCoreAutoload.class.php
index cae36e51e..d40018550 100644
--- a/lib/autoload/sfCoreAutoload.class.php
+++ b/lib/autoload/sfCoreAutoload.class.php
@@ -11,7 +11,7 @@
 /**
  * The current symfony version.
  */
-define('SYMFONY_VERSION', '1.4.17-DEV');
+define('SYMFONY_VERSION', '1.5.0-DEV');
 
 /**
  * sfCoreAutoload class.