summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2019-09-06 02:48:15 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2019-09-06 02:48:56 +0000
commit9aea0626a73811afa6ba21cb823bca941d6123b7 (patch)
tree8bb61fd36bd994ba7b3a71d50d80c51882785597
parentMerging upstream version 6.1.1+ds+~0.3.1+~4.0.0+~1.0.0+~5.0.1+ds+~1.6.2+ds. (diff)
downloadacorn-9aea0626a73811afa6ba21cb823bca941d6123b7.tar.xz
acorn-9aea0626a73811afa6ba21cb823bca941d6123b7.zip
Merging debian version 6.1.1+ds+~0.3.1+~4.0.0+~1.0.0+~5.0.1+ds+~1.6.2+ds-1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
-rw-r--r--debian/.git-dpm24
-rw-r--r--debian/changelog13
-rw-r--r--debian/components/copyright150
-rw-r--r--debian/components/docs1
-rw-r--r--debian/components/module-node-acorn-dynamic-import/copyright4
-rw-r--r--debian/components/module-node-acorn-jsx/copyright8
-rw-r--r--debian/components/module-node-acorn-jsx/version1
-rw-r--r--debian/components/node-acorn-bigint/copyright (renamed from debian/components/module-node-acorn-bigint/copyright)2
-rw-r--r--debian/components/node-acorn-bigint/install (renamed from debian/components/module-node-acorn-bigint/install)0
-rw-r--r--debian/components/node-acorn-bigint/version (renamed from debian/components/module-node-acorn-bigint/version)0
-rw-r--r--debian/components/node-acorn-dynamic-import/copyright4
-rw-r--r--debian/components/node-acorn-dynamic-import/install (renamed from debian/components/module-node-acorn-dynamic-import/install)0
-rw-r--r--debian/components/node-acorn-dynamic-import/version (renamed from debian/components/module-node-acorn-dynamic-import/version)0
-rw-r--r--debian/components/node-acorn-import-meta/copyright (renamed from debian/components/module-node-acorn-import-meta/copyright)2
-rw-r--r--debian/components/node-acorn-import-meta/install (renamed from debian/components/module-node-acorn-import-meta/install)0
-rw-r--r--debian/components/node-acorn-import-meta/version (renamed from debian/components/module-node-acorn-import-meta/version)0
-rw-r--r--debian/components/node-acorn-jsx/copyright3
-rw-r--r--debian/components/node-acorn-jsx/install (renamed from debian/components/module-node-acorn-jsx/install)0
-rw-r--r--debian/components/node-acorn-node/copyright (renamed from debian/components/module-node-acorn-node/copyright)2
-rw-r--r--debian/components/node-acorn-node/install (renamed from debian/components/module-node-acorn-node/install)1
-rw-r--r--debian/components/node-acorn-node/version (renamed from debian/components/module-node-acorn-node/version)0
-rw-r--r--debian/control11
-rw-r--r--debian/copyright173
-rw-r--r--debian/copyright.in173
-rw-r--r--debian/node-debbundle-acorn.install19
-rw-r--r--debian/node-debbundle-acorn.links (renamed from debian/node-acorn.links)0
-rw-r--r--debian/node-debbundle-acorn.manpages (renamed from debian/node-acorn.manpages)0
-rw-r--r--debian/patches/0001-Use-babel-if-needed.patch199
-rw-r--r--debian/patches/0002-Transpile-for-node-v8.patch26
-rw-r--r--debian/patches/0003-Do-not-transcode-lib-for-node-acorn-node.patch30
-rw-r--r--debian/patches/series3
-rwxr-xr-xdebian/rules239
-rw-r--r--debian/source/lintian-overrides5
-rwxr-xr-xdebian/tests/walk.js4
-rw-r--r--debian/watch42
35 files changed, 762 insertions, 377 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm
index fdd1ae1..5bfd62e 100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@ -1,13 +1,13 @@
# see git-dpm(1) from git-dpm package
-f1d8ff2d11221f403c4cdaea6a9b54a6036d0d64
-f1d8ff2d11221f403c4cdaea6a9b54a6036d0d64
-f1d8ff2d11221f403c4cdaea6a9b54a6036d0d64
-f1d8ff2d11221f403c4cdaea6a9b54a6036d0d64
-acorn_6.0.2+20181021git007b08d01eff070+ds+~0.3.1+~4.0.0+~0.3.0+~5.0.0+ds+~1.6.1+ds.orig.tar.xz
-4ff716ff262b8550774121b03a2b4b00c56d05b4
-117176
-component:478480bba81bcc5ff7bd6f86d9111dd2e00013aa:6145:acorn_6.0.2+20181021git007b08d01eff070+ds+~0.3.1+~4.0.0+~0.3.0+~5.0.0+ds+~1.6.1+ds.orig-module-node-acorn-bigint.tar.gz
-component:8d93b889861ab1821183e9d9e50d5ee4d5c3d4ab:14740:acorn_6.0.2+20181021git007b08d01eff070+ds+~0.3.1+~4.0.0+~0.3.0+~5.0.0+ds+~1.6.1+ds.orig-module-node-acorn-jsx.tar.xz
-component:e92eb38ea3d8e595f386e11953fef09b32183331:43887:acorn_6.0.2+20181021git007b08d01eff070+ds+~0.3.1+~4.0.0+~0.3.0+~5.0.0+ds+~1.6.1+ds.orig-module-node-acorn-dynamic-import.tar.gz
-component:365ba3575f8a1b4e4c0000e1c50d82db9d100857:6114:acorn_6.0.2+20181021git007b08d01eff070+ds+~0.3.1+~4.0.0+~0.3.0+~5.0.0+ds+~1.6.1+ds.orig-module-node-acorn-import-meta.tar.gz
-component:ce62892ae7fc5c893837e4a123a1ff6eb0f904ac:4936:acorn_6.0.2+20181021git007b08d01eff070+ds+~0.3.1+~4.0.0+~0.3.0+~5.0.0+ds+~1.6.1+ds.orig-module-node-acorn-node.tar.xz
+a2264c0f63a069c4c56bad1aa50ca811763a4a93
+a2264c0f63a069c4c56bad1aa50ca811763a4a93
+5ed08644deb6b49f54e48566f27be005ac46538b
+5ed08644deb6b49f54e48566f27be005ac46538b
+acorn_6.1.1+ds+~0.3.1+~4.0.0+~1.0.0+~5.0.1+ds+~1.6.2+ds.orig.tar.xz
+09ad7ff3083ecb2f30ba0f65a7445f3a5cd43d67
+107256
+component:478480bba81bcc5ff7bd6f86d9111dd2e00013aa:6145:acorn_6.1.1+ds+~0.3.1+~4.0.0+~1.0.0+~5.0.1+ds+~1.6.2+ds.orig-node-acorn-bigint.tar.gz
+component:e92eb38ea3d8e595f386e11953fef09b32183331:43887:acorn_6.1.1+ds+~0.3.1+~4.0.0+~1.0.0+~5.0.1+ds+~1.6.2+ds.orig-node-acorn-dynamic-import.tar.gz
+component:4f0e428674f73e8860341922b6923ffedae9647b:6184:acorn_6.1.1+ds+~0.3.1+~4.0.0+~1.0.0+~5.0.1+ds+~1.6.2+ds.orig-node-acorn-import-meta.tar.gz
+component:7e8a36dea40f2e7d696c7da16b7793afa9f97be1:8440:acorn_6.1.1+ds+~0.3.1+~4.0.0+~1.0.0+~5.0.1+ds+~1.6.2+ds.orig-node-acorn-jsx.tar.xz
+component:fbbb5255518c392329f80cd5c53a5c63ac90c637:4964:acorn_6.1.1+ds+~0.3.1+~4.0.0+~1.0.0+~5.0.1+ds+~1.6.2+ds.orig-node-acorn-node.tar.xz
diff --git a/debian/changelog b/debian/changelog
index f1d178e..bb329e8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+acorn (6.1.1+ds+~0.3.1+~4.0.0+~1.0.0+~5.0.1+ds+~1.6.2+ds-1) experimental; urgency=medium
+
+ * New upstream version of acorn and acorn-node
+ * Remove module to node-* instead of module-node-*
+
+ -- Bastien Roucariès <rouca@debian.org> Sat, 30 Mar 2019 17:14:45 +0100
+
+acorn (6.0.2+20181021git007b08d01eff070+ds+~0.3.1+~4.0.0+~0.3.0+~5.0.0+ds+~1.6.1+ds-2) experimental; urgency=medium
+
+ * Move acorn to debbundle package
+
+ -- Bastien Roucariès <rouca@debian.org> Tue, 30 Oct 2018 10:43:32 +0100
+
acorn (6.0.2+20181021git007b08d01eff070+ds+~0.3.1+~4.0.0+~0.3.0+~5.0.0+ds+~1.6.1+ds-1~progress5+u1) engywuck-backports; urgency=medium
* Uploading to engywuck-backports, remaining changes:
diff --git a/debian/components/copyright b/debian/components/copyright
index 732e34c..d7de04d 100644
--- a/debian/components/copyright
+++ b/debian/components/copyright
@@ -2,77 +2,101 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: acorn
Upstream-Contact: https://github.com/ternjs/acorn/issues
Source: https://github.com/ternjs/acorn
-Files-Excluded: dist/*.map dist/*.js dist/*.mjs test/bench/*
-Files-Excluded-module-node-acorn: lib/*
+Files-Excluded: dist/*.map dist/*.js dist/*.mjs test/bench/* bin/*262* test/tests.js
+Files-Excluded-node-acorn-node: lib/*
+Files-Excluded-node-acorn-jsx: test/tests-jsx.js
Comment: Do not use already build or minified file
Files: *
-Copyright: 2012-2018 Adrian Rakovsky
- Alistair Braidwood
- Amila Welihinda
- Andres Suarez
- Angelo
- Aparajita Fishman
- Arian Stolwijk
- Artem Govorov
- Brandon Mills
- Charles Hughes
- Conrad Irwin
- Daniel Tschinder
- David Bonnet
- Domenico Matteo
- Forbes Lindesay
- Gilad Peleg
- impinball
- Ingvar Stepanyan
- Jackson Ray Hamilton
- Jesse McCarthy
- Jiaxing Wang
- Joel Kemp
- Johannes Herr
- Jordan Klassen
- Jürg Lehni
- keeyipchan
- Keheliya Gallaba
- Kevin Irish
- Kevin Kwok
- krator
- luckyzeng
- Marijn Haverbeke
- Martin Carlberg
- Mathias Bynens
- Mathieu 'p01' Henri
- Matthew Bastien
- Max Schaefer
- Max Zerzouri
- Mihai Bazon
- Mike Rennie
- Nicholas C. Zakas
- Nick Fitzgerald
- Olivier Thomann
- Oskar Schöldström
- Paul Harper
- Peter Rust
- PlNG
- Prayag Verma
- ReadmeCritic
- Renée Koi
- r-e-d
- Richard Gibson
- Rich Harris
- Sebastian McKenzie
- Simen Bekkhus
- Timothy Gu
- Toru Nagashima
- zsjforcn
+Copyright: 2012-2019 Adrian Heine
+ 2012-2019 Adrian Rakovsky
+ 2012-2019 Alistair Braidwood
+ 2012-2019 Amila Welihinda
+ 2012-2019 Andres Suarez
+ 2012-2019 Angelo
+ 2012-2019 Aparajita Fishman
+ 2012-2019 Arian Stolwijk
+ 2012-2019 Artem Govorov
+ 2012-2019 Ben Page
+ 2012-2019 Boopesh Mahendran
+ 2012-2019 Bradley Heinz
+ 2012-2019 Brandon Mills
+ 2012-2019 Brian Donovan
+ 2012-2019 Charles Hughes
+ 2012-2019 Charmander
+ 2012-2019 Chris McKnight
+ 2012-2019 Conrad Irwin
+ 2012-2019 Daniel Tschinder
+ 2012-2019 David Bonnet
+ 2012-2019 Domenico Matteo
+ 2012-2019 ehmicky
+ 2012-2019 Eugene Obrezkov
+ 2012-2019 Fabien LOISON
+ 2012-2019 Felix Maier
+ 2012-2019 Forbes Lindesay
+ 2012-2019 Gilad Peleg
+ 2012-2019 impinball
+ 2012-2019 Ingvar Stepanyan
+ 2012-2019 Jackson Ray Hamilton
+ 2012-2019 Jesse McCarthy
+ 2012-2019 Jiaxing Wang
+ 2012-2019 Joel Kemp
+ 2012-2019 Johannes Herr
+ 2012-2019 John-David Dalton
+ 2012-2019 Jordan Klassen
+ 2012-2019 Jürg Lehni
+ 2012-2019 Kai Cataldo
+ 2012-2019 keeyipchan
+ 2012-2019 Keheliya Gallaba
+ 2012-2019 Kevin Irish
+ 2012-2019 Kevin Kwok
+ 2012-2019 krator
+ 2012-2019 kyranet
+ 2012-2019 laosb
+ 2012-2019 luckyzeng
+ 2012-2019 Marek
+ 2012-2019 Marijn Haverbeke
+ 2012-2019 Martin Carlberg
+ 2012-2019 Mat Garcia
+ 2012-2019 Mathias Bynens
+ 2012-2019 Mathieu 'p01' Henri
+ 2012-2019 Matthew Bastien
+ 2012-2019 Max Schaefer
+ 2012-2019 Max Zerzouri
+ 2012-2019 Mihai Bazon
+ 2012-2019 Mike Rennie
+ 2012-2019 naoh
+ 2012-2019 Nicholas C. Zakas
+ 2012-2019 Nick Fitzgerald
+ 2012-2019 Olivier Thomann
+ 2012-2019 Oskar Schöldström
+ 2012-2019 Paul Harper
+ 2012-2019 Peter Rust
+ 2012-2019 PlNG
+ 2012-2019 Prayag Verma
+ 2012-2019 ReadmeCritic
+ 2012-2019 r-e-d
+ 2012-2019 Renée Kooi
+ 2012-2019 Richard Gibson
+ 2012-2019 Rich Harris
+ 2012-2019 Sebastian McKenzie
+ 2012-2019 Shahar Soel
+ 2012-2019 Sheel Bedi
+ 2012-2019 Simen Bekkhus
+ 2012-2019 Teddy Katz
+ 2012-2019 Timothy Gu
+ 2012-2019 Toru Nagashima
+ 2012-2019 Victor Homyakov
+ 2012-2019 Wexpo Lyu
+ 2012-2019 zsjforcn
License: Expat
Files: test/tests-harmony.js
Copyright: 2015 Ingvar Stepanyan
- 2011-2012 Ariya Hidayat
+ 2012 Ariya Hidayat
2012 Joost-Wim Boekesteijn
- 2011-2012 Yusuke Suzuki
- 2011-2012 Apad Borsos
+ 2011,2012 Yusuke Suzuki
+ 2011,2012 Apad Borsos
License: BSD-2-clause
Files: debian/*
diff --git a/debian/components/docs b/debian/components/docs
deleted file mode 100644
index b43bf86..0000000
--- a/debian/components/docs
+++ /dev/null
@@ -1 +0,0 @@
-README.md
diff --git a/debian/components/module-node-acorn-dynamic-import/copyright b/debian/components/module-node-acorn-dynamic-import/copyright
deleted file mode 100644
index 226f787..0000000
--- a/debian/components/module-node-acorn-dynamic-import/copyright
+++ /dev/null
@@ -1,4 +0,0 @@
-Files: module-node-acorn-dynamic-import/*
-Copyright: 2017-2018 Jordan Gensler <jordangens@gmail.com>
-License: Expat
-Comment: https://github.com/kesne/acorn-dynamic-import/
diff --git a/debian/components/module-node-acorn-jsx/copyright b/debian/components/module-node-acorn-jsx/copyright
deleted file mode 100644
index 3503a20..0000000
--- a/debian/components/module-node-acorn-jsx/copyright
+++ /dev/null
@@ -1,8 +0,0 @@
-Files: module-node-acorn-jsx/*
-Copyright: 2012-2018 Ingvar Stepanyan
-License: Expat
-
-Files: module-node-acorn-jsx/test/tests-jsx.js
-Copyright: 2012-2O17, Ariya Hidayat
-License: BSD-2
-Comment: Taken and adapted from esprima-fb/fbtest.js
diff --git a/debian/components/module-node-acorn-jsx/version b/debian/components/module-node-acorn-jsx/version
deleted file mode 100644
index 8687bfd..0000000
--- a/debian/components/module-node-acorn-jsx/version
+++ /dev/null
@@ -1 +0,0 @@
-5.0.0+ds
diff --git a/debian/components/module-node-acorn-bigint/copyright b/debian/components/node-acorn-bigint/copyright
index d40aba5..144ac02 100644
--- a/debian/components/module-node-acorn-bigint/copyright
+++ b/debian/components/node-acorn-bigint/copyright
@@ -1,4 +1,4 @@
-Files: module-node-acorn-bigint/*
+Files: node-acorn-bigint/*
Copyright: 2017-2018 by Adrian Heine
License: Expat
Comment: https://github.com/acornjs/acorn-bigint
diff --git a/debian/components/module-node-acorn-bigint/install b/debian/components/node-acorn-bigint/install
index f02bd37..f02bd37 100644
--- a/debian/components/module-node-acorn-bigint/install
+++ b/debian/components/node-acorn-bigint/install
diff --git a/debian/components/module-node-acorn-bigint/version b/debian/components/node-acorn-bigint/version
index 0d91a54..0d91a54 100644
--- a/debian/components/module-node-acorn-bigint/version
+++ b/debian/components/node-acorn-bigint/version
diff --git a/debian/components/node-acorn-dynamic-import/copyright b/debian/components/node-acorn-dynamic-import/copyright
new file mode 100644
index 0000000..d0975be
--- /dev/null
+++ b/debian/components/node-acorn-dynamic-import/copyright
@@ -0,0 +1,4 @@
+Files: node-acorn-dynamic-import/*
+Copyright: 2016 Jordan Gensler <jordangens@gmail.com>
+License: Expat
+Comment: https://github.com/kesne/acorn-dynamic-import/
diff --git a/debian/components/module-node-acorn-dynamic-import/install b/debian/components/node-acorn-dynamic-import/install
index b21c824..b21c824 100644
--- a/debian/components/module-node-acorn-dynamic-import/install
+++ b/debian/components/node-acorn-dynamic-import/install
diff --git a/debian/components/module-node-acorn-dynamic-import/version b/debian/components/node-acorn-dynamic-import/version
index 4a36342..4a36342 100644
--- a/debian/components/module-node-acorn-dynamic-import/version
+++ b/debian/components/node-acorn-dynamic-import/version
diff --git a/debian/components/module-node-acorn-import-meta/copyright b/debian/components/node-acorn-import-meta/copyright
index 56e1b6e..af53984 100644
--- a/debian/components/module-node-acorn-import-meta/copyright
+++ b/debian/components/node-acorn-import-meta/copyright
@@ -1,4 +1,4 @@
-Files: module-node-acorn-import-meta/*
+Files: node-acorn-import-meta/*
Copyright: 2017-2018 by Adrian Heine
License: Expat
Comment: https://github.com/acornjs/acorn-meta-import
diff --git a/debian/components/module-node-acorn-import-meta/install b/debian/components/node-acorn-import-meta/install
index 58d2a13..58d2a13 100644
--- a/debian/components/module-node-acorn-import-meta/install
+++ b/debian/components/node-acorn-import-meta/install
diff --git a/debian/components/module-node-acorn-import-meta/version b/debian/components/node-acorn-import-meta/version
index 0d91a54..0d91a54 100644
--- a/debian/components/module-node-acorn-import-meta/version
+++ b/debian/components/node-acorn-import-meta/version
diff --git a/debian/components/node-acorn-jsx/copyright b/debian/components/node-acorn-jsx/copyright
new file mode 100644
index 0000000..092f23b
--- /dev/null
+++ b/debian/components/node-acorn-jsx/copyright
@@ -0,0 +1,3 @@
+Files: node-acorn-jsx/*
+Copyright: 2012-2018 Ingvar Stepanyan
+License: Expat
diff --git a/debian/components/module-node-acorn-jsx/install b/debian/components/node-acorn-jsx/install
index ecaf7ac..ecaf7ac 100644
--- a/debian/components/module-node-acorn-jsx/install
+++ b/debian/components/node-acorn-jsx/install
diff --git a/debian/components/module-node-acorn-node/copyright b/debian/components/node-acorn-node/copyright
index 40e6e79..e9d7dce 100644
--- a/debian/components/module-node-acorn-node/copyright
+++ b/debian/components/node-acorn-node/copyright
@@ -1,4 +1,4 @@
-Files: module-node-acorn-node/*
+Files: node-acorn-node/*
Copyright: 2018 Renée Kooi <renee@kooi.me>
License: Apache-2.0
Comment: From https://github.com/browserify/acorn-node
diff --git a/debian/components/module-node-acorn-node/install b/debian/components/node-acorn-node/install
index 52cc42e..107f858 100644
--- a/debian/components/module-node-acorn-node/install
+++ b/debian/components/node-acorn-node/install
@@ -1,4 +1,3 @@
package.json usr/lib/nodejs/acorn-node/
index.js usr/lib/nodejs/acorn-node/
walk.js usr/lib/nodejs/acorn-node/
-lib usr/lib/nodejs/acorn-node
diff --git a/debian/components/module-node-acorn-node/version b/debian/components/node-acorn-node/version
index f0bb29e..f0bb29e 100644
--- a/debian/components/module-node-acorn-node/version
+++ b/debian/components/node-acorn-node/version
diff --git a/debian/control b/debian/control
index 0880767..636ce6e 100644
--- a/debian/control
+++ b/debian/control
@@ -13,6 +13,7 @@ Build-Depends: debhelper (>= 11),
node-graceful-fs,
nodejs (>= 6),
rollup (>= 0.45),
+ node-rollup-plugin-babel,
node-unicode-11.0.0,
node-babel-preset-latest,
node-babel-preset-airbnb,
@@ -21,18 +22,19 @@ Build-Depends: debhelper (>= 11),
node-tape (>= 4.8) <!nocheck>,
node-tap (>= 10) <!nocheck>,
mocha (>= 4) <!nocheck>
-Standards-Version: 4.1.5
+Standards-Version: 4.3.0
Vcs-Browser: https://git.progress-linux.org/distributions/engywuck-backports/packages/acorn
Vcs-Git: https://git.progress-linux.org/distributions/engywuck-backports/packages/acorn
XSBC-Original-Vcs-Browser: https://salsa.debian.org/js-team/acorn
XSBC-Original-Vcs-Git: https://salsa.debian.org/js-team/acorn.git
Homepage: https://github.com/ternjs/acorn/
-Package: node-acorn
+Package: node-debbundle-acorn
Architecture: all
Depends: nodejs (>= 6), ${misc:Depends},
node-xtend (>= 4.0.1)
Provides:
+ node-acorn (=6.0.2+20181021git007b08d01eff070+ds),
node-acorn-bigint (=0.3.1),
node-acorn-dynamic-import (=4.0.0),
node-acorn-import-meta (=0.3.0),
@@ -41,9 +43,8 @@ Provides:
node-types-acorn (=6.0.2+20181021git007b08d01eff070+ds),
node-acorn-walk (=6.0.2+20181021git007b08d01eff070+ds),
node-acorn-loose (=6.0.2+20181021git007b08d01eff070+ds)
-Replaces: node-acorn-dynamic-import (<< 4.0.0~), node-acorn-jsx (<< 5.0.0~)
-Breaks: node-acorn-dynamic-import (<< 4.0.0~), node-acorn-jsx (<< 5.0.0~)
-Conflicts: node-acorn-dynamic-import (<< 4.0.0~), node-acorn-jsx (<< 5.0.0~)
+Replaces: node-acorn-dynamic-import (<< 4.0.0~), node-acorn-jsx (<< 5.0.0~), node-acorn (<< 6.0.2+20181021git007b08d01eff070+ds+~0.3.1+~4.0.0+~0.3.0+~5.0.0+ds+~1.6.1+ds-2~)
+Breaks: node-acorn-dynamic-import (<< 4.0.0~), node-acorn-jsx (<< 5.0.0~), node-acorn (<< 6.0.2+20181021git007b08d01eff070+ds+~0.3.1+~4.0.0+~0.3.0+~5.0.0+ds+~1.6.1+ds-2~)
Description: ECMAScript parser for Node.js
Acorn is a tiny, fast JavaScript parser written in JavaScript.
.
diff --git a/debian/copyright b/debian/copyright
index 785ec72..1600339 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,77 +2,101 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: acorn
Upstream-Contact: https://github.com/ternjs/acorn/issues
Source: https://github.com/ternjs/acorn
-Files-Excluded: dist/*.map dist/*.js dist/*.mjs test/bench/*
-Files-Excluded-module-node-acorn: lib/*
+Files-Excluded: dist/*.map dist/*.js dist/*.mjs test/bench/* bin/*262* test/tests.js
+Files-Excluded-node-acorn-node: lib/*
+Files-Excluded-node-acorn-jsx: test/tests-jsx.js
Comment: Do not use already build or minified file
Files: *
-Copyright: 2012-2018 Adrian Rakovsky
- Alistair Braidwood
- Amila Welihinda
- Andres Suarez
- Angelo
- Aparajita Fishman
- Arian Stolwijk
- Artem Govorov
- Brandon Mills
- Charles Hughes
- Conrad Irwin
- Daniel Tschinder
- David Bonnet
- Domenico Matteo
- Forbes Lindesay
- Gilad Peleg
- impinball
- Ingvar Stepanyan
- Jackson Ray Hamilton
- Jesse McCarthy
- Jiaxing Wang
- Joel Kemp
- Johannes Herr
- Jordan Klassen
- Jürg Lehni
- keeyipchan
- Keheliya Gallaba
- Kevin Irish
- Kevin Kwok
- krator
- luckyzeng
- Marijn Haverbeke
- Martin Carlberg
- Mathias Bynens
- Mathieu 'p01' Henri
- Matthew Bastien
- Max Schaefer
- Max Zerzouri
- Mihai Bazon
- Mike Rennie
- Nicholas C. Zakas
- Nick Fitzgerald
- Olivier Thomann
- Oskar Schöldström
- Paul Harper
- Peter Rust
- PlNG
- Prayag Verma
- ReadmeCritic
- Renée Koi
- r-e-d
- Richard Gibson
- Rich Harris
- Sebastian McKenzie
- Simen Bekkhus
- Timothy Gu
- Toru Nagashima
- zsjforcn
+Copyright: 2012-2019 Adrian Heine
+ 2012-2019 Adrian Rakovsky
+ 2012-2019 Alistair Braidwood
+ 2012-2019 Amila Welihinda
+ 2012-2019 Andres Suarez
+ 2012-2019 Angelo
+ 2012-2019 Aparajita Fishman
+ 2012-2019 Arian Stolwijk
+ 2012-2019 Artem Govorov
+ 2012-2019 Ben Page
+ 2012-2019 Boopesh Mahendran
+ 2012-2019 Bradley Heinz
+ 2012-2019 Brandon Mills
+ 2012-2019 Brian Donovan
+ 2012-2019 Charles Hughes
+ 2012-2019 Charmander
+ 2012-2019 Chris McKnight
+ 2012-2019 Conrad Irwin
+ 2012-2019 Daniel Tschinder
+ 2012-2019 David Bonnet
+ 2012-2019 Domenico Matteo
+ 2012-2019 ehmicky
+ 2012-2019 Eugene Obrezkov
+ 2012-2019 Fabien LOISON
+ 2012-2019 Felix Maier
+ 2012-2019 Forbes Lindesay
+ 2012-2019 Gilad Peleg
+ 2012-2019 impinball
+ 2012-2019 Ingvar Stepanyan
+ 2012-2019 Jackson Ray Hamilton
+ 2012-2019 Jesse McCarthy
+ 2012-2019 Jiaxing Wang
+ 2012-2019 Joel Kemp
+ 2012-2019 Johannes Herr
+ 2012-2019 John-David Dalton
+ 2012-2019 Jordan Klassen
+ 2012-2019 Jürg Lehni
+ 2012-2019 Kai Cataldo
+ 2012-2019 keeyipchan
+ 2012-2019 Keheliya Gallaba
+ 2012-2019 Kevin Irish
+ 2012-2019 Kevin Kwok
+ 2012-2019 krator
+ 2012-2019 kyranet
+ 2012-2019 laosb
+ 2012-2019 luckyzeng
+ 2012-2019 Marek
+ 2012-2019 Marijn Haverbeke
+ 2012-2019 Martin Carlberg
+ 2012-2019 Mat Garcia
+ 2012-2019 Mathias Bynens
+ 2012-2019 Mathieu 'p01' Henri
+ 2012-2019 Matthew Bastien
+ 2012-2019 Max Schaefer
+ 2012-2019 Max Zerzouri
+ 2012-2019 Mihai Bazon
+ 2012-2019 Mike Rennie
+ 2012-2019 naoh
+ 2012-2019 Nicholas C. Zakas
+ 2012-2019 Nick Fitzgerald
+ 2012-2019 Olivier Thomann
+ 2012-2019 Oskar Schöldström
+ 2012-2019 Paul Harper
+ 2012-2019 Peter Rust
+ 2012-2019 PlNG
+ 2012-2019 Prayag Verma
+ 2012-2019 ReadmeCritic
+ 2012-2019 r-e-d
+ 2012-2019 Renée Kooi
+ 2012-2019 Richard Gibson
+ 2012-2019 Rich Harris
+ 2012-2019 Sebastian McKenzie
+ 2012-2019 Shahar Soel
+ 2012-2019 Sheel Bedi
+ 2012-2019 Simen Bekkhus
+ 2012-2019 Teddy Katz
+ 2012-2019 Timothy Gu
+ 2012-2019 Toru Nagashima
+ 2012-2019 Victor Homyakov
+ 2012-2019 Wexpo Lyu
+ 2012-2019 zsjforcn
License: Expat
Files: test/tests-harmony.js
Copyright: 2015 Ingvar Stepanyan
- 2011-2012 Ariya Hidayat
+ 2012 Ariya Hidayat
2012 Joost-Wim Boekesteijn
- 2011-2012 Yusuke Suzuki
- 2011-2012 Apad Borsos
+ 2011,2012 Yusuke Suzuki
+ 2011,2012 Apad Borsos
License: BSD-2-clause
Files: debian/*
@@ -80,37 +104,32 @@ Copyright: 2016-2018 Julien Puydt <jpuydt@debian.org>
2017-2018 Bastien Roucariès
License: Expat
-Files: module-node-acorn-bigint/*
+Files: node-acorn-bigint/*
Copyright: 2017-2018 by Adrian Heine
License: Expat
Comment: https://github.com/acornjs/acorn-bigint
-Files: module-node-acorn-dynamic-import/*
-Copyright: 2017-2018 Jordan Gensler <jordangens@gmail.com>
+Files: node-acorn-dynamic-import/*
+Copyright: 2016 Jordan Gensler <jordangens@gmail.com>
License: Expat
Comment: https://github.com/kesne/acorn-dynamic-import/
-Files: module-node-acorn-import-meta/*
+Files: node-acorn-import-meta/*
Copyright: 2017-2018 by Adrian Heine
License: Expat
Comment: https://github.com/acornjs/acorn-meta-import
-Files: module-node-acorn-node/*
+Files: node-acorn-jsx/*
+Copyright: 2012-2018 Ingvar Stepanyan
+License: Expat
+
+Files: node-acorn-node/*
Copyright: 2018 Renée Kooi <renee@kooi.me>
License: Apache-2.0
Comment: From https://github.com/browserify/acorn-node
the lib/ directory was removed in old version so LICENSE file is out
of date and this package is only apache-2.0
-Files: module-node-acorn-jsx/*
-Copyright: 2012-2018 Ingvar Stepanyan
-License: Expat
-
-Files: module-node-acorn-jsx/test/tests-jsx.js
-Copyright: 2012-2O17, Ariya Hidayat
-License: BSD-2
-Comment: Taken and adapted from esprima-fb/fbtest.js
-
License: Apache-2.0
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/debian/copyright.in b/debian/copyright.in
index 785ec72..1600339 100644
--- a/debian/copyright.in
+++ b/debian/copyright.in
@@ -2,77 +2,101 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: acorn
Upstream-Contact: https://github.com/ternjs/acorn/issues
Source: https://github.com/ternjs/acorn
-Files-Excluded: dist/*.map dist/*.js dist/*.mjs test/bench/*
-Files-Excluded-module-node-acorn: lib/*
+Files-Excluded: dist/*.map dist/*.js dist/*.mjs test/bench/* bin/*262* test/tests.js
+Files-Excluded-node-acorn-node: lib/*
+Files-Excluded-node-acorn-jsx: test/tests-jsx.js
Comment: Do not use already build or minified file
Files: *
-Copyright: 2012-2018 Adrian Rakovsky
- Alistair Braidwood
- Amila Welihinda
- Andres Suarez
- Angelo
- Aparajita Fishman
- Arian Stolwijk
- Artem Govorov
- Brandon Mills
- Charles Hughes
- Conrad Irwin
- Daniel Tschinder
- David Bonnet
- Domenico Matteo
- Forbes Lindesay
- Gilad Peleg
- impinball
- Ingvar Stepanyan
- Jackson Ray Hamilton
- Jesse McCarthy
- Jiaxing Wang
- Joel Kemp
- Johannes Herr
- Jordan Klassen
- Jürg Lehni
- keeyipchan
- Keheliya Gallaba
- Kevin Irish
- Kevin Kwok
- krator
- luckyzeng
- Marijn Haverbeke
- Martin Carlberg
- Mathias Bynens
- Mathieu 'p01' Henri
- Matthew Bastien
- Max Schaefer
- Max Zerzouri
- Mihai Bazon
- Mike Rennie
- Nicholas C. Zakas
- Nick Fitzgerald
- Olivier Thomann
- Oskar Schöldström
- Paul Harper
- Peter Rust
- PlNG
- Prayag Verma
- ReadmeCritic
- Renée Koi
- r-e-d
- Richard Gibson
- Rich Harris
- Sebastian McKenzie
- Simen Bekkhus
- Timothy Gu
- Toru Nagashima
- zsjforcn
+Copyright: 2012-2019 Adrian Heine
+ 2012-2019 Adrian Rakovsky
+ 2012-2019 Alistair Braidwood
+ 2012-2019 Amila Welihinda
+ 2012-2019 Andres Suarez
+ 2012-2019 Angelo
+ 2012-2019 Aparajita Fishman
+ 2012-2019 Arian Stolwijk
+ 2012-2019 Artem Govorov
+ 2012-2019 Ben Page
+ 2012-2019 Boopesh Mahendran
+ 2012-2019 Bradley Heinz
+ 2012-2019 Brandon Mills
+ 2012-2019 Brian Donovan
+ 2012-2019 Charles Hughes
+ 2012-2019 Charmander
+ 2012-2019 Chris McKnight
+ 2012-2019 Conrad Irwin
+ 2012-2019 Daniel Tschinder
+ 2012-2019 David Bonnet
+ 2012-2019 Domenico Matteo
+ 2012-2019 ehmicky
+ 2012-2019 Eugene Obrezkov
+ 2012-2019 Fabien LOISON
+ 2012-2019 Felix Maier
+ 2012-2019 Forbes Lindesay
+ 2012-2019 Gilad Peleg
+ 2012-2019 impinball
+ 2012-2019 Ingvar Stepanyan
+ 2012-2019 Jackson Ray Hamilton
+ 2012-2019 Jesse McCarthy
+ 2012-2019 Jiaxing Wang
+ 2012-2019 Joel Kemp
+ 2012-2019 Johannes Herr
+ 2012-2019 John-David Dalton
+ 2012-2019 Jordan Klassen
+ 2012-2019 Jürg Lehni
+ 2012-2019 Kai Cataldo
+ 2012-2019 keeyipchan
+ 2012-2019 Keheliya Gallaba
+ 2012-2019 Kevin Irish
+ 2012-2019 Kevin Kwok
+ 2012-2019 krator
+ 2012-2019 kyranet
+ 2012-2019 laosb
+ 2012-2019 luckyzeng
+ 2012-2019 Marek
+ 2012-2019 Marijn Haverbeke
+ 2012-2019 Martin Carlberg
+ 2012-2019 Mat Garcia
+ 2012-2019 Mathias Bynens
+ 2012-2019 Mathieu 'p01' Henri
+ 2012-2019 Matthew Bastien
+ 2012-2019 Max Schaefer
+ 2012-2019 Max Zerzouri
+ 2012-2019 Mihai Bazon
+ 2012-2019 Mike Rennie
+ 2012-2019 naoh
+ 2012-2019 Nicholas C. Zakas
+ 2012-2019 Nick Fitzgerald
+ 2012-2019 Olivier Thomann
+ 2012-2019 Oskar Schöldström
+ 2012-2019 Paul Harper
+ 2012-2019 Peter Rust
+ 2012-2019 PlNG
+ 2012-2019 Prayag Verma
+ 2012-2019 ReadmeCritic
+ 2012-2019 r-e-d
+ 2012-2019 Renée Kooi
+ 2012-2019 Richard Gibson
+ 2012-2019 Rich Harris
+ 2012-2019 Sebastian McKenzie
+ 2012-2019 Shahar Soel
+ 2012-2019 Sheel Bedi
+ 2012-2019 Simen Bekkhus
+ 2012-2019 Teddy Katz
+ 2012-2019 Timothy Gu
+ 2012-2019 Toru Nagashima
+ 2012-2019 Victor Homyakov
+ 2012-2019 Wexpo Lyu
+ 2012-2019 zsjforcn
License: Expat
Files: test/tests-harmony.js
Copyright: 2015 Ingvar Stepanyan
- 2011-2012 Ariya Hidayat
+ 2012 Ariya Hidayat
2012 Joost-Wim Boekesteijn
- 2011-2012 Yusuke Suzuki
- 2011-2012 Apad Borsos
+ 2011,2012 Yusuke Suzuki
+ 2011,2012 Apad Borsos
License: BSD-2-clause
Files: debian/*
@@ -80,37 +104,32 @@ Copyright: 2016-2018 Julien Puydt <jpuydt@debian.org>
2017-2018 Bastien Roucariès
License: Expat
-Files: module-node-acorn-bigint/*
+Files: node-acorn-bigint/*
Copyright: 2017-2018 by Adrian Heine
License: Expat
Comment: https://github.com/acornjs/acorn-bigint
-Files: module-node-acorn-dynamic-import/*
-Copyright: 2017-2018 Jordan Gensler <jordangens@gmail.com>
+Files: node-acorn-dynamic-import/*
+Copyright: 2016 Jordan Gensler <jordangens@gmail.com>
License: Expat
Comment: https://github.com/kesne/acorn-dynamic-import/
-Files: module-node-acorn-import-meta/*
+Files: node-acorn-import-meta/*
Copyright: 2017-2018 by Adrian Heine
License: Expat
Comment: https://github.com/acornjs/acorn-meta-import
-Files: module-node-acorn-node/*
+Files: node-acorn-jsx/*
+Copyright: 2012-2018 Ingvar Stepanyan
+License: Expat
+
+Files: node-acorn-node/*
Copyright: 2018 Renée Kooi <renee@kooi.me>
License: Apache-2.0
Comment: From https://github.com/browserify/acorn-node
the lib/ directory was removed in old version so LICENSE file is out
of date and this package is only apache-2.0
-Files: module-node-acorn-jsx/*
-Copyright: 2012-2018 Ingvar Stepanyan
-License: Expat
-
-Files: module-node-acorn-jsx/test/tests-jsx.js
-Copyright: 2012-2O17, Ariya Hidayat
-License: BSD-2
-Comment: Taken and adapted from esprima-fb/fbtest.js
-
License: Apache-2.0
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
diff --git a/debian/node-debbundle-acorn.install b/debian/node-debbundle-acorn.install
new file mode 100644
index 0000000..00e4e01
--- /dev/null
+++ b/debian/node-debbundle-acorn.install
@@ -0,0 +1,19 @@
+build/acorn/dist usr/lib/nodejs/acorn/
+build/acorn-loose/dist usr/lib/nodejs/acorn-loose/
+build/acorn-walk/dist usr/lib/nodejs/acorn-walk/
+build/acorn/bin usr/lib/nodejs/acorn/
+build/acorn/package.json usr/lib/nodejs/acorn/
+build/acorn-loose/package.json usr/lib/nodejs/acorn-loose/
+build/acorn-walk/package.json usr/lib/nodejs/acorn-walk/
+
+node-acorn-bigint/package.json usr/lib/nodejs/acorn-bigint/
+node-acorn-bigint/index.js usr/lib/nodejs/acorn-bigint/
+node-acorn-dynamic-import/package.json usr/lib/nodejs/acorn-dynamic-import/
+node-acorn-dynamic-import/lib usr/lib/nodejs/acorn-dynamic-import/
+node-acorn-import-meta/package.json usr/lib/nodejs/acorn-import-meta/
+node-acorn-import-meta/index.js usr/lib/nodejs/acorn-import-meta/
+node-acorn-jsx/package.json usr/lib/nodejs/acorn-jsx/
+node-acorn-jsx/*.js usr/lib/nodejs/acorn-jsx/
+node-acorn-node/package.json usr/lib/nodejs/acorn-node/
+node-acorn-node/index.js usr/lib/nodejs/acorn-node/
+node-acorn-node/walk.js usr/lib/nodejs/acorn-node/
diff --git a/debian/node-acorn.links b/debian/node-debbundle-acorn.links
index 0378a98..0378a98 100644
--- a/debian/node-acorn.links
+++ b/debian/node-debbundle-acorn.links
diff --git a/debian/node-acorn.manpages b/debian/node-debbundle-acorn.manpages
index 13cdaf4..13cdaf4 100644
--- a/debian/node-acorn.manpages
+++ b/debian/node-debbundle-acorn.manpages
diff --git a/debian/patches/0001-Use-babel-if-needed.patch b/debian/patches/0001-Use-babel-if-needed.patch
new file mode 100644
index 0000000..c78877b
--- /dev/null
+++ b/debian/patches/0001-Use-babel-if-needed.patch
@@ -0,0 +1,199 @@
+From cbd3f96ae6e5550cc2b7242fd5be83591a6bb0d8 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=3D=3FUTF-8=3Fq=3FBastien=3D20Roucari=3DC3=3DA8s=3F=3D?=
+ <rouca@debian.org>
+Date: Sat, 29 Dec 2018 19:40:33 +0100
+Subject: Use babel if needed
+
+Transpile is somewhat fragile. Allow ones to use babel6, babel7 if needed
+
+Forwarded: no
+---
+ acorn-loose/rollup.config.js | 33 ++++++++++++++++++++++++++++++---
+ acorn-walk/rollup.config.js | 33 ++++++++++++++++++++++++++++++---
+ acorn/rollup.config.bin.js | 31 ++++++++++++++++++++++++++++++-
+ acorn/rollup.config.js | 33 ++++++++++++++++++++++++++++++---
+ 4 files changed, 120 insertions(+), 10 deletions(-)
+
+diff --git a/acorn-loose/rollup.config.js b/acorn-loose/rollup.config.js
+index e5cbc30..3a1331a 100644
+--- a/acorn-loose/rollup.config.js
++++ b/acorn-loose/rollup.config.js
+@@ -1,11 +1,38 @@
+ import buble from "rollup-plugin-buble"
++import babel from "rollup-plugin-babel"
++
++const plugins_buble = [
++ buble({transforms: {dangerousForOf: true}})
++];
++
++const plugins_babel6 = [
++ babel({
++ babelrc: false,
++ presets: [[process.env.BABEL_PRESET, { modules: false }]],
++ }),
++];
++
++const plugins_babel7 = [
++ babel(),
++];
++
++var plugins = [];
++
++switch(process.env.TRANSPILE) {
++case 'babel6':
++ plugins = plugins_babel6; break;
++case 'babel7':
++ plugins = plugins_babel7; break;
++case 'none':
++ plugins = []; break;
++default:
++ plugins = plugins_buble;
++}
+
+ export default {
+ entry: "./acorn-loose/src/index.js",
+ moduleName: "acorn.loose",
+- plugins: [
+- buble({transforms: {dangerousForOf: true}})
+- ],
++ plugins: plugins,
+ sourceMap: true,
+ targets: [
+ {dest: "acorn-loose/dist/acorn-loose.js", format: "umd"},
+diff --git a/acorn-walk/rollup.config.js b/acorn-walk/rollup.config.js
+index 2588b1c..ca9f1ba 100644
+--- a/acorn-walk/rollup.config.js
++++ b/acorn-walk/rollup.config.js
+@@ -1,11 +1,38 @@
+ import buble from "rollup-plugin-buble"
++import babel from "rollup-plugin-babel"
++
++const plugins_buble = [
++ buble({transforms: {dangerousForOf: true}})
++];
++
++const plugins_babel6 = [
++ babel({
++ babelrc: false,
++ presets: [[process.env.BABEL_PRESET, { modules: false }]],
++ }),
++];
++
++const plugins_babel7 = [
++ babel(),
++];
++
++var plugins = [];
++
++switch(process.env.TRANSPILE) {
++case 'babel6':
++ plugins = plugins_babel6; break;
++case 'babel7':
++ plugins = plugins_babel7; break;
++case 'none':
++ plugins = []; break;
++default:
++ plugins = plugins_buble;
++}
+
+ export default {
+ entry: "acorn-walk/src/index.js",
+ moduleName: "acorn.walk",
+- plugins: [
+- buble({transforms: {dangerousForOf: true}})
+- ],
++ plugins: plugins,
+ sourceMap: true,
+ targets: [
+ {dest: "acorn-walk/dist/walk.js", format: "umd"},
+diff --git a/acorn/rollup.config.bin.js b/acorn/rollup.config.bin.js
+index 19234cb..53cef1e 100644
+--- a/acorn/rollup.config.bin.js
++++ b/acorn/rollup.config.bin.js
+@@ -1,4 +1,33 @@
+ import buble from "rollup-plugin-buble"
++import babel from "rollup-plugin-babel"
++
++const plugins_buble = [
++ buble({transforms: {dangerousForOf: true}})
++];
++
++const plugins_babel6 = [
++ babel({
++ babelrc: false,
++ presets: [[process.env.BABEL_PRESET, { modules: false }]],
++ }),
++];
++
++const plugins_babel7 = [
++ babel(),
++];
++
++var plugins = [];
++
++switch(process.env.TRANSPILE) {
++case 'babel6':
++ plugins = plugins_babel6; break;
++case 'babel7':
++ plugins = plugins_babel7; break;
++case 'none':
++ plugins = []; break;
++default:
++ plugins = plugins_buble;
++}
+
+ export default {
+ entry: "acorn/src/bin/acorn.js",
+@@ -6,5 +35,5 @@ export default {
+ format: "cjs",
+ external: ["fs", "path", "acorn"],
+ paths: {acorn: "./acorn.js"},
+- plugins: [buble()]
++ plugins: plugins
+ }
+diff --git a/acorn/rollup.config.js b/acorn/rollup.config.js
+index 79dac8e..59077e3 100644
+--- a/acorn/rollup.config.js
++++ b/acorn/rollup.config.js
+@@ -1,11 +1,38 @@
+ import buble from "rollup-plugin-buble"
++import babel from "rollup-plugin-babel"
++
++const plugins_buble = [
++ buble({transforms: {dangerousForOf: true}})
++];
++
++const plugins_babel6 = [
++ babel({
++ babelrc: false,
++ presets: [[process.env.BABEL_PRESET, { modules: false }]],
++ }),
++];
++
++const plugins_babel7 = [
++ babel(),
++];
++
++var plugins = [];
++
++switch(process.env.TRANSPILE) {
++case 'babel6':
++ plugins = plugins_babel6; break;
++case 'babel7':
++ plugins = plugins_babel7; break;
++case 'none':
++ plugins = []; break;
++default:
++ plugins = plugins_buble;
++}
+
+ export default {
+ entry: "acorn/src/index.js",
+ moduleName: "acorn",
+- plugins: [
+- buble({transforms: {dangerousForOf: true}})
+- ],
++ plugins: plugins,
+ sourceMap: true,
+ targets: [
+ {dest: "acorn/dist/acorn.js", format: "umd"},
diff --git a/debian/patches/0002-Transpile-for-node-v8.patch b/debian/patches/0002-Transpile-for-node-v8.patch
new file mode 100644
index 0000000..be8fb32
--- /dev/null
+++ b/debian/patches/0002-Transpile-for-node-v8.patch
@@ -0,0 +1,26 @@
+From 72f15215cc4152f6ae9a112fb8286ba2a2911329 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=3D=3FUTF-8=3Fq=3FBastien=3D20Roucari=3DC3=3DA8s=3F=3D?=
+ <rouca@debian.org>
+Date: Sat, 29 Dec 2018 21:51:45 +0100
+Subject: Transpile for node v8
+
+Transpile acorn-dynamic to v8 only
+
+Forwarded: no
+---
+ node-acorn-dynamic-import/.babelrc | 6 +++++-
+ 1 file changed, 5 insertions(+), 1 deletion(-)
+
+diff --git a/node-acorn-dynamic-import/.babelrc b/node-acorn-dynamic-import/.babelrc
+index e0aceaa..25bbe9d 100644
+--- a/node-acorn-dynamic-import/.babelrc
++++ b/node-acorn-dynamic-import/.babelrc
+@@ -1,3 +1,7 @@
+ {
+- "presets": ["airbnb"]
++ "presets": [["airbnb", {
++ "targets": {
++ "node": 8
++ }
++ }]]
+ }
diff --git a/debian/patches/0003-Do-not-transcode-lib-for-node-acorn-node.patch b/debian/patches/0003-Do-not-transcode-lib-for-node-acorn-node.patch
new file mode 100644
index 0000000..81bb70e
--- /dev/null
+++ b/debian/patches/0003-Do-not-transcode-lib-for-node-acorn-node.patch
@@ -0,0 +1,30 @@
+From a2264c0f63a069c4c56bad1aa50ca811763a4a93 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=3D=3FUTF-8=3Fq=3FBastien=3D20Roucari=3DC3=3DA8s=3F=3D?=
+ <rouca@debian.org>
+Date: Sat, 29 Dec 2018 21:52:40 +0100
+Subject: Do not transcode lib for node-acorn-node
+
+Does not need to be transcoded: already transcoded
+
+Forwarded: no
+---
+ node-acorn-node/index.js | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/node-acorn-node/index.js b/node-acorn-node/index.js
+index 0c979c9..519bebe 100644
+--- a/node-acorn-node/index.js
++++ b/node-acorn-node/index.js
+@@ -2,10 +2,10 @@ var acorn = require('acorn')
+ var xtend = require('xtend')
+
+ var CJSParser = acorn.Parser
+- .extend(require('./lib/bigint'))
++ .extend(require('acorn-bigint'))
+ .extend(require('acorn-dynamic-import').default)
+ var ESModulesParser = CJSParser
+- .extend(require('./lib/import-meta'))
++ .extend(require('acorn-import-meta'))
+
+ function mapOptions (opts) {
+ if (!opts) opts = {}
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..ec1bcae
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+0001-Use-babel-if-needed.patch
+0002-Transpile-for-node-v8.patch
+0003-Do-not-transcode-lib-for-node-acorn-node.patch
diff --git a/debian/rules b/debian/rules
index 3e436dd..2a78d17 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,105 +18,112 @@ endef
define space =
endef
-COMPONENTS=$(subst $(newline),$(space),$(shell set -e;cd debian/components && (find . -type d -printf "%f\n" | sed '/^[.]$$/d' )))
+
+
+COMPONENTS=$(shell set -e;cd debian/components && (find . -type d -printf "%f\n" | sed '/^[.]$$/d' | xargs printf "%s " | sed 's/[[:space:]]*$$//g'))
COMPONENTS_FILES_C=$(foreach component,$(COMPONENTS),./debian/components/$(component)/$(1))
COPYRIGHT_COMPONENTS_FILES=$(call COMPONENTS_FILES,copyright)
DOCS_COMPONENTS_FILES=$(call COMPONENTS_FILES,docs)
INSTALL_COMPONENTS_FILES=$(call COMPONENTS_FILES,install)
-MODULES_COMPONENTS=$(foreach component,$(COMPONENTS),$(shell echo $(component) | sed 's/^module[-]//g'))
-NODE_SUBPACKAGE=$(MODULES_COMPONENTS)
+NODE_SUBPACKAGE=$(COMPONENTS)
ACORN_COMPONENTS=acorn-walk acorn-loose
-ACORN_SUBPACKAGE=$(foreach component,$(ACORN_COMPONENTS),$(shell echo $(component) | sed 's/^/node-/g'))
-
-$(BUILDDIR)/builddir.stamp:
- mkdir -p $(BUILDDIR)
- cp -r acorn $(BUILDDIR)
- cp -r acorn-walk $(BUILDDIR)
- cp -r acorn-loose $(BUILDDIR)
- cp -r test $(BUILDDIR)
- cp package.json $(BUILDDIR)
- mkdir -p $(BUILDDIR)/acorn-loose/node_modules/
- ln -s ../../acorn $(BUILDDIR)/acorn-loose/node_modules/acorn
+ACORN_MAIN_PACKAGES=acorn $(ACORN_COMPONENTS)
+ACORN_SUBPACKAGE=$(foreach component,$(COMPONENTS),$(shell echo $(component) | sed 's/^/node-/g'))
+MAIN_PACKAGE=node-debbundle-acorn
+
+BUILD_STAMPS_ACORN_MAIN=$(foreach pkg,$(ACORN_MAIN_PACKAGES),$(BUILDDIR)/$(pkg)/build.stamp)
+BUILD_STAMPS_COMPONENTS=$(foreach pkg,$(COMPONENTS),$(pkg)/build.stamp)
+BUILD_STAMPS=$(BUILD_STAMPS_ACORN_MAIN) $(BUILD_STAMPS_COMPONENTS)
+
+# work arround transpile bug
+ROLLUP=TRANSPILE=babel6 BABEL_PRESET=es2015 rollup
+
+ACORN_SRC= $(shell find acorn/src -name "*.js" -type f | LC_ALL=C sort)
+
+$(BUILDDIR)/acorn/builddir.stamp: $(ACORN_SRC) acorn/rollup*.js acorn/package.json acorn/bin/acorn
+ mkdir -p $(dir $@)
+ cp -rf acorn $(BUILDDIR)
# remove identifier
- rm -f $(BUILDDIR)/acorn/src/identifier.js
+ rm -f $(dir $@)/src/identifier.js
touch $@
-$(BUILDDIR)/acorn/src/identifier.js: acorn/src/identifier.js $(BUILDDIR)/builddir.stamp
- node bin/generate-identifier-regex.js acorn/src/identifier.js > $@
-
+$(BUILDDIR)/acorn/src/identifier.js: acorn/src/identifier.js $(BUILDDIR)/acorn/builddir.stamp
+ node bin/generate-identifier-regex.js $< > $@
-$(BUILDDIR)/build.stamp: $(BUILDDIR)/builddir.stamp $(BUILDDIR)/acorn/src/identifier.js
- # build main package
- cd $(BUILDDIR) && rollup -c acorn/rollup.config.js
- cd $(BUILDDIR) && rollup -c acorn-walk/rollup.config.js
- cd $(BUILDDIR) && rollup -c acorn-loose/rollup.config.js
- cd $(BUILDDIR) && rollup -c acorn/rollup.config.bin.js
+$(BUILDDIR)/acorn/build.stamp: $(BUILDDIR)/acorn/builddir.stamp $(BUILDDIR)/acorn/src/identifier.js
+ cd $(BUILDDIR) && $(ROLLUP) -c acorn/rollup.config.js
+ cd $(BUILDDIR) && $(ROLLUP) -c acorn/rollup.config.bin.js
touch $@
-module-node-acorn-dynamic-import/node_modules/acorn: $(BUILDDIR)/builddir.stamp
- mkdir -p module-node-acorn-dynamic-import/node_modules
- ln -sf ../../$(BUILDDIR)/acorn module-node-acorn-dynamic-import/node_modules/acorn
+ACORN_WALK_SRC= $(shell find acorn-walk/src -name "*.js" -type f | LC_ALL=C sort)
-module-node-acorn-dynamic-import/node_modules/acorn-walk: $(BUILDDIR)/builddir.stamp
- mkdir -p module-node-acorn-dynamic-import/node_modules
- ln -sf ../../$(BUILDDIR)/acorn-walk module-node-acorn-dynamic-import/node_modules/acorn-walk
+$(BUILDDIR)/acorn-walk/builddir.stamp: $(ACORN_WALK_SRC) acorn-walk/rollup*.js acorn-walk/package.json
+ mkdir -p $(dir $@)
+ cp -rf acorn-walk $(BUILDDIR)
+ touch $@
-module-node-acorn-dynamic-import/build.stamp: $(BUILDDIR)/build.stamp module-node-acorn-dynamic-import/node_modules/acorn module-node-acorn-dynamic-import/node_modules/acorn-walk
- cd module-node-acorn-dynamic-import && babeljs src --out-dir lib
+$(BUILDDIR)/acorn-walk/build.stamp: $(BUILDDIR)/acorn-walk/builddir.stamp $(BUILDDIR)/acorn/build.stamp
+ cd $(BUILDDIR) && $(ROLLUP) -c acorn-walk/rollup.config.js
touch $@
-module-node-acorn-bigint/node_modules/acorn: $(BUILDDIR)/builddir.stamp
- mkdir -p module-node-acorn-bigint/node_modules
- ln -sf ../../$(BUILDDIR)/acorn module-node-acorn-bigint/node_modules/acorn
+ACORN_LOOSE_SRC= $(shell find acorn-walk/src -name "*.js" -type f | LC_ALL=C sort)
-module-node-acorn-bigint/build.stamp: module-node-acorn-bigint/node_modules/acorn
+$(BUILDDIR)/acorn-loose/build.stamp: $(BUILDDIR)/acorn/build.stamp
+ mkdir -p $(dir $@)
+ cp -rf acorn-loose $(BUILDDIR)
+ mkdir -p $(dir $@)/node_modules/
+ ln -s ../../acorn $(dir $@)/node_modules/acorn
+ touch $@
+ cd $(BUILDDIR) && $(ROLLUP) -c acorn-loose/rollup.config.js
touch $@
-module-node-acorn-import-meta/node_modules/acorn: $(BUILDDIR)/builddir.stamp
- mkdir -p module-node-acorn-import-meta/node_modules
- ln -sf ../../$(BUILDDIR)/acorn module-node-acorn-import-meta/node_modules/acorn
+ACORN_DYNAMIC_IMPORT_SRC=$(shell find node-acorn-dynamic-import/src -name "*.js" -type f | LC_ALL=C sort)
-module-node-acorn-import-meta/build.stamp: module-node-acorn-import-meta/node_modules/acorn
+node-acorn-dynamic-import/build.stamp: $(BUILDDIR)/acorn/build.stamp $(BUILDDIR)/acorn-walk/build.stamp $(ACORN_DYNAMIC_IMPORT_SRC)
+ mkdir -p $(dir $@)/node_modules
+ ln -sf ../../$(BUILDDIR)/acorn $(dir $@)/node_modules/acorn
+ ln -sf ../../$(BUILDDIR)/acorn-walk $(dir $@)/node_modules/acorn-walk
+ cd $(dir $@) && babeljs src --out-dir lib
touch $@
-module-node-acorn-node/node_modules/acorn: $(BUILDDIR)/builddir.stamp
- mkdir -p module-node-acorn-dynamic-import/node_modules
- ln -sf ../../$(BUILDDIR)/acorn module-node-acorn-node/node_modules/acorn
+ACORN_BIGINT_SRC=node-acorn-bigint/index.js
-module-node-acorn-node/node_modules/acorn-bigint: module-node-acorn-bigint/build.stamp
- mkdir -p module-node-acorn-node/node_modules
- ln -sf ../../module-node-acorn-bigint module-node-acorn-node/node_modules/acorn-bigint
+node-acorn-bigint/build.stamp: $(BUILDDIR)/acorn/build.stamp $(ACORN_BIGINT_SRC)
+ mkdir -p $(dir $@)/node_modules
+ ln -sf ../../$(BUILDDIR)/acorn $(dir $@)/node_modules/acorn
+ touch $@
-module-node-acorn-node/node_modules/acorn-import-meta: module-node-acorn-import-meta/build.stamp
- mkdir -p module-node-acorn-node/node_modules
- ln -sf ../../module-node-acorn-import-meta module-node-acorn-node/node_modules/acorn-import-meta
+ACORN_IMPORT_META_SRC=node-acorn-import-meta/index.js
-module-node-acorn-node/node_modules/acorn-walk: $(BUILDDIR)/builddir.stamp
- mkdir -p module-node-acorn-node/node_modules
- ln -sf ../../$(BUILDDIR)/acorn-walk module-node-acorn-node/node_modules/acorn-walk
+node-acorn-import-meta/build.stamp: $(BUILDDIR)/acorn/build.stamp $(ACORN_IMPORT_META_SRC)
+ mkdir -p $(dir $@)/node_modules
+ ln -sf ../../$(BUILDDIR)/acorn $(dir $@)/node_modules/acorn
+ touch $@
-module-node-acorn-node/node_modules/acorn-dynamic-import: module-node-acorn-dynamic-import/build.stamp
- mkdir -p module-node-acorn-node/node_modules
- ln -sf ../../module-node-acorn-dynamic-import module-node-acorn-node/node_modules/acorn-dynamic-import
-module-node-acorn-jsx/node_modules/acorn: $(BUILDDIR)/builddir.stamp
- mkdir -p module-node-acorn-jsx/node_modules
- ln -sf ../../$(BUILDDIR)/acorn module-node-acorn-jsx/node_modules/acorn
+ACORN_NODE_SRC=node-acorn-node/build.js node-acorn-node/walk.js node-acorn-node/index.js
-module-node-acorn-node/build.stamp: $(BUILDDIR)/build.stamp module-node-acorn-node/node_modules/acorn-walk module-node-acorn-node/node_modules/acorn module-node-acorn-node/node_modules/acorn-bigint module-node-acorn-node/node_modules/acorn-import-meta module-node-acorn-node/node_modules/acorn-dynamic-import module-node-acorn-bigint/build.stamp module-node-acorn-dynamic-import/build.stamp module-node-acorn-import-meta/build.stamp
- mkdir -p module-node-acorn-node/lib
- mkdir -p module-node-acorn-node/lib/bigint
- mkdir -p module-node-acorn-node/lib/import-meta
- mkdir -p module-node-acorn-node/lib/dynamic-import
- cd module-node-acorn-node && nodejs build.js
+node-acorn-node/build.stamp: $(BUILDDIR)/acorn/build.stamp node-acorn-bigint/build.stamp node-acorn-import-meta/build.stamp $(BUILDDIR)/acorn-walk/build.stamp node-acorn-dynamic-import/build.stamp $(ACORN_NODE_SRC)
+ mkdir -p $(dir $@)/node_modules
+ ln -sf ../../$(BUILDDIR)/acorn $(dir $@)/node_modules/acorn
+ ln -sf ../../node-acorn-bigint $(dir $@)/node_modules/acorn-bigint
+ ln -sf ../../node-acorn-import-meta $(dir $@)/node_modules/acorn-import-meta
+ ln -sf ../../$(BUILDDIR)/acorn-walk $(dir $@)/node_modules/acorn-walk
+ ln -sf ../../node-acorn-dynamic-import $(dir $@)/node_modules/acorn-dynamic-import
+ touch $@
-override_dh_auto_build: $(BUILDDIR)/build.stamp module-node-acorn-dynamic-import/build.stamp module-node-acorn-node/build.stamp
+node-acorn-jsx/build.stamp: $(BUILDDIR)/acorn/build.stamp node-acorn-jsx/*.js
+ mkdir -p $(dir $@)/node_modules
+ ln -sf ../../$(BUILDDIR)/acorn $(dir $@)/node_modules/acorn
+ touch $@
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES)))
-override_dh_auto_test: module-node-acorn-bigint/node_modules/acorn module-node-acorn-import-meta/node_modules/acorn module-node-acorn-jsx/node_modules/acorn
+override_dh_auto_build: $(BUILD_STAMPS)
+
+override_dh_auto_test_acorn: $(BUILD_STAMPS_ACORN_MAIN)
# create a link in order to run acorn
mkdir -p $(TESTSUITEDIR)
- ln -s ../../$(BUILDDIR)/acorn/dist $(TESTSUITEDIR)/dist
+ mkdir -p $(TESTSUITEDIR)/node_modules
+ ln -sf ../../$(BUILDDIR)/acorn/dist $(TESTSUITEDIR)/dist
cp $(BUILDDIR)/acorn/bin/acorn $(TESTSUITEDIR)/binacorn
chmod +x $(TESTSUITEDIR)/binacorn
sed -i "s,require('../dist/bin.js'),require('./dist/bin.js'),g" $(TESTSUITEDIR)/binacorn
@@ -129,39 +136,51 @@ override_dh_auto_test: module-node-acorn-bigint/node_modules/acorn module-node-a
./$(TESTSUITEDIR)/binacorn < $(TESTSUITEDIR)/dist/acorn.js
@echo '=========================================================='
# run package testsuite
+ # @echo '=========================================================='
+ # cp -r test $(BUILDDIR)
+ # cd $(BUILDDIR) && node test/run.js
@echo '=========================================================='
- cd $(BUILDDIR) && node test/run.js
- @echo '=========================================================='
+ @echo Run smoke test for walk
+ ln -s ../../../$(BUILDDIR)/acorn $(TESTSUITEDIR)/node_modules/acorn
+ ln -s ../../../$(BUILDDIR)/acorn-walk $(TESTSUITEDIR)/node_modules/acorn-walk
+ cp debian/tests/walk.js $(TESTSUITEDIR)/walk.js
+ cd $(TESTSUITEDIR) && ./walk.js
@echo '**********************************************************'
+
+
+ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES)))
+override_dh_auto_test: override_dh_auto_test_acorn
# run bigint
@echo '*********************************************************'
@echo 'Run test suite for node-acorn-bigint '
@echo '**********************************************************'
- cd module-node-acorn-bigint/ && mocha -R spec
+ cd node-acorn-bigint/ && mocha -R spec
# run acorn-dynamic-import
@echo '*********************************************************'
@echo 'Run test suite for node-acorn-dynamic-import '
@echo '**********************************************************'
# smoke test
- cd module-node-acorn-dynamic-import && node -e "require('.')"
+ cd node-acorn-dynamic-import && node -e "require('.')"
#cd module-node-acorn-dynamic-import && mocha -R spec
# run acorn-import-meta
@echo '*********************************************************'
@echo 'Run test suite for node-acorn-meta-import '
@echo '**********************************************************'
- cd module-node-acorn-import-meta/ && mocha -R spec
+ cd node-acorn-import-meta/ && mocha -R spec
# run node-acorn-jsx
@echo '*********************************************************'
@echo 'Run test suite for node-acorn-jsx '
@echo '**********************************************************'
# run node-acorn-jsx
- cd module-node-acorn-jsx/ && node test/run.js
+ # not yet licence problem
+ # cd node-acorn-jsx/ && node test/run.js
+ cd node-acorn-jsx && node -e 'var acorn = require("acorn");var jsx = require(".");'
# run node-acorn
@echo '*********************************************************'
@echo 'Run test suite for node-acorn-node '
@echo '**********************************************************'
# run node-acorn
- cd module-node-acorn-node/ && tap -R spec test/index.js
+ cd node-acorn-node/ && tap -R spec test/index.js
else
override_dh_auto_test:
@echo '**********************************************************'
@@ -169,7 +188,7 @@ override_dh_auto_test:
@echo '**********************************************************'
endif
-debian/node-acorn.install: debian/components/install $(INSTALL_COMPONENTS_FILES)
+debian/node-debbundle-acorn.install: debian/components/install $(INSTALL_COMPONENTS_FILES)
cp -f debian/components/install $@
set -e; \
if test "X$(COMPONENTS)" != X; then \
@@ -180,7 +199,7 @@ debian/node-acorn.install: debian/components/install $(INSTALL_COMPONENTS_FILES)
true; \
fi;
-override_dh_install: debian/node-acorn.install
+override_dh_install: debian/node-debbundle-acorn.install
dh_install
%.1: %.1.xml
@@ -200,8 +219,7 @@ endif
module-acorn-node/README.acorn-node.md: module-acorn-node/README.md
ln $< $@
-debian/node-acorn.docs: debian/components/docs $(DOCS_COMPONENTS_FILES)
- cp -f debian/components/docs $@
+debian/node-debbundle-acorn.docs: $(DOCS_COMPONENTS_FILES)
set -e; \
if test "X$(COMPONENTS)" != X; then \
for c in $(COMPONENTS); do \
@@ -215,36 +233,39 @@ debian/node-acorn.docs: debian/components/docs $(DOCS_COMPONENTS_FILES)
true;\
fi;
-ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES)))
-override_dh_installdocs: debian/node-acorn.docs
+override_dh_installdocs: debian/node-debbundle-acorn.docs
#module-acorn-node/README.acorn-node.md
# manual building of copyright
- mkdir -p debian/node-acorn/usr/share/doc/node-acorn
- dh_installdocs --link-doc=node-acorn
- if test "X$(NODE_SUBPACKAGE)$(ACORN_SUBPACKAGE)" != X ; then \
- for module in $(NODE_SUBPACKAGE) $(ACORN_SUBPACKAGE); do \
- mkdir -p "debian/node-acorn/usr/share/doc/$$module"; \
- ln -s "../node-acorn/copyright" "debian/node-acorn/usr/share/doc/$$module/copyright" ; \
+ mkdir -p debian/${MAIN_PACKAGE}/usr/share/doc/${MAIN_PACKAGE}
+ if test "X$(NODE_SUBPACKAGE)$(ACORN_SUBPACKAGE)node-acorn" != X ; then \
+ for module in $(NODE_SUBPACKAGE) $(ACORN_SUBPACKAGE) node-acorn; do \
+ mkdir -p "debian/${MAIN_PACKAGE}/usr/share/doc/$$module"; \
+ ln -s "../${MAIN_PACKAGE}/copyright" "debian/${MAIN_PACKAGE}/usr/share/doc/$$module/copyright" ; \
done; \
else \
true; \
fi
+ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES)))
+ dh_installdocs --link-doc=${MAIN_PACKAGE}
# install doc in subdir and link subdir to pseudo package
- mkdir -p debian/node-acorn/usr/share/doc/node-acorn/acorn
- ln -s ../node-acorn-walk debian/node-acorn/usr/share/doc/node-acorn/acorn-walk
- ln -s ../node-acorn-loose debian/node-acorn/usr/share/doc/node-acorn/acorn-loose
+ ln -s ../node-acorn-walk debian/${MAIN_PACKAGE}/usr/share/doc/node-acorn/acorn-walk
+ ln -s ../node-acorn-loose debian/${MAIN_PACKAGE}/usr/share/doc/node-acorn/acorn-loose
# install
+ mkdir -p "debian/${MAIN_PACKAGE}/usr/share/doc/node-acorn";
+ install README.md debian/${MAIN_PACKAGE}/usr/share/doc/node-acorn
if test "X$(NODE_SUBPACKAGE)" != X ; then \
for module in $(NODE_SUBPACKAGE); do \
- mkdir -p "debian/node-acorn/usr/share/doc/$$module"; \
- find "module-$$module" -maxdepth 1 -iname '*.md' -and -not -iname 'license.md' -exec install {} "debian/node-acorn/usr/share/doc/$$module" \; ; \
+ mkdir -p "debian/$(MAIN_PACKAGE)/usr/share/doc/$$module"; \
+ find "$$module" -maxdepth 1 -iname '*.md' -and -not -iname 'license.md' -exec install {} "debian/$(MAIN_PACKAGE)/usr/share/doc/$$module" \; ; \
done; \
else \
true; \
fi
- install acorn/*.md debian/node-acorn/usr/share/doc/node-acorn/acorn
- install acorn-walk/*.md debian/node-acorn/usr/share/doc/node-acorn-walk
- install acorn-loose/*.md debian/node-acorn/usr/share/doc/node-acorn-loose
+ install acorn/*.md debian/$(MAIN_PACKAGE)/usr/share/doc/node-acorn/
+ mkdir -p debian/$(MAIN_PACKAGE)/usr/share/doc/node-acorn-walk
+ install acorn-walk/*.md debian/$(MAIN_PACKAGE)/usr/share/doc/node-acorn-walk
+ mkdir -p debian/$(MAIN_PACKAGE)/usr/share/doc/node-acorn-loose
+ install acorn-loose/*.md debian/$(MAIN_PACKAGE)/usr/share/doc/node-acorn-loose
else
override_dh_installdocs:
@echo '**********************************************************'
@@ -253,26 +274,23 @@ override_dh_installdocs:
endif
override_dh_installchangelogs:
-ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES)))
# create changelog
- mkdir -p debian/node-acorn/usr/share/doc/node-acorn
- mkdir -p debian/node-acorn/usr/share/doc/node-acorn-bigint
- mkdir -p debian/node-acorn/usr/share/doc/node-acorn-walk
- mkdir -p debian/node-acorn/usr/share/doc/node-acorn-loose
- mkdir -p debian/node-acorn/usr/share/doc/node-acorn-import-meta
- if test "X$(NODE_SUBPACKAGE)$(ACORN_SUBPACKAGE)" != X ; then \
- for module in $(NODE_SUBPACKAGE) $(ACORN_SUBPACKAGE); do \
- mkdir -p "debian/node-acorn/usr/share/doc/$$module"; \
- ln -s "../node-acorn/changelog.Debian.gz" "debian/node-acorn/usr/share/doc/$$module/changelog.Debian.gz" ; \
+ if test "X$(NODE_SUBPACKAGE)$(ACORN_SUBPACKAGE)node-acorn" != X ; then \
+ for module in $(NODE_SUBPACKAGE) $(ACORN_SUBPACKAGE) node-acorn; do \
+ mkdir -p "debian/$(MAIN_PACKAGE)/usr/share/doc/$$module"; \
+ ln -s "../$(MAIN_PACKAGE)/changelog.Debian.gz" "debian/$(MAIN_PACKAGE)/usr/share/doc/$$module/changelog.Debian.gz" ; \
done; \
else \
true; \
fi
+ifeq (,$(filter nodoc,$(DEB_BUILD_OPTIONS) $(DEB_BUILD_PROFILES)))
dh_installchangelogs
# mkdir -p debian/node-acorn/usr/share/doc/node-acorn
#install module-acorn-node/CHANGELOG.md debian/node-acorn/usr/share/doc/node-acorn/changelog.acorn-node
-endif
+else
dh_installchangelogs
+endif
+
@@ -280,6 +298,7 @@ override_dh_auto_clean:
# rm autogenerated
rm -f debian/node-acorn.install
rm -f debian/node-acorn.docs
+ rm -rf $(TESTSUITEDIR)
# buildir
rm -rf $(BUILDDIR)
# rm node_modules and dist
@@ -292,11 +311,11 @@ override_dh_auto_clean:
else \
true; \
fi
- rm -rf module-node-acorn-dynamic-import/lib
+ rm -rf node-acorn-dynamic-import/lib
rm -rf acorn/dist/*.js
rm -rf acorn/dist/*.mjs
rm -rf acorn/dist/*.map
- rm -rf module-node-acorn-node/lib
+ rm -rf node-acorn-node/lib
dh_auto_clean
# maint rules
@@ -317,5 +336,7 @@ maint_rule: debian/copyright
$(info $(COPYRIGHT_COMPONENTS_DOCS))
$(info run maint rules)
+COMPONENTS_LIST_GIT_DPM=$(foreach component,$(COMPONENTS),--component ../acorn_$(DEB_VERSION_UPSTREAM).orig-$(component).tar.*)
+
git_dpm_rules:
- git dpm inu -p upstreamdebian --pristine-tar --component ../acorn_6.0.2+20181021git007b08d01eff070+ds+~0.3.1+~4.0.0+~0.3.0+~5.0.0+ds+~1.6.1+ds.orig-module-node-acorn-bigint.tar.gz --component ../acorn_6.0.2+20181021git007b08d01eff070+ds+~0.3.1+~4.0.0+~0.3.0+~5.0.0+ds+~1.6.1+ds.orig-module-node-acorn-jsx.tar.xz --component ../acorn_6.0.2+20181021git007b08d01eff070+ds+~0.3.1+~4.0.0+~0.3.0+~5.0.0+ds+~1.6.1+ds.orig-module-node-acorn-dynamic-import.tar.gz --component ../acorn_6.0.2+20181021git007b08d01eff070+ds+~0.3.1+~4.0.0+~0.3.0+~5.0.0+ds+~1.6.1+ds.orig-module-node-acorn-import-meta.tar.gz --component ../acorn_6.0.2+20181021git007b08d01eff070+ds+~0.3.1+~4.0.0+~0.3.0+~5.0.0+ds+~1.6.1+ds.orig-module-node-acorn-node.tar.xz --rebase ../acorn_6.0.2+20181021git007b08d01eff070+ds+~0.3.1+~4.0.0+~0.3.0+~5.0.0+ds+~1.6.1+ds.orig.tar.xz
+ git dpm inu --ignore-unclean-branches --pristine-tar $(COMPONENTS_LIST_GIT_DPM) --rebase ../acorn_$(DEB_VERSION_UPSTREAM).orig.tar.*
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 4c4d338..b852c48 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -2,3 +2,8 @@
insane-line-length-in-source-file acorn/src/identifier.js line length is*
source-contains-prebuilt-javascript-object acorn/src/identifier.js line length is*
source-is-missing acorn/src/identifier.js line length is*
+
+# copy pasted from unicode spec (not generated)
+insane-line-length-in-source-file acorn/src/unicode-property-data.js line length is*
+source-contains-prebuilt-javascript-object acorn/src/unicode-property-data.js line length is*
+source-is-missing acorn/src/unicode-property-data.js line length is*
diff --git a/debian/tests/walk.js b/debian/tests/walk.js
index 87f7144..1dd9e64 100755
--- a/debian/tests/walk.js
+++ b/debian/tests/walk.js
@@ -8,3 +8,7 @@ walk.simple(acorn.parse("let x = 10"), {
console.log(`Found a literal: ${node.value}`)
}
})
+
+walk.full(acorn.parse("1 + 1"), node => {
+ console.log(`There's a ${node.type} node at ${node.ch}`)
+})
diff --git a/debian/watch b/debian/watch
index 468d1db..3437c31 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,21 +1,31 @@
version=4
-
-opts=pgpmode=none,dversionmangle=s/\+(debian|dfsg|ds|deb)(\.\d+)?$//,filenamemangle=s/.*=//,oversionmangle=s/(.*)/$1/ \
- https://qa.debian.org/cgi-bin/fakeupstream.cgi?upstream=npmjs/acorn+npmjs/acorn-bigint+npmjs/acorn-dynamic-import+npmjs/acorn-import-meta+npmjs/acorn-jsx+npmjs/acorn-node \
- .*=acorn_.*-(\d.*)@ARCHIVE_EXT@ debian
-opts=pgpmode=none,dversionmangle=s/\+(debian|dfsg|ds|deb)(\.\d+)?$//,filenamemangle=s/.*=/module-acorn-dynamic-import/,component=module-acorn-dynamic-import,oversionmangle=s/(.*)/$1/ \
- https://qa.debian.org/cgi-bin/fakeupstream.cgi?upstream=npmjs/acorn+npmjs/acorn-bigint+npmjs/acorn-dynamic-import+npmjs/acorn-import-meta+npmjs/acorn-jsx+npmjs/acorn-node&component=acorn-dynamic-import \
- .*=acorn_.*-(\d.*)@ARCHIVE_EXT@ same
+opts="pgpmode=none,dversionmangle=s/@DEB_EXT@//,repacksuffix=+ds,filenamemangle=s%(?:.*?)?v?(@ANY_VERSION@@ARCHIVE_EXT@)$%node-acorn-$1%" \
+ https://github.com/acornjs/acorn/tags \
+ (?:.*?/)?v?(\d[\d.]*)@ARCHIVE_EXT@ group
-opts=pgpmode=none,dversionmangle=s/\+(debian|dfsg|ds|deb)(\.\d+)?$//,filenamemangle=s/.*=/module-acorn-import-meta/,component=module-acorn-import-meta,oversionmangle=s/(.*)/$1/ \
- https://qa.debian.org/cgi-bin/fakeupstream.cgi?upstream=npmjs/acorn+npmjs/acorn-bigint+npmjs/acorn-dynamic-import+npmjs/acorn-import-meta+npmjs/acorn-jsx+npmjs/acorn-node&component=acorn-import-meta \
- .*=acorn_.*-(\d.*)@ARCHIVE_EXT@ same
+opts="pgpmode=none,component=node-acorn-bigint,dversionmangle=s/@DEB_EXT@//,repacksuffix=+ds,filenamemangle=s%(?:.*?)?v?(@ANY_VERSION@@ARCHIVE_EXT@)$%node-acorn-bigint-$1%" \
+ https://github.com/acornjs/acorn-bigint/tags \
+ (?:.*?/)?v?(\d[\d.]*)@ARCHIVE_EXT@ group
-opts=pgpmode=none,dversionmangle=s/\+(debian|dfsg|ds|deb)(\.\d+)?$//,filenamemangle=s/.*=/module-acorn-jsx/,component=module-acorn-jsx,oversionmangle=s/(.*)/$1/ \
- https://qa.debian.org/cgi-bin/fakeupstream.cgi?upstream=npmjs/acorn+npmjs/acorn-bigint+npmjs/acorn-dynamic-import+npmjs/acorn-import-meta+npmjs/acorn-jsx+npmjs/acorn-node&component=acorn-jsx \
- .*=acorn_.*-(\d.*)@ARCHIVE_EXT@ same
+opts="pgpmode=none,component=node-acorn-dynamic-import,dversionmangle=s/@DEB_EXT@//,repacksuffix=+ds,filenamemangle=s%(?:.*?)?v?(@ANY_VERSION@@ARCHIVE_EXT@)$%node-acorn-dynamic-import-$1%" \
+ https://github.com/kesne/acorn-dynamic-import/tags \
+ (?:.*?/)?v?(\d[\d.]*)@ARCHIVE_EXT@ group
-opts=pgpmode=none,dversionmangle=s/\+(debian|dfsg|ds|deb)(\.\d+)?$//,filenamemangle=s/.*=/module-acorn-node/,component=module-acorn-node,oversionmangle=s/(.*)/$1/ \
- https://qa.debian.org/cgi-bin/fakeupstream.cgi?upstream=npmjs/acorn+npmjs/acorn-bigint+npmjs/acorn-dynamic-import+npmjs/acorn-import-meta+npmjs/acorn-jsx+npmjs/acorn-node&component=acorn-node \
- .*=acorn_.*-(\d.*)@ARCHIVE_EXT@ same
+opts="pgpmode=none,component=node-acorn-import-meta,dversionmangle=s/@DEB_EXT@//,repacksuffix=+ds,filenamemangle=s%(?:.*?)?v?(@ANY_VERSION@@ARCHIVE_EXT@)$%node-acorn-import-meta-$1%" \
+ https://github.com/acornjs/acorn-import-meta/tags \
+ (?:.*?/)?v?(\d[\d.]*)@ARCHIVE_EXT@ group
+
+# lack of tag
+opts="pgpmode=none,component=node-acorn-jsx,dversionmangle=s/@DEB_EXT@//,repacksuffix=+ds,filenamemangle=s%(?:.*?)?v?(@ANY_VERSION@@ARCHIVE_EXT@)$%node-acorn-jsx-$1%" \
+ https://github.com/RReverser/acorn-jsx/tags \
+ (?:.*?/)?v?(\d[\d.]*)@ARCHIVE_EXT@ group
+
+# temp workarround
+#opts="pgpmode=none,component=node-acorn-jsx,dversionmangle=s/@DEB_EXT@//,repacksuffix=+ds,filenamemangle=s%(?:.*?)?v?(@ANY_VERSION@@ARCHIVE_EXT@)$%node-acorn-jsx-$1%" \
+# https://github.com/bastien-roucaries/acorn-jsx/tags \
+# (?:.*?/)?v?(\d[\d.]*)@ARCHIVE_EXT@ group
+
+opts="pgpmode=none,component=node-acorn-node,dversionmangle=s/@DEB_EXT@//,repacksuffix=+ds,filenamemangle=s%(?:.*?)?v?(@ANY_VERSION@@ARCHIVE_EXT@)$%node-acorn-node-$1%" \
+ https://github.com/browserify/acorn-node/tags \
+ (?:.*?/)?v?(\d[\d.]*)@ARCHIVE_EXT@ group \ No newline at end of file