[hamradio-commits] [pyqso] 09/09: Disable grey line, without breaking the whole thing

[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 872a4e9594ebde0cc71fb57281bdbeffbf9251e3
Author: Iain R. Learmonth <irl at fsfe.org>
Date:   Sat Feb 7 22:47:54 2015 +0000

    Disable grey line, without breaking the whole thing
---
 debian/patches/disable_greyline.patch | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/debian/patches/disable_greyline.patch b/debian/patches/disable_greyline.patch
index 36eac91..2fbc4a6 100644
--- a/debian/patches/disable_greyline.patch
+++ b/debian/patches/disable_greyline.patch
@@ -1,22 +1,9 @@
 --- pyqso.orig/pyqso/grey_line.py
 +++ pyqso/pyqso/grey_line.py
-@@ -18,19 +18,22 @@
+@@ -18,19 +18,24 @@
  #    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
@@ -31,6 +18,19 @@
 +#   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
  

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