[sagenb] 01/02: More packaging fixes
Ximin Luo
infinity0 at debian.org
Sat Dec 3 12:08:26 UTC 2016
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository sagenb.
commit 757c049d2c48359304233549021153a502267e30
Author: Ximin Luo <infinity0 at debian.org>
Date: Sat Dec 3 12:50:35 2016 +0100
More packaging fixes
---
debian/README.Debian | 22 ++++++++++++++++++++++
debian/patches/disable-bgiframe.patch | 2 +-
debian/patches/series | 1 +
debian/patches/update-jquery-3.patch | 22 ++++++++++++++++++++++
debian/patches/use-system-jquery.patch | 14 +++++++++-----
debian/rules | 7 ++++---
6 files changed, 59 insertions(+), 9 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
new file mode 100644
index 0000000..e29ab49
--- /dev/null
+++ b/debian/README.Debian
@@ -0,0 +1,22 @@
+Secure Notebook
+===============
+
+This current version of the SageNB Debian package does not yet support secure
+(HTTPS) operation. This is because the `certtool` program is not yet available
+in Debian. To fix this, we have a few options:
+
+- package certtool for Debian
+- patch SageNB to use openssl instead of certtool
+
+but I don't know when I'll be able to get around to this myself. In the
+meantime, patches are welcome! Or, you have a few workarounds:
+
+- use a reverse proxy server that supports HTTPS
+- if you just need it for personal use, you can use a SSH local forward:
+
+ your_work_client$ ssh -L 8080:localhost:8080 your_sagenb_server
+
+ will allow you to connect to localhost:8080 *on your_work_client*, in order
+ to access the SageNB instance running on your_sagenb_server.
+
+ -- Ximin Luo <infinity0 at debian.org> Sat, 03 Dec 2016 13:02:03 +0100
diff --git a/debian/patches/disable-bgiframe.patch b/debian/patches/disable-bgiframe.patch
index 28e6023..82de13f 100644
--- a/debian/patches/disable-bgiframe.patch
+++ b/debian/patches/disable-bgiframe.patch
@@ -14,7 +14,7 @@ Forwarded: not-needed
--- a/sagenb/data/sage/html/worksheet_listing.html
+++ b/sagenb/data/sage/html/worksheet_listing.html
@@ -28,7 +28,6 @@
- <link rel="stylesheet" href="/javascript/jqueryui/css/sage/jquery-ui-1.10.4.custom.css" />
+ <link rel="stylesheet" href="/javascript/jqueryui/css/sage/jquery-ui.min.css" />
<script type="text/javascript" src="/javascript/jqueryui/js/jquery-ui.min.js"></script>
<script type="text/javascript" src="/javascript/jquery/plugins/form/jquery.form.min.js"></script>
-<script type="text/javascript" src="/javascript/jquery/plugins/jquery.bgiframe.min.js"></script>
diff --git a/debian/patches/series b/debian/patches/series
index f7283a8..ab0f7ee 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,6 +3,7 @@ fix-sass-syntax.patch
fix-bullshit.patch
update-flask-0.11.patch
update-codemirror-version.patch
+update-jquery-3.patch
use-system-jquery.patch
disable-bgiframe.patch
disable-farbtastic-jpicker.patch
diff --git a/debian/patches/update-jquery-3.patch b/debian/patches/update-jquery-3.patch
new file mode 100644
index 0000000..8d688c7
--- /dev/null
+++ b/debian/patches/update-jquery-3.patch
@@ -0,0 +1,22 @@
+--- a/sagenb/data/sage/html/history.html
++++ b/sagenb/data/sage/html/history.html
+@@ -13,7 +13,7 @@
+ <a title="{{ gettext('Click here to turn the above into a Sage worksheet') }}" href="/live_history">{{ gettext('Create a new Sage worksheet version of the last 100 commands in the above log.') }}</a>
+ <a name="bottom"></a>
+ <script type="text/javascript">
+- $(window).load(function () {
++ $(window).on('load', function () {
+ window.location = "#bottom";
+ });
+ </script>
+--- a/sagenb/data/sage/js/notebook_lib.js
++++ b/sagenb/data/sage/js/notebook_lib.js
+@@ -337,7 +337,7 @@
+ // Quit the sage process on close for doc/pub-browser worksheets.
+ i = worksheet_filename.indexOf('/');
+ if (i !== -1 && worksheet_filename.slice(0, i) === '_sage_') {
+- $(window).unload(function () {
++ $(window).on('unload', function () {
+ quit_sage();
+ });
+ }
diff --git a/debian/patches/use-system-jquery.patch b/debian/patches/use-system-jquery.patch
index 1ff909e..1e7c4a3 100644
--- a/debian/patches/use-system-jquery.patch
+++ b/debian/patches/use-system-jquery.patch
@@ -8,9 +8,10 @@ Forwarded: not-needed
}
</style>
- <script type="text/javascript" src="/javascript/jquery/jquery-1.11.0.min.js"></script>
-+ <script type="text/javascript" src="/javascript/jquery/jquery.min.js"></script>
- <link rel="stylesheet" href="/javascript/jqueryui/css/sage/jquery-ui-1.10.4.custom.css" />
+- <link rel="stylesheet" href="/javascript/jqueryui/css/sage/jquery-ui-1.10.4.custom.css" />
- <script type="text/javascript" src="/javascript/jqueryui/js/jquery-ui-1.10.4.custom.min.js"></script>
++ <script type="text/javascript" src="/javascript/jquery/jquery.min.js"></script>
++ <link rel="stylesheet" href="/javascript/jqueryui/css/sage/jquery-ui.min.css" />
+ <script type="text/javascript" src="/javascript/jqueryui/js/jquery-ui.min.js"></script>
<script type="text/javascript" src="/javascript/graph_editor/processing.editor.min.js"></script>
<script type="text/javascript" src="/javascript/graph_editor/graph_editor.js"></script>
@@ -35,19 +36,22 @@ Forwarded: not-needed
-<script type="text/javascript" src="/javascript/jquery/jquery-1.11.0.min.js"></script>
+<script type="text/javascript" src="/javascript/jquery/jquery.min.js"></script>
<!-- jQuery UI - interacts, widgets, drag-drop, etc. -->
- <link rel="stylesheet" href="/javascript/jqueryui/css/sage/jquery-ui-1.10.4.custom.css" />
+-<link rel="stylesheet" href="/javascript/jqueryui/css/sage/jquery-ui-1.10.4.custom.css" />
-<script type="text/javascript" src="/javascript/jqueryui/js/jquery-ui-1.10.4.custom.min.js"></script>
++<link rel="stylesheet" href="/javascript/jqueryui/css/sage/jquery-ui.min.css" />
+<script type="text/javascript" src="/javascript/jqueryui/js/jquery-ui.min.js"></script>
<!-- jQuery plugins - color pickers, shift-click, AJAX forms, IE fixes, notifications -->
<link rel="stylesheet" href="/javascript/jquery/plugins/farbtastic/farbtastic.css" type="text/css" />
--- a/sagenb/data/sage/html/worksheet_listing.html
+++ b/sagenb/data/sage/html/worksheet_listing.html
-@@ -26,7 +26,7 @@
+@@ -25,8 +25,8 @@
+
{% block javascript %}
{% if not pub %}
- <link rel="stylesheet" href="/javascript/jqueryui/css/sage/jquery-ui-1.10.4.custom.css" />
+-<link rel="stylesheet" href="/javascript/jqueryui/css/sage/jquery-ui-1.10.4.custom.css" />
-<script type="text/javascript" src="/javascript/jqueryui/js/jquery-ui-1.10.4.custom.min.js"></script>
++<link rel="stylesheet" href="/javascript/jqueryui/css/sage/jquery-ui.min.css" />
+<script type="text/javascript" src="/javascript/jqueryui/js/jquery-ui.min.js"></script>
<script type="text/javascript" src="/javascript/jquery/plugins/form/jquery.form.min.js"></script>
<script type="text/javascript" src="/javascript/jquery/plugins/jquery.bgiframe.min.js"></script>
diff --git a/debian/rules b/debian/rules
index c0d9cee..8c14d23 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,12 +5,13 @@ export PYBUILD_NAME=sagenb
MIN_JS = \
sagenb/data/graph_editor/processing.editor.min.js \
sagenb/data/graph_editor/processing.min.js \
-# not following naming convention, but it's unused so just ignore it
-# sagenb/data/jquery/plugins/achtung/ui.achtung-min.js \
sagenb/data/jquery/plugins/achtung/ui.achtung-mod.min.js \
sagenb/data/jquery/plugins/extendedclick/jquery.event.extendedclick.min.js \
sagenb/data/jquery/plugins/jeditable/jquery.jeditable.min.js \
- sagenb/data/openid-realselector/js/jquery.openid.min.js \
+ sagenb/data/openid-realselector/js/jquery.openid.min.js
+# upstream has this, it's not following naming conventions, but it's also
+# unused so don't bother building it (and document why here)
+# sagenb/data/jquery/plugins/achtung/ui.achtung-min.js \
%:
dh "$@" --with python2 --buildsystem=pybuild
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sagenb.git
More information about the debian-science-commits
mailing list