[Python-modules-commits] [coreschema] 05/06: merge patched into master

[Pierre-Elliott Bécue]

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

peb-guest pushed a commit to branch master
in repository coreschema.

commit 7cb3c22d2beba9fc2c2bc747dad1dfc65585c6eb
Merge: 17c6cbf 7af05ac
Author: Pierre-Elliott Bécue <becue at crans.org>
Date:   Thu Jan 11 13:48:37 2018 +0100

    merge patched into master

 coreschema/templates/base.html                    |  3 +--
 debian/.git-dpm                                   |  4 ++--
 debian/patches/0001-Use-local-js-files-only.patch | 26 +++++++++++++++++++++++
 debian/patches/series                             |  1 +
 4 files changed, 30 insertions(+), 4 deletions(-)

diff --cc debian/.git-dpm
index aa26558,0000000..a5834a6
mode 100644,000000..100644
--- a/debian/.git-dpm
+++ b/debian/.git-dpm
@@@ -1,8 -1,0 +1,8 @@@
 +# see git-dpm(1) from git-dpm package
- 58d945fd43655bf1b8293093ad7ccfe573678de8
- 58d945fd43655bf1b8293093ad7ccfe573678de8
++7af05ac7c2bed4ef0705082236d1f01e95bb90c5
++7af05ac7c2bed4ef0705082236d1f01e95bb90c5
 +58d945fd43655bf1b8293093ad7ccfe573678de8
 +58d945fd43655bf1b8293093ad7ccfe573678de8
 +coreschema_0.0.4.orig.tar.gz
 +36d2d193b28cb6e22debd7b10665a2a2eb97288b
 +10974
diff --cc debian/patches/0001-Use-local-js-files-only.patch
index 0000000,0000000..27c96b4
new file mode 100644
--- /dev/null
+++ b/debian/patches/0001-Use-local-js-files-only.patch
@@@ -1,0 -1,0 +1,26 @@@
++From 7af05ac7c2bed4ef0705082236d1f01e95bb90c5 Mon Sep 17 00:00:00 2001
++From: =?UTF-8?q?Pierre-Elliott=20B=C3=A9cue?= <becue at crans.org>
++Date: Thu, 11 Jan 2018 13:47:40 +0100
++Subject: Use local js files only
++
++The base.html template relies on jquery provided by googleapis. This is
++a privacy breach, which is not suitable for debian policy. Using a local
++library instead.
++---
++ coreschema/templates/base.html | 3 +--
++ 1 file changed, 1 insertion(+), 2 deletions(-)
++
++diff --git a/coreschema/templates/base.html b/coreschema/templates/base.html
++index e1431be..5623e4a 100644
++--- a/coreschema/templates/base.html
+++++ b/coreschema/templates/base.html
++@@ -53,8 +53,7 @@
++     <!-- Bootstrap core JavaScript
++     ================================================== -->
++     <!-- Placed at the end of the document so the pages load faster -->
++-    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
++-    <script>window.jQuery || document.write('<script src="../../assets/js/vendor/jquery.min.js"><\/script>')</script>
+++    <script src="../../assets/js/vendor/jquery.min.js"></script>
++     <script src="../../dist/js/bootstrap.min.js"></script>
++     <script src="../../assets/js/docs.min.js"></script>
++     <script src="chosen.jquery.js"></script>
diff --cc debian/patches/series
index 0000000,0000000..90cd527
new file mode 100644
--- /dev/null
+++ b/debian/patches/series
@@@ -1,0 -1,0 +1,1 @@@
++0001-Use-local-js-files-only.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/coreschema.git