From df98ed5e137e260124c8e572444e92b9079a7dc6 Mon Sep 17 00:00:00 2001
From: Joseph Scheuhammer <clown@alum.mit.edu>
Date: Thu, 22 Feb 2018 10:42:35 -0500
Subject: [PATCH 1/3] GPII-2568: Updated references to "universal" with
 "gpii-universal"

---
 gpii/node_modules/alsa/alsa_bridge.js                       | 2 +-
 gpii/node_modules/alsa/nodealsa/nodealsa_tests.js           | 2 +-
 gpii/node_modules/alsa/test/alsaSettingsHandlerTests.js     | 2 +-
 gpii/node_modules/gsettingsBridge/gsettings_bridge.js       | 2 +-
 gpii/node_modules/gsettingsBridge/tests/gsettingsTests.js   | 2 +-
 gpii/node_modules/orca/orcaSettingsHandler.js               | 2 +-
 gpii/node_modules/orca/test/orcaSettingsHandlerTests.js     | 2 +-
 gpii/node_modules/packagekit/index.js                       | 2 +-
 .../packagekit/nodepackagekit/nodepackagekit_test.js        | 2 +-
 gpii/node_modules/packagekit/packageKitDeviceReporter.js    | 2 +-
 gpii/node_modules/packagekit/test/all-tests.js              | 2 +-
 .../packagekit/test/packageKitDeviceReporterTests.js        | 2 +-
 gpii/node_modules/packagekit/test/packageKitModuleTests.js  | 2 +-
 gpii/node_modules/xrandr/nodexrandr/nodexrandr_tests.js     | 2 +-
 gpii/node_modules/xrandr/test/xrandrSettingsHandlerTests.js | 2 +-
 gpii/node_modules/xrandr/xrandr_bridge.js                   | 2 +-
 index.js                                                    | 2 +-
 package.json                                                | 4 ++--
 tests/AcceptanceTests.js                                    | 6 +++---
 19 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/gpii/node_modules/alsa/alsa_bridge.js b/gpii/node_modules/alsa/alsa_bridge.js
index a80f5ac..cea1387 100644
--- a/gpii/node_modules/alsa/alsa_bridge.js
+++ b/gpii/node_modules/alsa/alsa_bridge.js
@@ -16,7 +16,7 @@
 
 "use strict";
 
-var fluid = require("universal");
+var fluid = require("gpii-universal");
 var gpii = fluid.registerNamespace("gpii");
 var alsa = require("./nodealsa/build/Release/nodealsa.node");
 
diff --git a/gpii/node_modules/alsa/nodealsa/nodealsa_tests.js b/gpii/node_modules/alsa/nodealsa/nodealsa_tests.js
index bd6c02c..1d74142 100644
--- a/gpii/node_modules/alsa/nodealsa/nodealsa_tests.js
+++ b/gpii/node_modules/alsa/nodealsa/nodealsa_tests.js
@@ -16,7 +16,7 @@
 
 "use strict";
 
-var fluid = require("universal"),
+var fluid = require("gpii-universal"),
     jqUnit = fluid.require("node-jqunit"),
     alsa = require("./build/Release/nodealsa.node");
 
diff --git a/gpii/node_modules/alsa/test/alsaSettingsHandlerTests.js b/gpii/node_modules/alsa/test/alsaSettingsHandlerTests.js
index 0f93256..d940fec 100644
--- a/gpii/node_modules/alsa/test/alsaSettingsHandlerTests.js
+++ b/gpii/node_modules/alsa/test/alsaSettingsHandlerTests.js
@@ -16,7 +16,7 @@
 
 "use strict";
 
-var fluid = require("universal"),
+var fluid = require("gpii-universal"),
     jqUnit = fluid.require("node-jqunit");
 
 require("alsa");
diff --git a/gpii/node_modules/gsettingsBridge/gsettings_bridge.js b/gpii/node_modules/gsettingsBridge/gsettings_bridge.js
index 8ce8681..711677c 100644
--- a/gpii/node_modules/gsettingsBridge/gsettings_bridge.js
+++ b/gpii/node_modules/gsettingsBridge/gsettings_bridge.js
@@ -16,7 +16,7 @@
 
 "use strict";
 
-var fluid = require("universal");
+var fluid = require("gpii-universal");
 var gpii = fluid.registerNamespace("gpii");
 var nodeGSettings = require("./nodegsettings/build/Release/nodegsettings.node");
 
diff --git a/gpii/node_modules/gsettingsBridge/tests/gsettingsTests.js b/gpii/node_modules/gsettingsBridge/tests/gsettingsTests.js
index d052953..5928882 100644
--- a/gpii/node_modules/gsettingsBridge/tests/gsettingsTests.js
+++ b/gpii/node_modules/gsettingsBridge/tests/gsettingsTests.js
@@ -16,7 +16,7 @@
 
 "use strict";
 
-var fluid = require("universal"),
+var fluid = require("gpii-universal"),
     gpii = fluid.registerNamespace("gpii"),
     jqUnit = fluid.require("node-jqunit");
 
diff --git a/gpii/node_modules/orca/orcaSettingsHandler.js b/gpii/node_modules/orca/orcaSettingsHandler.js
index d52337c..683d850 100644
--- a/gpii/node_modules/orca/orcaSettingsHandler.js
+++ b/gpii/node_modules/orca/orcaSettingsHandler.js
@@ -18,7 +18,7 @@
 
 "use strict";
 
-var fluid = require("universal");
+var fluid = require("gpii-universal");
 var gpii = fluid.registerNamespace("gpii");
 var fs = require("fs");
 var spawn = require("child_process").spawn;
diff --git a/gpii/node_modules/orca/test/orcaSettingsHandlerTests.js b/gpii/node_modules/orca/test/orcaSettingsHandlerTests.js
index fef1f70..838b97e 100644
--- a/gpii/node_modules/orca/test/orcaSettingsHandlerTests.js
+++ b/gpii/node_modules/orca/test/orcaSettingsHandlerTests.js
@@ -17,7 +17,7 @@
 
 "use strict";
 
-var fluid = require("universal"),
+var fluid = require("gpii-universal"),
     jqUnit = fluid.require("node-jqunit");
 
 require("orca");
diff --git a/gpii/node_modules/packagekit/index.js b/gpii/node_modules/packagekit/index.js
index e497b7d..dddf29e 100644
--- a/gpii/node_modules/packagekit/index.js
+++ b/gpii/node_modules/packagekit/index.js
@@ -16,7 +16,7 @@
 
 "use strict";
 
-var fluid = require("universal");
+var fluid = require("gpii-universal");
 
 require("./packageKitDeviceReporter.js");
 
diff --git a/gpii/node_modules/packagekit/nodepackagekit/nodepackagekit_test.js b/gpii/node_modules/packagekit/nodepackagekit/nodepackagekit_test.js
index df58763..3115834 100644
--- a/gpii/node_modules/packagekit/nodepackagekit/nodepackagekit_test.js
+++ b/gpii/node_modules/packagekit/nodepackagekit/nodepackagekit_test.js
@@ -14,7 +14,7 @@ https://github.com/gpii/universal/LICENSE.txt
 
 "use strict";
 
-var fluid = require("universal"),
+var fluid = require("gpii-universal"),
     jqUnit = fluid.require("node-jqunit"),
     gpii = fluid.registerNamespace("gpii"),
     packagekit = require("./build/Release/nodepackagekit.node");
diff --git a/gpii/node_modules/packagekit/packageKitDeviceReporter.js b/gpii/node_modules/packagekit/packageKitDeviceReporter.js
index 3f75954..eda347e 100644
--- a/gpii/node_modules/packagekit/packageKitDeviceReporter.js
+++ b/gpii/node_modules/packagekit/packageKitDeviceReporter.js
@@ -16,7 +16,7 @@
 
 "use strict";
 
-var fluid = require("universal");
+var fluid = require("gpii-universal");
 var gpii = fluid.registerNamespace("gpii");
 var packageKit = require("./nodepackagekit/build/Release/nodepackagekit.node");
 
diff --git a/gpii/node_modules/packagekit/test/all-tests.js b/gpii/node_modules/packagekit/test/all-tests.js
index f5e88b9..d5e54cc 100644
--- a/gpii/node_modules/packagekit/test/all-tests.js
+++ b/gpii/node_modules/packagekit/test/all-tests.js
@@ -11,7 +11,7 @@
  */
 "use strict";
 
-var fluid = require("universal"),
+var fluid = require("gpii-universal"),
     kettle = fluid.require("kettle");
 
 kettle.loadTestingSupport();
diff --git a/gpii/node_modules/packagekit/test/packageKitDeviceReporterTests.js b/gpii/node_modules/packagekit/test/packageKitDeviceReporterTests.js
index 079057e..8bb845d 100644
--- a/gpii/node_modules/packagekit/test/packageKitDeviceReporterTests.js
+++ b/gpii/node_modules/packagekit/test/packageKitDeviceReporterTests.js
@@ -15,7 +15,7 @@
  */
 "use strict";
 
-var fluid = require("universal"),
+var fluid = require("gpii-universal"),
     gpii = fluid.registerNamespace("gpii"),
     jqUnit = fluid.require("node-jqunit");
 
diff --git a/gpii/node_modules/packagekit/test/packageKitModuleTests.js b/gpii/node_modules/packagekit/test/packageKitModuleTests.js
index 5d95122..373ffe9 100644
--- a/gpii/node_modules/packagekit/test/packageKitModuleTests.js
+++ b/gpii/node_modules/packagekit/test/packageKitModuleTests.js
@@ -15,7 +15,7 @@
  */
 "use strict";
 
-var fluid = require("universal"),
+var fluid = require("gpii-universal"),
     jqUnit = fluid.require("node-jqunit");
 
 require("packagekit");
diff --git a/gpii/node_modules/xrandr/nodexrandr/nodexrandr_tests.js b/gpii/node_modules/xrandr/nodexrandr/nodexrandr_tests.js
index 56358be..55068af 100644
--- a/gpii/node_modules/xrandr/nodexrandr/nodexrandr_tests.js
+++ b/gpii/node_modules/xrandr/nodexrandr/nodexrandr_tests.js
@@ -16,7 +16,7 @@
 
 "use strict";
 
-var fluid = require("universal"),
+var fluid = require("gpii-universal"),
     jqUnit = fluid.require("node-jqunit"),
     xrandr = require("./build/Release/nodexrandr.node");
 
diff --git a/gpii/node_modules/xrandr/test/xrandrSettingsHandlerTests.js b/gpii/node_modules/xrandr/test/xrandrSettingsHandlerTests.js
index 936929b..34c0810 100644
--- a/gpii/node_modules/xrandr/test/xrandrSettingsHandlerTests.js
+++ b/gpii/node_modules/xrandr/test/xrandrSettingsHandlerTests.js
@@ -16,7 +16,7 @@
 
 "use strict";
 
-var fluid = require("universal"),
+var fluid = require("gpii-universal"),
     jqUnit = fluid.require("node-jqunit");
 
 require("xrandr");
diff --git a/gpii/node_modules/xrandr/xrandr_bridge.js b/gpii/node_modules/xrandr/xrandr_bridge.js
index b54442f..4154afc 100644
--- a/gpii/node_modules/xrandr/xrandr_bridge.js
+++ b/gpii/node_modules/xrandr/xrandr_bridge.js
@@ -17,7 +17,7 @@
 
 "use strict";
 
-var fluid = require("universal");
+var fluid = require("gpii-universal");
 var gpii = fluid.registerNamespace("gpii");
 var xrandr = require("./nodexrandr/build/Release/nodexrandr.node");
 
diff --git a/index.js b/index.js
index cb2ad0b..4aa225b 100644
--- a/index.js
+++ b/index.js
@@ -17,7 +17,7 @@
 
 "use strict";
 
-var fluid = require("universal");
+var fluid = require("gpii-universal");
 
 fluid.module.register("gpii-linux", __dirname, require);
 
diff --git a/package.json b/package.json
index ce76527..d0714cb 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
     "bugs": "http://issues.gpii.net/browse/GPII",
     "homepage": "http://gpii.net/",
     "dependencies": {
-        "universal": "GPII/universal#1a3434d970cb484956eb18310683bdfe473123d6"
+        "gpii-universal": "GPII/universal#36433633d01e59028ffefe0b4fcc59ef7d3886b2"
     },
     "devDependencies": {
         "grunt": "1.0.1",
@@ -15,7 +15,7 @@
         "grunt-shell": "1.3.0",
         "nan": "2.4.0"
     },
-    "license" : "BSD-3-Clause",
+    "license": "BSD-3-Clause",
     "keywords": [
         "gpii",
         "accessibility",
diff --git a/tests/AcceptanceTests.js b/tests/AcceptanceTests.js
index d1ca5f8..19baac2 100644
--- a/tests/AcceptanceTests.js
+++ b/tests/AcceptanceTests.js
@@ -16,7 +16,7 @@ Seventh Framework Programme (FP7/2007-2013) under grant agreement no. 289016.
 
 "use strict";
 
-var fluid = require("universal"),
+var fluid = require("gpii-universal"),
     gpii = fluid.registerNamespace("gpii");
 
 gpii.loadTestingSupport();
@@ -25,7 +25,7 @@ fluid.registerNamespace("gpii.acceptanceTesting.linux");
 
 require("../index.js");
 
-var baseDir = fluid.module.resolvePath("%universal/tests/");
-var linuxFiles = fluid.require("%universal/tests/platform/index-linux.js");
+var baseDir = fluid.module.resolvePath("%gpii-universal/tests/");
+var linuxFiles = fluid.require("%gpii-universal/tests/platform/index-linux.js");
 
 gpii.test.runSuitesWithFiltering(linuxFiles, baseDir, ["gpii.test.acceptance.testCaseHolder"]);

From 814998dd02d2f481f672971dc610b54ac9525525 Mon Sep 17 00:00:00 2001
From: Joseph Scheuhammer <clown@alum.mit.edu>
Date: Thu, 22 Feb 2018 14:13:51 -0500
Subject: [PATCH 2/3] GPII-2568: Changed gpii-universal dependency to reference
 latest npm version

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

diff --git a/package.json b/package.json
index d0714cb..941136c 100644
--- a/package.json
+++ b/package.json
@@ -6,7 +6,7 @@
     "bugs": "http://issues.gpii.net/browse/GPII",
     "homepage": "http://gpii.net/",
     "dependencies": {
-        "gpii-universal": "GPII/universal#36433633d01e59028ffefe0b4fcc59ef7d3886b2"
+        "gpii-universal": "0.3.0-dev.20180221T093422Z.50833c1"
     },
     "devDependencies": {
         "grunt": "1.0.1",

From ca503e714e1d0a676028b664cf42fc7caf8aafd2 Mon Sep 17 00:00:00 2001
From: Joseph Scheuhammer <clown@alum.mit.edu>
Date: Mon, 4 Jun 2018 16:52:32 -0400
Subject: [PATCH 3/3] GPII-2568:  Replace references to "universal" with
 "gpii-universal"

Fixed one more require() in gpii.js
---
 gpii.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gpii.js b/gpii.js
index bfc1f5e..41f7bd4 100644
--- a/gpii.js
+++ b/gpii.js
@@ -17,7 +17,7 @@
 
 "use strict";
 
-var fluid = require("universal"),
+var fluid = require("gpii-universal"),
     gpii = fluid.registerNamespace("gpii");
 
 require("./index.js");