[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#986406: unblock: node-d3-dsv/1.1.1-4



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
X-Debbugs-Cc: pkg-javascript-devel@lists.debian.org

Please unblock package node-d3-dsv

[ Reason ]
node-d3-dsv has a RC bug (#985518) due to bad links in /usr/bin.

[ Impact ]
Unusable binary commands, however package works fine when used by JS
files.

[ Tests ]
No, change just fixed links

[ Risks ]
No risk, changes are:
 * fix links using dh-sequence-nodejs (debian/links moved to
   debian/nodejs/links and fixed)
 * Add missing Rules-Requires-Root
 * Clean unneeded versionned dependencies
 * 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
+  * Add "Rules-Requires-Root: no"
+  * Add debian/gbp.conf
+  * Modernize debian/watch
+  * Use dh-sequence-nodejs
+  * Fix links (Closes: #985518)
+
+ -- Yadd <yadd@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..ee4d80b 100644
--- a/debian/control
+++ b/debian/control
@@ -1,30 +1,29 @@
 Source: node-d3-dsv
-Section: javascript
-Priority: optional
 Maintainer: Debian Javascript Maintainers <pkg-javascript-devel@lists.alioth.debian.org>
 Uploaders: Pirate Praveen <praveen@debian.org>
-Build-Depends:
- debhelper-compat (= 12)
- , nodejs
- , pkg-js-tools
- , rollup
+Section: javascript
+Testsuite: autopkgtest-pkg-nodejs
+Priority: optional
+Build-Depends: debhelper-compat (= 13)
+ , dh-sequence-nodejs
+ , node-csv-spectrum <!nocheck>
  , node-rollup-plugin-terser
  , node-tape <!nocheck>
- , node-csv-spectrum <!nocheck>
+ , nodejs
+ , rollup
 Standards-Version: 4.5.1
-Homepage: https://d3js.org/d3-dsv/
-Vcs-Git: https://salsa.debian.org/js-team/node-d3-dsv.git
 Vcs-Browser: https://salsa.debian.org/js-team/node-d3-dsv
-Testsuite: autopkgtest-pkg-nodejs
+Vcs-Git: https://salsa.debian.org/js-team/node-d3-dsv.git
+Homepage: https://d3js.org/d3-dsv/
+Rules-Requires-Root: no
 
 Package: node-d3-dsv
 Architecture: all
-Depends:
- ${misc:Depends}
+Depends: ${misc:Depends}
+ , node-commander
+ , node-iconv
+ , node-rw
  , nodejs
- , node-iconv (>= 0.4)
- , node-rw (>= 1)
- , node-commander (>= 2)
 Description: parser and formatter for delimiter-separated values, such as CSV
  This module provides a parser and formatter for delimiter-separated values,
  most commonly comma-separated values (CSV) or tab-separated values (TSV).
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 <praveen@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/rules b/debian/rules
index 65b73e2..46acc49 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
 # -*- makefile -*-
 
 %:
-	dh $@ --with nodejs
+	dh $@
 
 override_dh_auto_build:
 	rollup -c
diff --git a/debian/watch b/debian/watch
index 866efcb..29d45f6 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
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;

Reply to: