...
 
Commits (7)
salt (2018.3.4+dfsg1-6) unstable; urgency=medium
* Revert changes that were rejected by the release team:
- Drop fixing various spelling mistakes
- Drop using jquery.js from sphinx
- Drop using dh_sphinxdoc
- Drop patch to set script type explicitly to text/javascript
* doc: Use local Open Sans fonts instead of querying Google
to fix possible privacy breach
-- Benjamin Drung <benjamin.drung@cloud.ionos.com> Fri, 24 May 2019 15:01:45 +0200
salt (2018.3.4+dfsg1-5) unstable; urgency=medium
* Cherry-pick upstream patch to fix edge case when minion ID is a
......
......@@ -11,8 +11,6 @@ Build-Depends: bash-completion,
debhelper (>= 11),
dh-python,
dpkg-dev (>= 1.16.2),
libjs-bootstrap,
libjs-modernizr,
python3,
python3 (>= 3.6) | python3-mock,
python3-augeas,
......@@ -54,7 +52,6 @@ Build-Depends: bash-completion,
python3-twilio,
python3-yaml,
python3-zmq (>= 13.1.0),
sphinx-common,
virtualenv
Build-Depends-Indep: python3-doc, python3-sphinx (>= 1.3.5)
Standards-Version: 4.3.0
......@@ -222,11 +219,12 @@ Description: remote manager to administer servers via Salt SSH
Package: salt-doc
Architecture: all
Section: doc
Built-Using: ${sphinxdoc:Built-Using}
Depends: libjs-bootstrap,
Depends: fonts-open-sans,
libjs-bootstrap,
libjs-jquery,
libjs-modernizr,
${misc:Depends},
${sphinxdoc:Depends}
libjs-sphinxdoc,
${misc:Depends}
Breaks: salt-common (<< 2016.11.5)
Replaces: salt-common (<< 2016.11.5)
Description: additional documentation for salt, the distributed remote execution system
......
From 0baa23a3a01291af2b78f9e123284bbdb7de0541 Mon Sep 17 00:00:00 2001
From: Benjamin Drung <benjamin.drung@profitbricks.com>
Date: Wed, 24 Apr 2019 14:49:35 +0200
Subject: [PATCH] Use jquery.js from sphinx
Sphinx uses libjs-jquery >= 1.11.1 which is newer than jquery-1.9.1.js
shipped by salt. Therefore jquery.js from sphinx can be used again.
Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com>
---
doc/_themes/saltstack/layout.html | 6 ------
2 files changed, 7 deletions(-)
diff --git a/doc/_themes/saltstack/layout.html b/doc/_themes/saltstack/layout.html
index 85e0a3cf..a332b7c6 100644
--- a/doc/_themes/saltstack/layout.html
+++ b/doc/_themes/saltstack/layout.html
@@ -19,14 +19,8 @@
{%- set titlesuffix = "" %}
{%- endif %}
-{# Remove old version of jQuery #}
-{% set js_blacklist = [
- '_static/jquery.js',
-] %}
-
{# Add to top of the list #}
{% set script_files = [
- '_static/js/vendor/jquery-1.9.1.js',
'_static/js/vendor/bootstrap.min.js',
] + script_files %}
--
2.20.1
From e22e49d974937ed9107cf33c679799c914f27777 Mon Sep 17 00:00:00 2001
From: Benjamin Drung <benjamin.drung@cloud.ionos.com>
Date: Thu, 25 Apr 2019 11:53:09 +0200
Subject: [PATCH] doc: Set script type explicitly to text/javascript
dh_sphinxdoc (used for building the documentation in the Debian package)
searches for script lines and expect the type set to text/javascript.
Otherwise dh_sphinxdoc won't find the scripts.
Therefore mark the JavaScript scripts explicitly as text/javascript.
Forwarded: https://github.com/saltstack/salt/pull/52693
Signed-off-by: Benjamin Drung <benjamin.drung@cloud.ionos.com>
---
doc/_themes/saltstack/layout.html | 6 +++---
doc/_themes/saltstack2/layout.html | 4 ++--
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/doc/_themes/saltstack/layout.html b/doc/_themes/saltstack/layout.html
index 85e0a3cfa4..8c4380e7f2 100644
--- a/doc/_themes/saltstack/layout.html
+++ b/doc/_themes/saltstack/layout.html
@@ -81,7 +81,7 @@
</script>
{%- for scriptfile in script_files %}
{% if scriptfile not in js_blacklist %}
- <script src="{{ pathto(scriptfile, 1) }}"></script>
+ <script type="text/javascript" src="{{ pathto(scriptfile, 1) }}"></script>
{% endif %}
{%- endfor %}
{%- endmacro %}
@@ -159,7 +159,7 @@
{%- endblock %}
{%- block extrahead %} {% endblock %}
- <script src="{{ pathto('_static/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js', 1) }}"></script>
+ <script type="text/javascript" src="{{ pathto('_static/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js', 1) }}"></script>
{%- block analytics %}
{% endblock %}
@@ -258,7 +258,7 @@
</footer>
{%- endblock %}
- <script src="{{ pathto('_static/js/main.js', 1) }}"></script>
+ <script type="text/javascript" src="{{ pathto('_static/js/main.js', 1) }}"></script>
{% if on_saltstack %}
<script type="text/javascript" language="javascript">llactid=23943</script>
--
2.20.1
......@@ -13,8 +13,8 @@ diff --git a/doc/_themes/saltstack/layout.html b/doc/_themes/saltstack/layout.ht
index 85e0a3cf..6e5c70e0 100644
--- a/doc/_themes/saltstack/layout.html
+++ b/doc/_themes/saltstack/layout.html
@@ -23,6 +23,9 @@
{% set script_files = [
@@ -29,6 +29,9 @@
'_static/js/vendor/jquery-1.9.1.js',
'_static/js/vendor/bootstrap.min.js',
] + script_files %}
+{% if not '_static/searchtools.js' in script_files %}
......
This source diff could not be displayed because it is too large. You can view the blob instead.
......@@ -40,3 +40,13 @@ Author: Ondřej Nový <onovy@debian.org>
</div>
</div>
--- a/doc/_themes/saltstack/layout.html
+++ b/doc/_themes/saltstack/layout.html
@@ -117,7 +117,6 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta name="google-site-verification" content="1Y-ojT3ndjxA9coB77iUDyXPWxeuQ3T4_r0j-QG6QHg" />
- <link href='http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,600,700,800,300' rel='stylesheet' type='text/css'>
{{ css() }}
{%- if not embedded %}
......@@ -17,10 +17,7 @@ test_argspec_report-Fix-expected-argspec_report-resu.patch
Silence-linux_distribution-deprecation-warning.patch
Skip-test_module_name_source_match.patch
Fix-test_xen_virtual-on-kernels-with-no-Xen-support.patch
fix-various-spelling-mistakes.patch
doc-Set-script-type-explicitly-to-text-javascript.patch
doc-fix-logo-link.patch
Use-jquery.js-from-sphinx.patch
ensure-searchtools.js-gets-included.patch
0001-Import-tornado.gen-as-tornado_gen.patch
0002-Explicitly-import-attributes-from-tornado.patch
......
......@@ -3,13 +3,11 @@
#export DH_VERBOSE=1
%:
dh $@ --buildsystem pybuild --with bash-completion,python3,sphinxdoc
dh $@ --buildsystem pybuild --with bash-completion,python3
override_dh_auto_build:
dh_auto_build
rm -f doc/_themes/saltstack/static/css/*.min.css doc/_themes/saltstack/static/js/vendor/*.js
ln -s /usr/share/javascript/bootstrap/js/bootstrap.min.js doc/_themes/saltstack/static/js/vendor/bootstrap.min.js
ln -s /usr/share/javascript/modernizr/modernizr.min.js doc/_themes/saltstack/static/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js
HTML_THEME=saltstack make -C doc html SPHINXBUILD=/usr/share/sphinx/scripts/python3/sphinx-build
HTML_THEME=saltstack make -C doc man SPHINXBUILD=/usr/share/sphinx/scripts/python3/sphinx-build
......
usr/share/doc/salt/html/_static/favicon.ico usr/share/doc/salt/html/favicon.ico
usr/share/javascript/bootstrap/js/bootstrap.min.js usr/share/doc/salt/html/_static/js/vendor/bootstrap.min.js
usr/share/javascript/jquery/jquery.js usr/share/doc/salt/html/_static/js/vendor/jquery-1.9.1.js
usr/share/javascript/modernizr/modernizr.min.js usr/share/doc/salt/html/_static/js/vendor/modernizr-2.6.2-respond-1.1.0.min.js
usr/share/javascript/sphinxdoc/1.0/doctools.js usr/share/doc/salt/html/_static/doctools.js
usr/share/javascript/sphinxdoc/1.0/jquery.js usr/share/doc/salt/html/_static/jquery.js
usr/share/javascript/sphinxdoc/1.0/searchtools.js usr/share/doc/salt/html/_static/searchtools.js
usr/share/javascript/sphinxdoc/1.0/sidebar.js usr/share/doc/salt/html/_static/sidebar.js
usr/share/javascript/sphinxdoc/1.0/underscore.js usr/share/doc/salt/html/_static/underscore.js