From 5aac43ea55fb51d2786d42c3a654876664751ee9 Mon Sep 17 00:00:00 2001
From: Ollie Harridge <code@oll.ie>
Date: Wed, 15 Aug 2012 16:00:11 +0100
Subject: [PATCH 1/6] added composer.json

---
 composer.json | 25 +++++++++++++++++++++++++
 1 file changed, 25 insertions(+)
 create mode 100644 composer.json

diff --git a/composer.json b/composer.json
new file mode 100644
index 0000000..640e358
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,25 @@
+{
+    "name": "bertrandom/timezone-bundle",
+    "type": "symfony-bundle",
+    "description": "Readable Timezone Field Type for Symfony2",
+    "keywords": ["timezone", "form", "type", "Symfony2"],
+    "homepage": "https://github.com/bertrandom/BertTimezoneBundle",
+    "license": "MIT",
+	"version": "1.0.0",
+    "authors": [
+		{
+			"name": "bertrandom (Bertrand Fan)",
+			"email": "bertrand@fan.net"
+		}
+    ],
+    "require": {
+        "php": ">=5.3.2",
+        "symfony/framework-bundle": "2.1.*"
+    },
+    "autoload": {
+        "psr-0": { 
+			"Bert\\TimezoneBundle": ""
+		}
+    },
+    "target-dir": "bert/TimezoneBundle"
+}
\ No newline at end of file

From fea173fa5143ca05eff402265aab6dd864fa1dbc Mon Sep 17 00:00:00 2001
From: oharridge <ollie@sabbaticalsoul.co.uk>
Date: Thu, 30 Aug 2012 12:22:20 +0100
Subject: [PATCH 2/6] Changing capitalisation of dir

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 640e358..ede0371 100644
--- a/composer.json
+++ b/composer.json
@@ -21,5 +21,5 @@
 			"Bert\\TimezoneBundle": ""
 		}
     },
-    "target-dir": "bert/TimezoneBundle"
+    "target-dir": "Bert/TimezoneBundle"
 }
\ No newline at end of file

From c3057fd423d4d5d56bd27c2e77fc888a91e37b9c Mon Sep 17 00:00:00 2001
From: ollietb <me@oll.ie>
Date: Sun, 17 Mar 2013 18:35:41 +0000
Subject: [PATCH 3/6] updating composer

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index ede0371..d3b486d 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
     ],
     "require": {
         "php": ">=5.3.2",
-        "symfony/framework-bundle": "2.1.*"
+        "symfony/framework-bundle": ">=2.1,<2.3-dev"
     },
     "autoload": {
         "psr-0": { 

From 8218bcd386418f10a7cb119a7bf06f087ab06ec0 Mon Sep 17 00:00:00 2001
From: Ollie Harridge <ollie@sabbaticalsoul.co.uk>
Date: Fri, 16 Aug 2013 14:04:03 +0100
Subject: [PATCH 4/6] composer update for symfony 2.3

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index d3b486d..c749968 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
     ],
     "require": {
         "php": ">=5.3.2",
-        "symfony/framework-bundle": ">=2.1,<2.3-dev"
+        "symfony/framework-bundle": ">=2.1,<2.4-dev"
     },
     "autoload": {
         "psr-0": { 

From 383187bf4a7a06d07b2a9f2c37a034bee373fd84 Mon Sep 17 00:00:00 2001
From: Ollie Harridge <ollie@sabbaticalsoul.co.uk>
Date: Wed, 22 Jan 2014 17:13:39 +0000
Subject: [PATCH 5/6] Update composer.json

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index c749968..b60f1ca 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
     ],
     "require": {
         "php": ">=5.3.2",
-        "symfony/framework-bundle": ">=2.1,<2.4-dev"
+        "symfony/framework-bundle": ">=2.1,<2.5-dev"
     },
     "autoload": {
         "psr-0": { 
@@ -22,4 +22,4 @@
 		}
     },
     "target-dir": "Bert/TimezoneBundle"
-}
\ No newline at end of file
+}

From 7e19fd08fa79e0aae75b49fd44cae8b2051afc90 Mon Sep 17 00:00:00 2001
From: Ross Masters <ross@rossmasters.com>
Date: Mon, 2 Jun 2014 11:35:11 +0100
Subject: [PATCH 6/6] Make compatible with Symfony >2.4

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index b60f1ca..0e0f147 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
     ],
     "require": {
         "php": ">=5.3.2",
-        "symfony/framework-bundle": ">=2.1,<2.5-dev"
+        "symfony/framework-bundle": "~2.1"
     },
     "autoload": {
         "psr-0": {