[hamradio-commits] [pyqso] 03/03: Updated to latest upstream 0.2

[Iain Learmonth]

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

irl-guest pushed a commit to branch master
in repository pyqso.

commit 34f02b0551922726db500cbf18f915588ca03d90
Author: Iain R. Learmonth <irl at fsfe.org>
Date:   Mon Mar 23 21:58:36 2015 +0000

    Updated to latest upstream 0.2
    
     * Latest upstream 0.2
     * Documentation is now Sphinx not LaTeX
---
 debian/changelog                    |  4 ++--
 debian/control                      | 25 +++++++++++++++++--------
 debian/docs                         |  2 +-
 debian/links                        |  2 ++
 debian/patches/remove_mathjax.patch | 15 +++++++++++++++
 debian/patches/series               |  1 +
 debian/pyqso.doc-base               |  5 +++--
 debian/rules                        |  5 ++++-
 8 files changed, 45 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index d113994..5f6be62 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
-pyqso (0.1+git2015020701-1) UNRELEASED; urgency=medium
+pyqso (0.2-1) UNRELEASED; urgency=medium
 
   * Initial release. (Closes: #777385)
 
- -- Iain R. Learmonth <irl at fsfe.org>  Sat, 07 Feb 2015 23:27:46 +0000
+ -- Iain R. Learmonth <irl at fsfe.org>  Mon, 23 Mar 2015 21:46:20 +0000
diff --git a/debian/control b/debian/control
index 6c13893..475e77e 100644
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,13 @@
 Source: pyqso
-Section: hamradio
-Priority: optional
 Maintainer: Debian Hamradio Maintainers <debian-hams at lists.debian.org>
 Uploaders: Iain R. Learmonth <irl at fsfe.org>
-Build-Depends: debhelper (>= 9), dh-python, python-all, python-setuptools,
-               texlive-latex-recommended
+Section: hamradio
+Priority: optional
+Build-Depends: debhelper (>= 9),
+               dh-python,
+               python-all,
+               python-setuptools,
+               python-sphinx
 Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-hamradio/pyqso.git
 Vcs-Git: http://anonscm.debian.org/git/pkg-hamradio/pyqso.git
@@ -12,9 +15,16 @@ Homepage: http://ctjacobs.github.io/pyqso/
 
 Package: pyqso
 Architecture: all
-Depends: ${misc:Depends}, ${python:Depends}, python-libhamlib2,
-         gir1.2-gtk-3.0, python-gi-cairo, python-mpltoolkits.basemap,
-         python-numpy, python-matplotlib
+Depends: ${misc:Depends},
+         ${python:Depends},
+         python-libhamlib2,
+         gir1.2-gtk-3.0,
+         python-gi-cairo,
+         python-mpltoolkits.basemap,
+         python-numpy,
+         python-matplotlib,
+         libjs-jquery,
+         libjs-underscore
 Description: logging tool for amateur radio operators
  PyQSO is a logging tool for amateur radio operators. It provides a simple
  graphical interface through which users can manage information about the
@@ -34,4 +44,3 @@ Description: logging tool for amateur radio operators
     with callsigns beginning with “M6”).
   * Remove duplicate QSOs.
   * Basic support for the Hamlib library.
-
diff --git a/debian/docs b/debian/docs
index 56a14e1..6d28621 100644
--- a/debian/docs
+++ b/debian/docs
@@ -1 +1 @@
-doc/manual.pdf
+build/html
diff --git a/debian/links b/debian/links
new file mode 100644
index 0000000..5cdb793
--- /dev/null
+++ b/debian/links
@@ -0,0 +1,2 @@
+usr/share/javascript/jquery/jquery.js usr/share/doc/pyqso/html/_static/jquery.js
+usr/share/javascript/underscore/underscore.js usr/share/doc/pyqso/html/_static/underscore.js
diff --git a/debian/patches/remove_mathjax.patch b/debian/patches/remove_mathjax.patch
new file mode 100644
index 0000000..ebe4dbb
--- /dev/null
+++ b/debian/patches/remove_mathjax.patch
@@ -0,0 +1,15 @@
+Description: Remove MathJax from Sphinx as is unused and causes privacy breach
+Author: Iain R. Learmonth <irl at fsfe.org>                                         
+Last-Update: 2015-03-23
+
+--- pyqso.orig/docs/source/conf.py
++++ pyqso/docs/source/conf.py
+@@ -32,7 +32,7 @@
+ extensions = [
+     'sphinx.ext.autodoc',
+     'sphinx.ext.intersphinx',
+-    'sphinx.ext.mathjax',
++    #'sphinx.ext.mathjax',
+     'sphinx.ext.ifconfig',
+     'sphinx.ext.viewcode',
+ ]
diff --git a/debian/patches/series b/debian/patches/series
index 891b1fb..061ecdf 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
 fix_icon_path.patch
+remove_mathjax.patch
diff --git a/debian/pyqso.doc-base b/debian/pyqso.doc-base
index 195aaac..768f3b2 100644
--- a/debian/pyqso.doc-base
+++ b/debian/pyqso.doc-base
@@ -4,6 +4,7 @@ Author: Christian Jacobs
 Abstract: This manual describes the functionality and usage of PyQSO.
 Section: Amateur Radio
 
-Format: pdf
-Files: /usr/share/doc/pyqso/manual.pdf.gz
+Format: html
+Index: /usr/share/doc/pyqso/html/index.html
+Files: /usr/share/doc/pyqso/html/*
 
diff --git a/debian/rules b/debian/rules
index a8b1337..f92e752 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,10 @@ export PYBUILD_NAME=pyqso
 	dh $@ --with python2 --buildsystem=pybuild
 
 override_dh_auto_build:
-	( cd doc ; pdflatex manual.tex )
+	PYTHONPATH=. http_proxy='localhost' sphinx-build -N -bhtml docs/source/ build/html  # HTML generator
+	rm -rf build/html/.doctrees
+	rm build/html/_static/jquery.js # Remove JQuery, this is linked in d/*.links
+	rm build/html/_static/underscore.js # Remove underscore, this is linked in d/*.links
 	dh_auto_build
 
 override_dh_auto_install:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-hamradio/pyqso.git