Control: tags -1 - moreinfo
Le 05/04/2021 à 13:28, Sebastian Ramacher a écrit :
> [...]
> The dependencies seem to be wrong:
>
> $ json2dsv
> internal/modules/cjs/loader.js:818
> throw err;
> ^
>
> Error: Cannot find module 'iconv-lite'
> Require stack:
> - /usr/share/nodejs/d3-dsv/bin/json2dsv
> at Function.Module._resolveFilename
> (internal/modules/cjs/loader.js:815:15)
> at Function.Module._load (internal/modules/cjs/loader.js:667:27)
> at Module.require (internal/modules/cjs/loader.js:887:19)
> at require (internal/modules/cjs/helpers.js:74:18)
> at Object.<anonymous> (/usr/share/nodejs/d3-dsv/bin/json2dsv:6:13)
> at Module._compile (internal/modules/cjs/loader.js:999:30)
> at Object.Module._extensions..js (internal/modules/cjs/loader.js:1027:10)
> at Module.load (internal/modules/cjs/loader.js:863:32)
> at Function.Module._load (internal/modules/cjs/loader.js:708:14)
> at Function.executeUserEntryPoint [as runMain]
> (internal/modules/run_main.js:60:12) {
> code: 'MODULE_NOT_FOUND',
> requireStack: [ '/usr/share/nodejs/d3-dsv/bin/json2dsv' ]
> }
Hi,
Fixed and tested (build + autopkgtest):
rebuild node-d3-fetch ... PASS
rebuild node-d3-hierarchy ... PASS
rebuild node-d3 ... PASS
autopkgtest node-d3 ... PASS
autopkgtest node-d3-fetch ... PASS
>> * Remove useless debian/webpack.config.js
>>
>> [ Checklist ]
>> [X] all changes are documented in the d/changelog
>> [X] I reviewed all changes and I approve them
>> [X] attach debdiff against the package in testing
>>
>> Cheers,
>> Yadd
>>
>> unblock node-d3-dsv/1.1.1-4
>
>> diff --git a/debian/changelog b/debian/changelog
>> index 2678e16..dffccb2 100644
>> --- a/debian/changelog
>> +++ b/debian/changelog
>> @@ -1,3 +1,20 @@
>> +node-d3-dsv (1.1.1-4) unstable; urgency=medium
>> +
>> + * Team upload
>> +
>> + [ Pirate Praveen ]
>> + * Drop node unused debian/webpack.config.js (we switched to rollup)
>> +
>> + [ Yadd ]
>> + * Bump debhelper compatibility level to 13
>
> Please revert this change. It's no longer appropriate at this stage of
> the freeze.
Done
>> + * Add "Rules-Requires-Root: no"
>> + * Add debian/gbp.conf
>> + * Modernize debian/watch
>> + * Use dh-sequence-nodejs
>
> This also just adds noise too the diff.
Done
> Cheers
Cheers,
Yadd
diff --git a/debian/changelog b/debian/changelog
index 2678e16..6b7d5f7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,29 @@
+node-d3-dsv (1.1.1-5) unstable; urgency=medium
+
+ * Team upload
+ * Revert debhelper upgrade due to freeze
+ * Update debian/watch due to GitHub changes
+ * Replace node-iconv by node-iconv-lite in dependencies as required by
package.json
+
+ -- Yadd <y...@debian.org> Mon, 05 Apr 2021 19:51:03 +0200
+
+node-d3-dsv (1.1.1-4) unstable; urgency=medium
+
+ * Team upload
+
+ [ Pirate Praveen ]
+ * Drop node unused debian/webpack.config.js (we switched to rollup)
+
+ [ Yadd ]
+ * Bump debhelper compatibility level to 13
+ * Add "Rules-Requires-Root: no"
+ * Add debian/gbp.conf
+ * Modernize debian/watch
+ * Use dh-sequence-nodejs
+ * Fix links (Closes: #985518)
+
+ -- Yadd <y...@debian.org> Sat, 20 Mar 2021 12:08:15 +0100
+
node-d3-dsv (1.1.1-3) unstable; urgency=medium
[ Debian Janitor ]
diff --git a/debian/control b/debian/control
index 6489133..23503df 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Architecture: all
Depends:
${misc:Depends}
, nodejs
- , node-iconv (>= 0.4)
+ , node-iconv-lite (>= 0.4)
, node-rw (>= 1)
, node-commander (>= 2)
Description: parser and formatter for delimiter-separated values, such as CSV
diff --git a/debian/copyright b/debian/copyright
index c3995ef..bd2f526 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -11,7 +11,7 @@ Files: debian/*
Copyright: 2017 Pirate Praveen <prav...@debian.org>
License: BSD-3-Clause
-License: BSD-3-clause
+License: BSD-3-Clause
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions
are met:
@@ -35,4 +35,3 @@ License: BSD-3-clause
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
diff --git a/debian/gbp.conf b/debian/gbp.conf
new file mode 100644
index 0000000..b713356
--- /dev/null
+++ b/debian/gbp.conf
@@ -0,0 +1,5 @@
+[DEFAULT]
+pristine-tar = True
+
+[import-orig]
+filter = [ '.gitignore', '.travis.yml', '.git*' ]
diff --git a/debian/links b/debian/links
deleted file mode 100644
index 2d71628..0000000
--- a/debian/links
+++ /dev/null
@@ -1,9 +0,0 @@
-usr/lib/nodejs/d3-dsv/bin/dsv2dsv usr/bin/csv2tsv
-usr/lib/nodejs/d3-dsv/bin/json2dsv usr/bin/json2csv
-usr/lib/nodejs/d3-dsv/bin/json2dsv usr/bin/json2tsv
-usr/lib/nodejs/d3-dsv/bin/dsv2json usr/bin/dsv2json
-usr/lib/nodejs/d3-dsv/bin/dsv2dsv usr/bin/dsv2dsv
-usr/lib/nodejs/d3-dsv/bin/dsv2json usr/bin/csv2json
-usr/lib/nodejs/d3-dsv/bin/dsv2json usr/bin/tsv2json
-usr/lib/nodejs/d3-dsv/bin/json2dsv usr/bin/json2dsv
-usr/lib/nodejs/d3-dsv/bin/dsv2dsv usr/bin/tsv2csv
diff --git a/debian/nodejs/links b/debian/nodejs/links
new file mode 100644
index 0000000..43ed1f6
--- /dev/null
+++ b/debian/nodejs/links
@@ -0,0 +1,9 @@
+d3-dsv/bin/dsv2dsv /usr/bin/csv2tsv
+d3-dsv/bin/json2dsv /usr/bin/json2csv
+d3-dsv/bin/json2dsv /usr/bin/json2tsv
+d3-dsv/bin/dsv2json /usr/bin/dsv2json
+d3-dsv/bin/dsv2dsv /usr/bin/dsv2dsv
+d3-dsv/bin/dsv2json /usr/bin/csv2json
+d3-dsv/bin/dsv2json /usr/bin/tsv2json
+d3-dsv/bin/json2dsv /usr/bin/json2dsv
+d3-dsv/bin/dsv2dsv /usr/bin/tsv2csv
diff --git a/debian/watch b/debian/watch
index 866efcb..63fb5d1 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,5 +1,5 @@
-version=3
+version=4
opts=\
-dversionmangle=s/\+(debian|dfsg|ds|deb)(\.\d+)?$//,\
+dversionmangle=auto,\
filenamemangle=s/.*\/v?([\d\.-]+)\.tar\.gz/node-d3-dsv-$1.tar.gz/ \
- https://github.com/d3/d3-dsv/tags .*/archive/v?([\d\.]+).tar.gz
+ https://github.com/d3/d3-dsv/tags .*/archive/(?:.*/)?v?([\d\.]+).tar.gz
diff --git a/debian/webpack.config.js b/debian/webpack.config.js
deleted file mode 100644
index f9cb59f..0000000
--- a/debian/webpack.config.js
+++ /dev/null
@@ -1,16 +0,0 @@
-'use strict';
-var path = require('path');
-var config = {
- target: 'web',
- resolve: {
- modules: ['/usr/lib/nodejs', '.'],
- },
- resolveLoader: {
- modules: ['/usr/lib/nodejs'],
- },
- output: {
- libraryTarget: 'umd'
- },
- module: { rules: [ {test: /\.js$/, loader: 'babel-loader', options: {
presets: [ 'es2015' ], plugins: ['add-module-exports'] } }] }
-}
-module.exports = config;
