[DRE-commits] [gitlab] 01/02: use jquery and jquery-ujs from system

[Praveen Arimbrathodiyil]

This is an automated email from the git hooks/post-receive script.

praveen pushed a commit to branch syslibs
in repository gitlab.

commit cfd79d8b715a2a582025c40c2994dd0948a18bde
Author: Pirate Praveen <praveen at debian.org>
Date:   Tue Dec 12 22:35:53 2017 +0530

    use jquery and jquery-ujs from system
---
 debian/control                            | 2 ++
 debian/patches/0420-use-system-libs.patch | 8 ++++----
 debian/patches/0430-remove-devdeps.patch  | 2 +-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/control b/debian/control
index 64b526d..7834b43 100644
--- a/debian/control
+++ b/debian/control
@@ -310,6 +310,8 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, ruby | ruby-interpreter,
  node-file-loader,
  node-imports-loader,
  node-jed,
+ node-jquery,
+ node-jquery-ujs,
  node-jszip,
  node-marked,
  node-mousetrap,
diff --git a/debian/patches/0420-use-system-libs.patch b/debian/patches/0420-use-system-libs.patch
index 0938732..4ca0e7c 100644
--- a/debian/patches/0420-use-system-libs.patch
+++ b/debian/patches/0420-use-system-libs.patch
@@ -1,6 +1,6 @@
 --- a/package.json
 +++ b/package.json
-@@ -13,42 +13,24 @@
+@@ -13,42 +13,22 @@
    },
    "dependencies": {
      "axios": "^0.16.2",
@@ -26,8 +26,8 @@
 -    "file-loader": "^0.11.1",
 -    "imports-loader": "^0.7.1",
 -    "jed": "^1.1.1",
-     "jquery": "^2.2.1",
-     "jquery-ujs": "^1.2.1",
+-    "jquery": "^2.2.1",
+-    "jquery-ujs": "^1.2.1",
      "js-cookie": "^2.1.3",
 -    "jszip": "^3.1.3",
      "jszip-utils": "^0.0.2",
@@ -43,7 +43,7 @@
      "react-dev-utils": "^0.5.2",
      "select2": "3.5.2-browserify",
      "sql.js": "^0.4.0",
-@@ -56,14 +38,9 @@
+@@ -56,14 +36,9 @@
      "three-orbit-controls": "^82.1.0",
      "three-stl-loader": "^1.0.4",
      "timeago.js": "^2.0.5",
diff --git a/debian/patches/0430-remove-devdeps.patch b/debian/patches/0430-remove-devdeps.patch
index 2b5b358..0f53d19 100644
--- a/debian/patches/0430-remove-devdeps.patch
+++ b/debian/patches/0430-remove-devdeps.patch
@@ -1,6 +1,6 @@
 --- a/package.json
 +++ b/package.json
-@@ -45,25 +45,5 @@
+@@ -43,25 +43,5 @@
      "webpack-stats-plugin": "^0.1.5"
    },
    "devDependencies": {

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/gitlab.git