[hamradio-commits] [pyqso] 03/04: Updates for new version

[Iain R. Learmonth]

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

irl pushed a commit to branch master
in repository pyqso.

commit 5953c7945d186a8dc5ecb309c86809ac7e739f1d
Author: Iain R. Learmonth <irl at debian.org>
Date:   Sun Aug 6 17:48:29 2017 +0100

    Updates for new version
---
 debian/control                     | 13 +++++++------
 debian/install                     |  1 +
 debian/patches/fix_icon_path.patch | 24 ------------------------
 debian/patches/series              |  1 -
 debian/rules                       | 11 +----------
 5 files changed, 9 insertions(+), 41 deletions(-)

diff --git a/debian/control b/debian/control
index 5d63681..15d1fde 100644
--- a/debian/control
+++ b/debian/control
@@ -1,22 +1,23 @@
 Source: pyqso
 Maintainer: Debian Hamradio Maintainers <debian-hams at lists.debian.org>
-Uploaders: Iain R. Learmonth <irl at fsfe.org>
+Uploaders: Iain R. Learmonth <irl at debian.org>
 Section: hamradio
 Priority: optional
 Build-Depends: debhelper (>= 9),
                dh-python,
                python3-all,
-               python-setuptools,
+               python3-setuptools,
                python-sphinx
-Standards-Version: 3.9.8
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-hamradio/pyqso.git
-Vcs-Git: http://anonscm.debian.org/git/pkg-hamradio/pyqso.git
+Standards-Version: 4.0.0
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-hamradio/pyqso.git
+Vcs-Git: https://anonscm.debian.org/git/pkg-hamradio/pyqso.git
 Homepage: http://christianjacobs.uk/pyqso
 
 Package: pyqso
 Architecture: all
 Depends: ${misc:Depends},
          ${python3:Depends},
+         ${sphinxdoc:Depends},
          gir1.2-gtk-3.0,
          python3-gi-cairo,
          python3-mpltoolkits.basemap,
@@ -24,7 +25,7 @@ Depends: ${misc:Depends},
          python3-matplotlib,
          libjs-jquery,
          libjs-underscore
-Recommends: python3-libhamlib2,
+Recommends: python3-libhamlib2
 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
diff --git a/debian/install b/debian/install
index bc0d4f2..518250e 100644
--- a/debian/install
+++ b/debian/install
@@ -1 +1,2 @@
 debian/pyqso.desktop	/usr/share/applications
+pyqso/res/log_64x64.png	/usr/share/icons
diff --git a/debian/patches/fix_icon_path.patch b/debian/patches/fix_icon_path.patch
deleted file mode 100644
index 6898bf4..0000000
--- a/debian/patches/fix_icon_path.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: Correct path for icon to the correct path
-Author: Iain R. Learmonth <irl at fsfe.org>
-Last-Update: 2015-02-07
-
---- a/bin/pyqso
-+++ b/bin/pyqso
-@@ -71,7 +71,7 @@
- 
-         self.set_size_request(800, 600)  # Default to an 800 x 600 resolution.
-         self.set_position(Gtk.WindowPosition.CENTER)
--        possible_icon_paths = [os.path.join(pyqso_path, "icons", "log_64x64.png")]
-+        possible_icon_paths = ["/usr/share/icons/log_64x64.png"]
-         for icon_path in possible_icon_paths:
-             try:
-                 self.set_icon_from_file(icon_path)
-@@ -142,7 +142,7 @@
- You should have received a copy of the GNU General Public License
- along with this program.  If not, see <http://www.gnu.org/licenses/>.""")
-         about.set_comments("PyQSO: A contact logging tool for amateur radio operators.")
--        possible_icon_paths = [os.path.join(pyqso_path, "icons", "log_64x64.png")]
-+        possible_icon_paths = ["/usr/share/icons/log_64x64.png"]
-         for icon_path in possible_icon_paths:
-             try:
-                 about.set_logo(GdkPixbuf.Pixbuf.new_from_file_at_scale(icon_path, 64, 64, False))
diff --git a/debian/patches/series b/debian/patches/series
index 061ecdf..fa5a8b0 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-fix_icon_path.patch
 remove_mathjax.patch
diff --git a/debian/rules b/debian/rules
index 8d1441c..c21b136 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,17 +2,8 @@
 export PYBUILD_NAME=pyqso
 
 %:
-	dh $@ --with python3 --buildsystem=pybuild
+	dh $@ --with python3,sphinxdoc --buildsystem=pybuild
 
 override_dh_auto_build:
 	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:
-	dh_auto_install
-	mkdir debian/pyqso/usr/share
-	mv debian/pyqso/usr/icons debian/pyqso/usr/share
-

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