[sagenb] 13/14: Fix some packaging issues raised by lintian
Ximin Luo
infinity0 at debian.org
Fri Dec 2 22:52:49 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 9408d14a9bffd04d84cc0d7cb4ea49abd841e6a3
Author: Ximin Luo <infinity0 at pwned.gg>
Date: Fri Dec 2 23:12:43 2016 +0100
Fix some packaging issues raised by lintian
---
debian/changelog | 4 +++-
debian/clean | 2 ++
debian/control | 27 +++++++++++++++++++++++----
debian/patches/debian-sage3d-java-paths.patch | 25 +++++++++++++++++++++++++
debian/patches/series | 1 +
debian/python-sagenb.lintian-overrides | 2 ++
debian/rules | 8 ++++++++
debian/source/lintian-overrides | 6 ++++++
8 files changed, 70 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 627de4b..9569962 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ sagenb (0.13+ds1-1) UNRELEASED; urgency=low
* Updated to 0.11.2.
[ Ximin Luo ]
- * Updated to 0.13 for Sage 7.3
+ * Updated to 0.13 for Sage 7.3.
+ * Strip out embedded copies of JS libraries.
+ * Initial release. (Closes: #846643)
-- Ximin Luo <infinity0 at debian.org> Mon, 03 Oct 2016 23:36:09 +0200
diff --git a/debian/clean b/debian/clean
new file mode 100644
index 0000000..f7876da
--- /dev/null
+++ b/debian/clean
@@ -0,0 +1,2 @@
+sagenb.egg-info/
+sass/.sass-cache/
diff --git a/debian/control b/debian/control
index 26c9ac1..2e51e0d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,21 +2,25 @@ Source: sagenb
Section: math
Priority: optional
Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: Felix Salfelder <felix at salfelder.org>
+Uploaders: Ximin Luo <infinity0 at debian.org>
Build-Depends: debhelper (>= 10),
dh-python,
ant,
libjava3d-java,
- python-dev,
+ python,
python-setuptools,
python-flask,
python-babel,
python-flask-oldsessions,
ruby-compass,
uglifyjs
-Standards-Version: 3.9.7
+Standards-Version: 3.9.8
+Homepage: https://github.com/sagemath/sagenb
+Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/sagenb.git/
+Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/sagenb.git/
Package: python-sagenb
+Section: python
Architecture: all
Depends: ${python:Depends}, ${misc:Depends},
libjs-codemirror,
@@ -27,4 +31,19 @@ Depends: ${python:Depends}, ${misc:Depends},
libjs-json,
libjs-prettify,
tinymce
-Description: sage-notebook
+Description: Standalone Sage Notebook
+ The Sage Notebook is a web-based graphical user interface for
+ mathematical software.
+ .
+ Sage is a different approach to mathematics software. It makes it easy for you
+ to use most mathematics software together. Sage includes GAP, GP/PARI, Maxima,
+ and Singular, and dozens of other open source math packages. It aims to be a
+ viable open source alternative to Magma, Maple, Mathematica, and MATLAB.
+ .
+ With the Sage Notebook anyone can create, collaborate on, and publish
+ interactive worksheets. In a worksheet, one can write code using Sage, Python,
+ and other software included in Sage. You can write programs that combine
+ serious mathematics with anything else.
+ .
+ Most of the notebook does not depend on having Sage installed. Only
+ a few miscellaneous functions are imported from Sage.
diff --git a/debian/patches/debian-sage3d-java-paths.patch b/debian/patches/debian-sage3d-java-paths.patch
new file mode 100644
index 0000000..9ea8a9a
--- /dev/null
+++ b/debian/patches/debian-sage3d-java-paths.patch
@@ -0,0 +1,25 @@
+Description: Give the correct classpaths for Sage 3D to work
+Author: Ximin Luo <infinity0 at debian.org>
+Forwarded: not-needed
+--- a/sagenb/data/sage3d/sage3d
++++ b/sagenb/data/sage3d/sage3d
+@@ -1,13 +1,8 @@
+ #!/bin/bash
+
+-#DIR=`pwd`
+-#cd `dirname "$0"`
+-#java -classpath lib/sage3d.jar:sun-libs/j3dcore.jar:sun-libs/gluegen-rt.jar:sun-libs/vecmath.jar:sun-libs/j3dutils.jar:sun-libs/jogl.jar \
+-# org.sagemath.sage3d.ObjectViewerApp "$DIR/$1"
+-
+-# See $SAGE3D_HOME/README.txt
+-SAGE3D_HOME="`"$SAGE_LOCAL"/bin/sage-pypkg-location sagenb`""/sagenb/data/sage3d"
+-cd $SAGE3D_HOME
+-export LD_LIBRARY_PATH="$SAGE3D_HOME/lib/amd64"
+-java -classpath lib/sage3d.jar:lib/ext/j3dcore.jar:lib/ext/vecmath.jar:lib/ext/j3dutils.jar \
+- org.sagemath.sage3d.ObjectViewerApp "$1"
++java -classpath \
++/usr/share/java/j3dcore.jar:\
++/usr/share/java/vecmath.jar:\
++/usr/share/java/j3dutils.jar:\
++/usr/lib/python2.7/dist-packages/sagenb/data/sage3d/lib/sage3d.jar \
++org.sagemath.sage3d.ObjectViewerApp "$@"
diff --git a/debian/patches/series b/debian/patches/series
index 5762485..f7283a8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ use-system-jquery.patch
disable-bgiframe.patch
disable-farbtastic-jpicker.patch
switch-system-jquery-vanderlee-colorpicker.patch
+debian-sage3d-java-paths.patch
diff --git a/debian/python-sagenb.lintian-overrides b/debian/python-sagenb.lintian-overrides
new file mode 100644
index 0000000..732f91d
--- /dev/null
+++ b/debian/python-sagenb.lintian-overrides
@@ -0,0 +1,2 @@
+# it's a private jar file and there's already an FHS exception for python directories
+python-sagenb: jar-not-in-usr-share usr/lib/python2.7/dist-packages/sagenb/data/sage3d/lib/sage3d.jar
diff --git a/debian/rules b/debian/rules
index 3f8af62..c0d9cee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -35,3 +35,11 @@ override_dh_auto_clean:
cd sass && compass clean
rm -rf sagenb/data/sage3d/build sagenb/data/sage3d/lib
rm -rf $(MIN_JS)
+
+DEST_PYPATH = debian/python-sagenb/usr/lib/python2.7/dist-packages
+override_dh_python2:
+ dh_python2
+ rm -f $(DEST_PYPATH)/sagenb/data/jquery/plugins/achtung/LICENSE.txt
+ rm -f $(DEST_PYPATH)/sagenb/data/sage3d/sage3d.js.1*
+ rm -rf $(DEST_PYPATH)/sagenb/data/sage3d/build*
+ rm -rf $(DEST_PYPATH)/sagenb/data/sage3d/src
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..b7cbda2
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,6 @@
+# false positive, it only refers to that license but doesn't use it
+sagenb source: license-problem-json-evil sagenb/notebook/js.py
+
+# manual inspection says it's legit, just a long line to construct some source code
+sagenb source: source-is-missing sagenb/data/graph_editor/processing.editor.js line length is 439 characters (>256)
+sagenb source: source-contains-prebuilt-javascript-object sagenb/data/graph_editor/processing.editor.js line length is 439 characters (>256)
--
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