From 4a90991bb68336663a85e98788fec83edeb5e723 Mon Sep 17 00:00:00 2001
From: Pascal Thormeier <pascal.thormeier@liip.ch>
Date: Thu, 28 Aug 2014 22:34:25 +0200
Subject: [PATCH 1/4] Add composer.json

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

diff --git a/composer.json b/composer.json
new file mode 100644
index 00000000..1b7d18e7
--- /dev/null
+++ b/composer.json
@@ -0,0 +1,21 @@
+{
+    "name": "happyworm/jPlayer",
+    "type": "component",
+    "require": {
+        "robloach/component-installer": "*",
+        "components/jquery": ">=1.9"
+    },
+    "extra": {
+        "component": {
+            "scripts": [
+                "jquery.jplayer/jquery.jplayer.js"
+            ],
+            "files": [
+                "jquery.jplayer/Jplayer.swf",
+                "add-on/*.js",
+                "popcorn/player/*.js",
+                "skin/*"
+            ]
+        }
+    }
+}
\ No newline at end of file

From 0dfc8f507a13bf643c6998c7bb87288bd835cc8a Mon Sep 17 00:00:00 2001
From: Pascal Thormeier <pascal.thormeier@liip.ch>
Date: Thu, 28 Aug 2014 22:53:07 +0200
Subject: [PATCH 2/4] Add support for delivered skins and update README

---
 README.md     | 29 +++++++++++++++++++++++++++++
 composer.json |  3 ++-
 2 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index e674e58b..8eb40179 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,35 @@ _(*) Optional counterpart formats to increase HTML5 cross-browser support._
 * simple install using `bower install jplayer`
 * see <http://bower.io/> for more information.
 
+## Composer install
+
+Install jPlayer via composer by adding the following lines to your `composer.json` in your project:
+
+    // ...
+    "repositories": [
+        {
+            "type": "vcs",
+            "url": "https://github.com/happyworm/jPlayer"
+        }
+    ]
+    // ...
+    "require": {
+        // ...
+        "happyworm/jPlayer": "2.*"
+        // ...
+    }
+    // ...
+    "config": {
+        "component-dir": "your/desired/asset/path"
+    },
+    // ...
+
+Then execute the following:
+
+    php composer.phar update
+
+Composer will now download all components and install the needed files into `your/desired/asset/path`, ready to use.
+
 ## License
 [jPlayer](http://jplayer.org/) is licensed under the [MIT license](http://opensource.org/licenses/MIT).
 
diff --git a/composer.json b/composer.json
index 1b7d18e7..a8fb7238 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,8 @@
                 "jquery.jplayer/Jplayer.swf",
                 "add-on/*.js",
                 "popcorn/player/*.js",
-                "skin/*"
+                "skin/blue.monday/*",
+                "skin/pink.flag/*"
             ]
         }
     }

From a0545f4aa248cbdfcdbd12863efeebba73e8eba5 Mon Sep 17 00:00:00 2001
From: Pascal Thormeier <pascal.thormeier@liip.ch>
Date: Thu, 20 Nov 2014 20:49:03 +0100
Subject: [PATCH 3/4] Update composer.json Added more information and moved
 jquery to suggests

---
 composer.json | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index a8fb7238..1d888f22 100644
--- a/composer.json
+++ b/composer.json
@@ -1,9 +1,30 @@
 {
     "name": "happyworm/jPlayer",
+    "description": "jPlayer allows you to create a media player with a consistent interface and experience across all browsers.",
     "type": "component",
+    "homepage": "http://jplayer.org/",
+    "license": "MIT",
+    "keywords": [
+        "audio",
+        "video",
+        "media",
+        "player",
+        "jplayer",
+        "html5",
+        "streaming"
+    ],
+    "authors": [
+        {
+            "name": "Mark J Panaghiston",
+            "email": "markp@happyworm.com",
+            "url": "http://happyworm.com/"
+        }
+    ],
     "require": {
-        "robloach/component-installer": "*",
-        "components/jquery": ">=1.9"
+        "robloach/component-installer": "*"
+    },
+    "suggest": {
+        "components/jquery": ">=1.7.2"
     },
     "extra": {
         "component": {
@@ -16,7 +37,10 @@
                 "popcorn/player/*.js",
                 "skin/blue.monday/*",
                 "skin/pink.flag/*"
-            ]
+            ],
+            "shim": {
+                "deps": ["jquery"]
+            }
         }
     }
 }
\ No newline at end of file

From 45b0089d69530ce8f859d3a5f4b0529cdec0b45f Mon Sep 17 00:00:00 2001
From: Pascal Thormeier <pascal.thormeier@liip.ch>
Date: Thu, 20 Nov 2014 20:52:52 +0100
Subject: [PATCH 4/4] Use valid name and author

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

diff --git a/composer.json b/composer.json
index 1d888f22..b859b7bb 100644
--- a/composer.json
+++ b/composer.json
@@ -1,5 +1,5 @@
 {
-    "name": "happyworm/jPlayer",
+    "name": "happyworm/jplayer",
     "description": "jPlayer allows you to create a media player with a consistent interface and experience across all browsers.",
     "type": "component",
     "homepage": "http://jplayer.org/",
@@ -16,8 +16,7 @@
     "authors": [
         {
             "name": "Mark J Panaghiston",
-            "email": "markp@happyworm.com",
-            "url": "http://happyworm.com/"
+            "email": "markp@happyworm.com"
         }
     ],
     "require": {