From fdcecf240a8decb045378db0fa5a25336e5eca29 Mon Sep 17 00:00:00 2001
From: Brian Manning <bdmanning@ucsd.edu>
Date: Wed, 20 Apr 2016 14:57:29 -0700
Subject: [PATCH] composer.*: switched out how the TCPDF library is loaded

---
 composer.json |  3 +--
 composer.lock | 51 +++++++++++++++++++++++++++++++++++++++++++++++++--
 2 files changed, 50 insertions(+), 4 deletions(-)

diff --git a/composer.json b/composer.json
index f550d21..612031f 100644
--- a/composer.json
+++ b/composer.json
@@ -2,7 +2,6 @@
     "name": "GDC/tfpdf_demo",
     "description": "Demo of the tFPDF library",
     "require": {
-      "tecnickcom/tcpdf": "6.2.12",
-      "setasign/fpdi": "1.6.1"
+      "setasign/fpdi-tcpdf": "1.6.1"
    }
 }
diff --git a/composer.lock b/composer.lock
index f157933..b7c41ee 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,8 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
         "This file is @generated automatically"
     ],
-    "hash": "a3fa4ee8088e3be72dfb7bc5a0130e9f",
-    "content-hash": "6cbcca24e66a1f400c83ee371c1a7130",
+    "hash": "7bb6ede99f5b97310d32de7563bb0b6b",
+    "content-hash": "281781f110810f4384fbe5791189837f",
     "packages": [
         {
             "name": "setasign/fpdi",
@@ -57,6 +57,53 @@
             "time": "2015-11-30 10:53:14"
         },
         {
+            "name": "setasign/fpdi-tcpdf",
+            "version": "1.6.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/Setasign/FPDI-TCPDF.git",
+                "reference": "871699d429fcbad6dc809d57c7c8026fd7f41e93"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/Setasign/FPDI-TCPDF/zipball/871699d429fcbad6dc809d57c7c8026fd7f41e93",
+                "reference": "871699d429fcbad6dc809d57c7c8026fd7f41e93",
+                "shasum": ""
+            },
+            "require": {
+                "setasign/fpdi": "1.6.*",
+                "tecnickcom/tcpdf": "6.2.*"
+            },
+            "conflict": {
+                "setasign/fpdf": "1.*"
+            },
+            "type": "library",
+            "autoload": {
+                "classmap": [
+                    "fpdi_bridge.php"
+                ]
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jan Slabon",
+                    "email": "jan.slabon@setasign.com",
+                    "homepage": "https://www.setasign.com"
+                }
+            ],
+            "description": "Kind of metadata package for dependencies of the latest versions of FPDI and TCPDF.",
+            "homepage": "https://www.setasign.com/fpdi",
+            "keywords": [
+                "TCPDF",
+                "fpdi",
+                "pdf"
+            ],
+            "time": "2015-11-30 11:09:50"
+        },
+        {
             "name": "tecnickcom/tcpdf",
             "version": "6.2.12",
             "source": {
-- 
1.9.1