diff --git a/debian/control b/debian/control index 26ab72d2c0..99f91d8dcb 100644 --- a/debian/control +++ b/debian/control @@ -323,6 +323,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, node-d3-selection (>= 1.2~), node-d3-shape, node-d3-time (>= 1.0.8~), + node-d3-time-format (>= 2.1.1~), + node-d3-transition (>= 1.1.1~), node-dateformat, node-fuzzaldrin-plus (>= 0.5~), node-glob, @@ -349,8 +351,6 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, # node-babel-plugin-transform-define, # node-babel-preset-latest, # node-babel-preset-stage-2, -# node-d3-time-format, -# node-d3-transition (>= 1.1.1~), # node-debug (>= 3.1.0~), # node-exports-loader, # node-file-loader, @@ -359,7 +359,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, # node-marked, # node-raw-loader, # node-url-loader, -# node-katex +# node-vue-resource (>= 1.5.1~), Recommends: certbot, gitaly (>= 1.34.1~) Conflicts: libruby2.3 diff --git a/debian/patches/0740-use-packaged-modules.patch b/debian/patches/0740-use-packaged-modules.patch index 2fdca4f7cf..7b619fda1c 100644 --- a/debian/patches/0740-use-packaged-modules.patch +++ b/debian/patches/0740-use-packaged-modules.patch @@ -1,6 +1,6 @@ --- a/package.json +++ b/package.json -@@ -39,32 +39,16 @@ +@@ -39,32 +39,14 @@ "apollo-client": "^2.5.1", "apollo-upload-client": "^10.0.0", "at.js": "^1.5.4", @@ -27,13 +27,13 @@ - "d3-selection": "^1.2.0", - "d3-shape": "^1.2.0", - "d3-time": "^1.0.8", - "d3-time-format": "^2.1.1", - "d3-transition": "^1.1.1", +- "d3-time-format": "^2.1.1", +- "d3-transition": "^1.1.1", - "dateformat": "^3.0.3", "deckar01-task_list": "^2.2.0", "diff": "^3.4.0", "document-register-element": "1.13.1", -@@ -75,33 +59,20 @@ +@@ -75,33 +57,20 @@ "exports-loader": "^0.7.0", "file-loader": "^3.0.1", "formdata-polyfill": "^3.0.11", @@ -67,7 +67,7 @@ "raw-loader": "^1.0.0", "sanitize-html": "^1.16.1", "select2": "3.5.2-browserify", -@@ -114,13 +85,9 @@ +@@ -114,13 +83,9 @@ "stylelint-error-string-formatter": "1.0.2", "svg4everybody": "2.1.9", "three": "^0.84.0", @@ -81,7 +81,7 @@ "url-loader": "^1.1.2", "visibilityjs": "^1.2.4", "vue": "^2.6.10", -@@ -134,7 +101,6 @@ +@@ -134,7 +99,6 @@ "webpack": "^4.29.0", "webpack-bundle-analyzer": "^3.0.3", "webpack-cli": "^3.2.1",