[hamradio-commits] [pyqso] 04/09: Remove grey line tool disabling patch

[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 dcadb50fe81be39625c2912ba3af5187128934d7
Author: Iain R. Learmonth <irl at fsfe.org>
Date:   Sat Feb 7 23:26:41 2015 +0000

    Remove grey line tool disabling patch
---
 debian/patches/disable_greyline.patch | 38 -----------------------------------
 debian/patches/series                 |  1 -
 2 files changed, 39 deletions(-)

diff --git a/debian/patches/disable_greyline.patch b/debian/patches/disable_greyline.patch
deleted file mode 100644
index 2fbc4a6..0000000
--- a/debian/patches/disable_greyline.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- pyqso.orig/pyqso/grey_line.py
-+++ pyqso/pyqso/grey_line.py
-@@ -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
--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
index 316bda4..891b1fb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-disable_greyline.patch
 fix_icon_path.patch

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