[Pkg-mozext-commits] [requestpolicy] 41/80: Change the Extension ID (again)

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository requestpolicy.

commit 1ff689a42d1cf60f9e14a1fc24684597e1b21808
Author: Martin Kimmerle <dev at 256k.de>
Date:   Sat Jun 6 23:54:07 2015 +0200

    Change the Extension ID (again)
    
    The extension ID needs to be changed:
    - there will be two release channels, AMO and off-AMO.
    - the off-AMO addon has to be signed
    - there have to be separate IDs for the AMO and off-AMO version.
    those will be:
    * AMO: rpcontinued at requestpolicy.org
    * off-AMO: rpcontinued at non-amo.requestpolicy.org
---
 Makefile                            | 3 +--
 src/content/lib/utils/constants.jsm | 2 +-
 src/install.rdf                     | 3 +--
 tests/mozmill/lib/constants.js      | 2 +-
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index df6bcdb..9f9cbaf 100644
--- a/Makefile
+++ b/Makefile
@@ -11,7 +11,6 @@
 #
 
 extension_name := requestpolicy
-extension_uuid := rpcontinued at requestpolicy.org
 
 # ____________________________________
 # generating XPIs -- general variables
@@ -333,7 +332,7 @@ run: $(moz_xpi) $(dev_helper__xpi_file)
 # see https://github.com/RequestPolicyContinued/requestpolicy/wiki/Setting-up-a-development-environment#unit-tests-for-requestpolicy
 
 mozmill_tests_dir := .mozilla/mozmill-tests
-mozmill_rpc_test_dir := $(mozmill_tests_dir)/firefox/tests/addons/$(extension_uuid)
+mozmill_rpc_test_dir := $(mozmill_tests_dir)/firefox/tests/addons/rpcontinued at requestpolicy.org
 
 # Default mozmill manifest to use for testing
 mm_manifest := manifest.ini
diff --git a/src/content/lib/utils/constants.jsm b/src/content/lib/utils/constants.jsm
index 365a31c..fbffb5a 100644
--- a/src/content/lib/utils/constants.jsm
+++ b/src/content/lib/utils/constants.jsm
@@ -29,7 +29,7 @@ let EXPORTED_SYMBOLS = ["C"];
 
 let C = {};
 
-C.EXTENSION_ID = "rpcontinued at requestpolicy.org";
+C.EXTENSION_ID = "rpcontinued at non-amo.requestpolicy.org";
 C.FIREFOX_ID = "{ec8030f7-c20a-464f-9b0e-13a3a9e97384}";
 C.SEAMONKEY_ID = "{92650c4d-4b8e-4d2a-b7eb-24ecf4f6b63a}";
 C.MMID = C.EXTENSION_ID; // message manager ID
diff --git a/src/install.rdf b/src/install.rdf
index e192fa5..0d79207 100644
--- a/src/install.rdf
+++ b/src/install.rdf
@@ -7,7 +7,7 @@
     <em:name>RequestPolicy Continued</em:name>
     <em:version>1.0.dev</em:version>
     <em:type>2</em:type>
-    <em:id>rpcontinued at requestpolicy.org</em:id>
+    <em:id>rpcontinued at non-amo.requestpolicy.org</em:id>
 
     <em:unpack>false</em:unpack>
     <em:bootstrap>true</em:bootstrap>
@@ -39,7 +39,6 @@
       <Description>
         <em:locale>eo</em:locale>
         <em:name>RequestPolicy Continued</em:name>
-        <em:name>RequestPolicy Continued</em:name>
         <em:description>Administru la rajtojn de retejoj fari inter-retejajn petojn. Plibonigu la privatecon de via retumado. Sekurigu vin kontraŭ Falsado de inter-retejaj petoj (Cross-Site Request Forgery, CSRF) kaj aliaj atakoj.</em:description>
       </Description>
     </em:localized>
diff --git a/tests/mozmill/lib/constants.js b/tests/mozmill/lib/constants.js
index ee66129..50cd32e 100644
--- a/tests/mozmill/lib/constants.js
+++ b/tests/mozmill/lib/constants.js
@@ -6,7 +6,7 @@
 
 exports.mozmillTestsRootDir = "../../../../";
 
-exports.ADDON_ID = "rpcontinued at requestpolicy.org";
+exports.ADDON_ID = "rpcontinued at non-amo.requestpolicy.org";
 
 exports.PREF_DEFAULT_ALLOW = "extensions.requestpolicy.defaultPolicy.allow";
 exports.PREF_DEFAULT_ALLOW_SAME_DOMAIN =

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/requestpolicy.git