From 272c1cb9d1508ad169928e2345134b0de3a46d92 Mon Sep 17 00:00:00 2001
From: Pirate Praveen <praveen@debian.org>
Date: Wed, 1 Jul 2020 15:44:16 +0530
Subject: [PATCH] Use packaged versions: node-brace-expansion and
 node-cache-loader

---
 debian/control                                 |  2 +-
 debian/patches/0740-use-packaged-modules.patch | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/debian/control b/debian/control
index 91b2147553..3e4f0f312b 100644
--- a/debian/control
+++ b/debian/control
@@ -351,7 +351,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
  node-babel-loader (>= 8.0~),
  node-bootstrap,
  node-brace-expansion (>= 1.1.8~),
-# node-cache-loader (>= 2.0.1~),
+ node-cache-loader (>= 4.1~),
  node-chart.js (>= 2.7.2~),
  node-clipboard,
  node-compression-webpack-plugin (>= 3.0.1~),
diff --git a/debian/patches/0740-use-packaged-modules.patch b/debian/patches/0740-use-packaged-modules.patch
index 904d7c6a71..63aa996c62 100644
--- a/debian/patches/0740-use-packaged-modules.patch
+++ b/debian/patches/0740-use-packaged-modules.patch
@@ -89,7 +89,7 @@ Use debian packaged node modules when available
      "@gitlab/at.js": "1.5.5",
      "@gitlab/svgs": "1.139.0",
      "@gitlab/ui": "16.12.1",
-@@ -53,54 +47,34 @@
+@@ -53,54 +47,32 @@
      "apollo-link": "^1.2.11",
      "apollo-link-batch-http": "^1.2.11",
      "apollo-upload-client": "^10.0.0",
@@ -99,8 +99,8 @@ Use debian packaged node modules when available
 -    "babel-loader": "^8.0.6",
      "babel-plugin-lodash": "^3.3.4",
      "bootstrap": "4.4.1",
-     "brace-expansion": "^1.1.8",
-     "cache-loader": "^4.1.0",
+-    "brace-expansion": "^1.1.8",
+-    "cache-loader": "^4.1.0",
      "classlist-polyfill": "^1.2.0",
 -    "clipboard": "^1.7.1",
      "codemirror": "^5.48.4",
@@ -144,7 +144,7 @@ Use debian packaged node modules when available
      "marked": "^0.3.12",
      "mermaid": "^8.5.2",
      "mersenne-twister": "1.1.0",
-@@ -108,13 +82,9 @@
+@@ -108,13 +80,9 @@
      "mitt": "^1.2.0",
      "monaco-editor": "^0.18.1",
      "monaco-editor-webpack-plugin": "^1.7.0",
@@ -158,7 +158,7 @@ Use debian packaged node modules when available
      "raphael": "^2.2.7",
      "raw-loader": "^4.0.0",
      "sanitize-html": "^1.22.0",
-@@ -128,31 +98,20 @@
+@@ -128,31 +96,20 @@
      "svg4everybody": "2.1.9",
      "swagger-ui-dist": "^3.24.3",
      "three": "^0.84.0",