From 21a93550b070322486b85f72a24e352758986db3 Mon Sep 17 00:00:00 2001 From: Pirate Praveen Date: Thu, 12 May 2022 18:46:38 +0530 Subject: [PATCH] Switch to packaged version of node-dateformat --- debian/control | 2 +- debian/patches/nodejs/0040-use-packaged-modules.patch | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/debian/control b/debian/control index 20defd9e0a..32981e0f7c 100644 --- a/debian/control +++ b/debian/control @@ -451,7 +451,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, # node-d3 includes d3-sankey node-d3 (>= 5.16~), node-d3-selection (>= 1.2~), - node-dateformat, + node-dateformat (>= 5.0.1~), node-deckar01-task-list (>= 2.2.1), node-exports-loader (>= 0.7~), node-imports-loader (>= 0.8~), diff --git a/debian/patches/nodejs/0040-use-packaged-modules.patch b/debian/patches/nodejs/0040-use-packaged-modules.patch index 8910941bff..8c078b4314 100644 --- a/debian/patches/nodejs/0040-use-packaged-modules.patch +++ b/debian/patches/nodejs/0040-use-packaged-modules.patch @@ -118,7 +118,7 @@ Use debian packaged node modules when available "@rails/ujs": "6.1.4-6", "@sentry/browser": "5.30.0", "@sourcegraph/code-host-integration": "0.0.60", -@@ -100,23 +100,23 @@ +@@ -100,24 +100,24 @@ "aws-sdk": "^2.637.0", "axios": "^0.24.0", "babel-loader": "^8.2.2", @@ -143,12 +143,14 @@ Use debian packaged node modules when available - "d3": "^5.16.0", - "d3-sankey": "^0.12.3", - "d3-selection": "^1.2.0", +- "dateformat": "^5.0.1", + "d3": "link:/usr/share/nodejs/d3", + "d3-sankey": "link:/usr/share/nodejs/d3-sankey", + "d3-selection": "link:/usr/share/nodejs/d3-selection", - "dateformat": "^5.0.1", ++ "dateformat": "link:/usr/share/nodejs/dateformat", "deckar01-task_list": "^2.3.1", "diff": "^3.4.0", + "dompurify": "^2.3.6", @@ -135,31 +135,31 @@ "jed": "^1.1.1", "jquery": "^3.6.0",