[hamradio-commits] [pyqso] 07/09: Dependencies etc.

[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 550572a36f008d1031cc6579130e0255fe519948
Author: Iain R. Learmonth <irl at fsfe.org>
Date:   Sat Feb 7 22:40:09 2015 +0000

    Dependencies etc.
    
     * Disabling grey line module due to errors from the
       python-mpltoolkits.basemap package.
     * Adding hamlib and gtk python libraries as deps.
---
 .gitignore                            |  1 +
 debian/control                        |  3 ++-
 debian/patches/disable_greyline.patch | 38 +++++++++++++++++++++++++++++++++++
 debian/patches/series                 |  1 +
 4 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..224e7f0
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc/
diff --git a/debian/control b/debian/control
index 99ff8b8..8178334 100644
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,8 @@ Homepage: http://ctjacobs.github.io/pyqso/
 
 Package: pyqso
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
+           python-libhamlib2, python-gtk2
 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/patches/disable_greyline.patch b/debian/patches/disable_greyline.patch
new file mode 100644
index 0000000..36eac91
--- /dev/null
+++ b/debian/patches/disable_greyline.patch
@@ -0,0 +1,38 @@
+--- pyqso.orig/pyqso/grey_line.py
++++ pyqso/pyqso/grey_line.py
+@@ -18,19 +18,22 @@
+ #    You should have received a copy of the GNU General Public License
+ #    along with PyQSO.  If not, see <http://www.gnu.org/licenses/>.
+ 
+-from gi.repository import Gtk, GObject
+-import logging
+-from datetime import datetime
+-try:
+-   import numpy
+-   import matplotlib
+-   matplotlib.rcParams['font.size'] = 10.0
+-   from mpl_toolkits.basemap import Basemap
+-   from matplotlib.backends.backend_gtk3agg import FigureCanvasGTK3Agg as FigureCanvas
+-   have_necessary_modules = True
+-except ImportError:
+-   logging.error("Could not import a non-standard Python module needed by the GreyLine class. Check that all the PyQSO dependencies are satisfied.")
+-   have_necessary_modules = False
++#from gi.repository import Gtk, GObject
++#import logging
++#from datetime import datetime
++#try:
++#   import numpy
++#   import matplotlib
++#   matplotlib.rcParams['font.size'] = 10.0
++#   from mpl_toolkits.basemap import Basemap
++#   from matplotlib.backends.backend_gtk3agg import FigureCanvasGTK3Agg as FigureCanvas
++#   have_necessary_modules = True
++#except ImportError:
++#   logging.error("Could not import a non-standard Python module needed by the GreyLine class. Check that all the PyQSO dependencies are satisfied.")
++#   have_necessary_modules = False
++
++logging.error("The grey line module has been disabled to prevent errors arising from the python-mpltoolkits.basemap package.")
++have_necessary_modules = False
+ 
+ class GreyLine(Gtk.VBox):
+    """ A tool for visualising the grey line. """
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..d46590a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+disable_greyline.patch

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