From 81b6116a9fb14cca016f5dd3d3c060f6917013ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gr=C3=A9gory=20Soutad=C3=A9?= <soutade@gmail.com>
Date: Thu, 5 Nov 2015 18:42:15 +0100
Subject: [PATCH] Update firefox addon to be compliant with new jpm building
 tool

---
 chrome_addon/manifest.json  | 2 +-
 firefox_addon/lib/main.js   | 6 +++---
 firefox_addon/lib/pkdbf2.js | 2 +-
 firefox_addon/package.json  | 5 +++--
 4 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/chrome_addon/manifest.json b/chrome_addon/manifest.json
index eeb1c35..442db8d 100644
--- a/chrome_addon/manifest.json
+++ b/chrome_addon/manifest.json
@@ -3,7 +3,7 @@
 
     "name": "gPass",
     "short_name": "gPass",
-    "version": "0.6.1",
+    "version": "0.7",
     "description": "gPass : global password manager",
     "icons" : {"16":"gpass_icon_16.png", "32":"gpass_icon_32.png", "64":"gpass_icon_64.png", "128":"gpass_icon_128.png"},
     "author" : "Grégory Soutadé",
diff --git a/firefox_addon/lib/main.js b/firefox_addon/lib/main.js
index 497edb5..c4bcb1e 100644
--- a/firefox_addon/lib/main.js
+++ b/firefox_addon/lib/main.js
@@ -22,9 +22,9 @@ var notifications = require("sdk/notifications");
 var self = require("sdk/self");
 var prefSet = require("sdk/simple-prefs");
 
-var pkdbf2 = require("pkdbf2").pkdbf2;
-var aes = require("jsaes").aes;
-var parseURI = require("parseuri").parseURI;
+var pkdbf2 = require("lib/pkdbf2").pkdbf2;
+var aes = require("lib/jsaes").aes;
+var parseURI = require("lib/parseuri").parseURI;
 var DEBUG = false;
 var pkdbf2_level = getPref("pkdbf2_level");
 var protocol_version = 3;
diff --git a/firefox_addon/lib/pkdbf2.js b/firefox_addon/lib/pkdbf2.js
index a7a9363..473610b 100644
--- a/firefox_addon/lib/pkdbf2.js
+++ b/firefox_addon/lib/pkdbf2.js
@@ -17,7 +17,7 @@
   along with gPass.  If not, see <http://www.gnu.org/licenses/>.
 */
 
-var hmac = require("hmac").hmac;
+var hmac = require("lib/hmac").hmac;
 
 exports.pkdbf2 = {
     
diff --git a/firefox_addon/package.json b/firefox_addon/package.json
index c6d57b8..46f5197 100644
--- a/firefox_addon/package.json
+++ b/firefox_addon/package.json
@@ -1,13 +1,14 @@
 {
   "name": "gpass",
   "fullName": "gPass",
-  "id": "jid1-eNs887pPJU8aNg",
+  "id": "jid1-eNs887pPJU8aNg@jetpack",
+  "main": "lib/main.js",
   "description": "gPass : global password manager",
   "author": "Grégory Soutadé",
   "license": "GNU GPL v3",
     "homepage" : "http://indefero.soutade.fr/p/gpass",
     "icon" : "data/gpass_icon_64.png",
-    "version": "0.6",
+    "version": "0.7.0",
     "preferences": [
     {
         "name": "account_url",