Run of fresh-snapshots for node-jed

Merge these changes:

git pull https://janitor.debian.net/git/node-jed fresh-snapshots/main
git pull https://janitor.debian.net/git/node-jed fresh-snapshots/pristine-tar
git pull https://janitor.debian.net/git/node-jed fresh-snapshots/upstream

Summary

Merged new upstream version: 1.1.1+git20170215.1.351c47d (was: 1.1.1).

Diff

Branch: main

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 8d87b1d..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules/*
diff --git a/.travis.yml b/.travis.yml
index b9207e5..7b5e951 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
 language: node_js
 node_js:
-  - '0.8'
-  - '0.10'
+  - node
+  - 4
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..02d3d98
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,19 @@
+Copyright JS Foundation and other contributors, https://js.foundation/
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/README.md b/README.md
index c7cb86e..5be1d0f 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,16 @@
-[![Build Status](https://secure.travis-ci.org/SlexAxton/Jed.png)](http://travis-ci.org/SlexAxton/Jed)
+[![Build Status](https://secure.travis-ci.org/messageformat/Jed.png)](http://travis-ci.org/messageformat/Jed)
 
 # Jed
 
 *Gettext Style i18n for Modern JavaScript Apps*
 
-For more info, please visit the docs site at <http://slexaxton.github.com/Jed>.
+For more info, please visit the docs site at <http://messageformat.github.io/Jed>.
 
 ## You sure you don't want something more modern?
 
 Jed is feature complete in my opinion. I am happy to fix bugs, but generally am not interested in adding more to the library.
 
-I also maintain [messageformat.js](https://github.com/SlexAxton/messageformat.js). If you don't specifically need a gettext implementation, I might suggest using MessageFormat instead, as it has better support for plurals/gender and has built-in locale data.
+I also maintain [messageformat.js](https://github.com/messageformat/messageformat.js). If you don't specifically need a gettext implementation, I might suggest using MessageFormat instead, as it has better support for plurals/gender and has built-in locale data.
 
 
 ## Parsing Gettext Files
@@ -35,11 +35,17 @@ Just search the npm repository, there are several PO and MO file parsers availab
 
 ## License
 
-Jed is a member project of the [jQuery Foundation](https://jquery.org/)
+Jed is a member project of the [JavaScript Foundation](https://js.foundation/)
 
 You may use this software under the MIT License.
 
-You may contribute to this software under the jQuery Foundation CLA - <https://contribute.jquery.org/CLA/>
+## Contributor License Agreement
+
+We require all contributions to be covered under the JS Foundation's [Contributor License Agreement](https://js.foundation/CLA/). This can be done electronically and essentially ensures that you are making it clear that your contributions are your contributions, you have the legal right to contribute and you are transferring the copyright of your works to the JS Foundation.
+
+If you are an unfamiliar contributor to the committer assessing your pull request, it is best to make it clear how you are covered by a CLA in the notes of the pull request. The committer will verify your status.
+
+If your GitHub user id you are submitting your pull request from differs from the e-mail address which you have signed your CLA under, you should specifically note what you have your CLA filed under (and for CCLA that you are listed under your company's authorised contributors).
 
 
 ## Author
diff --git a/debian/changelog b/debian/changelog
index 367f062..f03b4c2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+node-jed (1.1.1+git20170215.1.351c47d-1) UNRELEASED; urgency=low
+
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Sat, 16 Apr 2022 06:05:33 -0000
+
 node-jed (1.1.1-3) unstable; urgency=medium
 
   * Team upload
diff --git a/debian/patches/use-system-mocha.patch b/debian/patches/use-system-mocha.patch
index 1315ff0..5410659 100644
--- a/debian/patches/use-system-mocha.patch
+++ b/debian/patches/use-system-mocha.patch
@@ -1,7 +1,9 @@
 Description: Use system mocha
  use system mocha instead of npm installed mocha
---- a/Makefile
-+++ b/Makefile
+Index: node-jed/Makefile
+===================================================================
+--- node-jed.orig/Makefile
++++ node-jed/Makefile
 @@ -1,7 +1,7 @@
  REPORTER = dot
  
diff --git a/jed.js b/jed.js
index a64b313..bda163b 100644
--- a/jed.js
+++ b/jed.js
@@ -575,17 +575,23 @@ in order to offer easy upgrades -- jsgettext.berlios.de
     };
   };
 
+  Jed.PF.regexps = {
+    TRIM_BEG: /^\s\s*/,
+    TRIM_END: /\s\s*$/,
+    HAS_SEMICOLON: /;\s*$/,
+    NPLURALS: /nplurals\=(\d+);/,
+    PLURAL: /plural\=(.*);/
+  };
+
   Jed.PF.extractPluralExpr = function ( p ) {
     // trim first
-    p = p.replace(/^\s\s*/, '').replace(/\s\s*$/, '');
+    p = p.replace(Jed.PF.regexps.TRIM_BEG, '').replace(Jed.PF.regexps.TRIM_END, '');
 
-    if (! /;\s*$/.test(p)) {
+    if (! Jed.PF.regexps.HAS_SEMICOLON.test(p)) {
       p = p.concat(';');
     }
 
-    var nplurals_re = /nplurals\=(\d+);/,
-        plural_re = /plural\=(.*);/,
-        nplurals_matches = p.match( nplurals_re ),
+    var nplurals_matches = p.match( Jed.PF.regexps.NPLURALS ),
         res = {},
         plural_matches;
 
@@ -598,8 +604,8 @@ in order to offer easy upgrades -- jsgettext.berlios.de
     }
 
     // remove that data to get to the formula
-    p = p.replace( nplurals_re, "" );
-    plural_matches = p.match( plural_re );
+    p = p.replace( Jed.PF.regexps.NPLURALS, "" );
+    plural_matches = p.match( Jed.PF.regexps.PLURAL );
 
     if (!( plural_matches && plural_matches.length > 1 ) ) {
       throw new Error('`plural` expression not found: ' + p);

Branch: pristine-tar

diff --git a/node-jed_1.1.1+git20170215.1.351c47d.orig.tar.gz.delta b/node-jed_1.1.1+git20170215.1.351c47d.orig.tar.gz.delta
new file mode 100644
index 0000000..f2396b4
Binary files /dev/null and b/node-jed_1.1.1+git20170215.1.351c47d.orig.tar.gz.delta differ
diff --git a/node-jed_1.1.1+git20170215.1.351c47d.orig.tar.gz.id b/node-jed_1.1.1+git20170215.1.351c47d.orig.tar.gz.id
new file mode 100644
index 0000000..611c214
--- /dev/null
+++ b/node-jed_1.1.1+git20170215.1.351c47d.orig.tar.gz.id
@@ -0,0 +1 @@
+1cc917364afb19e7c575f511a62b0709d3225fd3

Branch: upstream

Tag: upstream/1.1.1+git20170215.1.351c47d
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 8d87b1d..0000000
--- a/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-node_modules/*
diff --git a/.travis.yml b/.travis.yml
index b9207e5..7b5e951 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
 language: node_js
 node_js:
-  - '0.8'
-  - '0.10'
+  - node
+  - 4
diff --git a/LICENSE b/LICENSE
new file mode 100644
index 0000000..02d3d98
--- /dev/null
+++ b/LICENSE
@@ -0,0 +1,19 @@
+Copyright JS Foundation and other contributors, https://js.foundation/
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/README.md b/README.md
index c7cb86e..5be1d0f 100644
--- a/README.md
+++ b/README.md
@@ -1,16 +1,16 @@
-[![Build Status](https://secure.travis-ci.org/SlexAxton/Jed.png)](http://travis-ci.org/SlexAxton/Jed)
+[![Build Status](https://secure.travis-ci.org/messageformat/Jed.png)](http://travis-ci.org/messageformat/Jed)
 
 # Jed
 
 *Gettext Style i18n for Modern JavaScript Apps*
 
-For more info, please visit the docs site at <http://slexaxton.github.com/Jed>.
+For more info, please visit the docs site at <http://messageformat.github.io/Jed>.
 
 ## You sure you don't want something more modern?
 
 Jed is feature complete in my opinion. I am happy to fix bugs, but generally am not interested in adding more to the library.
 
-I also maintain [messageformat.js](https://github.com/SlexAxton/messageformat.js). If you don't specifically need a gettext implementation, I might suggest using MessageFormat instead, as it has better support for plurals/gender and has built-in locale data.
+I also maintain [messageformat.js](https://github.com/messageformat/messageformat.js). If you don't specifically need a gettext implementation, I might suggest using MessageFormat instead, as it has better support for plurals/gender and has built-in locale data.
 
 
 ## Parsing Gettext Files
@@ -35,11 +35,17 @@ Just search the npm repository, there are several PO and MO file parsers availab
 
 ## License
 
-Jed is a member project of the [jQuery Foundation](https://jquery.org/)
+Jed is a member project of the [JavaScript Foundation](https://js.foundation/)
 
 You may use this software under the MIT License.
 
-You may contribute to this software under the jQuery Foundation CLA - <https://contribute.jquery.org/CLA/>
+## Contributor License Agreement
+
+We require all contributions to be covered under the JS Foundation's [Contributor License Agreement](https://js.foundation/CLA/). This can be done electronically and essentially ensures that you are making it clear that your contributions are your contributions, you have the legal right to contribute and you are transferring the copyright of your works to the JS Foundation.
+
+If you are an unfamiliar contributor to the committer assessing your pull request, it is best to make it clear how you are covered by a CLA in the notes of the pull request. The committer will verify your status.
+
+If your GitHub user id you are submitting your pull request from differs from the e-mail address which you have signed your CLA under, you should specifically note what you have your CLA filed under (and for CCLA that you are listed under your company's authorised contributors).
 
 
 ## Author
diff --git a/jed.js b/jed.js
index a64b313..bda163b 100644
--- a/jed.js
+++ b/jed.js
@@ -575,17 +575,23 @@ in order to offer easy upgrades -- jsgettext.berlios.de
     };
   };
 
+  Jed.PF.regexps = {
+    TRIM_BEG: /^\s\s*/,
+    TRIM_END: /\s\s*$/,
+    HAS_SEMICOLON: /;\s*$/,
+    NPLURALS: /nplurals\=(\d+);/,
+    PLURAL: /plural\=(.*);/
+  };
+
   Jed.PF.extractPluralExpr = function ( p ) {
     // trim first
-    p = p.replace(/^\s\s*/, '').replace(/\s\s*$/, '');
+    p = p.replace(Jed.PF.regexps.TRIM_BEG, '').replace(Jed.PF.regexps.TRIM_END, '');
 
-    if (! /;\s*$/.test(p)) {
+    if (! Jed.PF.regexps.HAS_SEMICOLON.test(p)) {
       p = p.concat(';');
     }
 
-    var nplurals_re = /nplurals\=(\d+);/,
-        plural_re = /plural\=(.*);/,
-        nplurals_matches = p.match( nplurals_re ),
+    var nplurals_matches = p.match( Jed.PF.regexps.NPLURALS ),
         res = {},
         plural_matches;
 
@@ -598,8 +604,8 @@ in order to offer easy upgrades -- jsgettext.berlios.de
     }
 
     // remove that data to get to the formula
-    p = p.replace( nplurals_re, "" );
-    plural_matches = p.match( plural_re );
+    p = p.replace( Jed.PF.regexps.NPLURALS, "" );
+    plural_matches = p.match( Jed.PF.regexps.PLURAL );
 
     if (!( plural_matches && plural_matches.length > 1 ) ) {
       throw new Error('`plural` expression not found: ' + p);

Publish Blockers

  • ☑ run was successful
  • ☑ package has not been removed from the archive
  • ☑ command has not changed
  • ☒ not yet reviewed, but review needed
  • ☑ 0 publish attempts so far.not currently attempting to back off
  • ☒ merge proposals for the package maintainer are currently being rate-limited (open: 1413, max open: 300)
  • ☑ change set f8986151-54c5-4a4a-928c-40efc42ecb5b is ready

Resulting package

The resulting binary packages can be installed (if you have the apt repository enabled) by running one of:

apt install -t fresh-snapshots libjs-jedapt install -t fresh-snapshots node-jed

Lintian Result

Full worker log Full build log