[grass] 04/06: Drop patches applied upstream, refresh remaining patches.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Fri Feb 20 22:40:48 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch experimental
in repository grass.
commit fb2a5a8c8f2f04f0fec5766cd6ee4377fff53989
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Feb 20 22:20:39 2015 +0100
Drop patches applied upstream, refresh remaining patches.
---
debian/changelog | 1 +
debian/patches/allows-to-typo.patch | 343 ------------------------------------
debian/patches/desktop.patch | 4 +-
debian/patches/series | 3 -
debian/patches/www-browser | 21 ---
debian/patches/wxpy3.0-compat.patch | 291 ------------------------------
6 files changed, 3 insertions(+), 660 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 26fe071..a0d2a98 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ grass (7.0.0-1) UNRELEASED; urgency=medium
* Update python-ctypes-ternary.patch to use if/else instead of and/or.
* Drop check4dev patch, rely on upstream check.
* Add build dependency on libpq-dev to grass-dev for libpq-fe.h.
+ * Drop patches applied upstream, refresh remaining patches.
-- Bas Couwenberg <sebastic at debian.org> Fri, 20 Feb 2015 22:11:58 +0100
diff --git a/debian/patches/allows-to-typo.patch b/debian/patches/allows-to-typo.patch
deleted file mode 100644
index eebb5ba..0000000
--- a/debian/patches/allows-to-typo.patch
+++ /dev/null
@@ -1,343 +0,0 @@
-Description: Fix 'allows to' typo, replace with 'allows <word>ing'.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: http://trac.osgeo.org/grass/ticket/2560
-Applied-Upstream: r64321, https://trac.osgeo.org/grass/changeset/64321
-Applied-Upstream: r64607, https://trac.osgeo.org/grass/changeset/64607
-
---- a/gui/wxpython/animation/data.py
-+++ b/gui/wxpython/animation/data.py
-@@ -270,7 +270,7 @@ class AnimationData(object):
-
-
- class AnimLayer(Layer):
-- """Animation layer allows to add either space-time dataset
-+ """Animation layer allows adding either space-time dataset
- or series of maps."""
- def __init__(self):
- Layer.__init__(self)
---- a/gui/wxpython/animation/dialogs.py
-+++ b/gui/wxpython/animation/dialogs.py
-@@ -1204,7 +1204,7 @@ class ExportDialog(wx.Dialog):
-
- class AnimSimpleLayerManager(SimpleLayerManager):
- """Simple layer manager for animation tool.
-- Allows to add space-time dataset or series of maps.
-+ Allows adding space-time dataset or series of maps.
- """
- def __init__(self, parent, layerList,
- lmgrStyle=SIMPLE_LMGR_RASTER | SIMPLE_LMGR_VECTOR |
---- a/gui/wxpython/animation/toolbars.py
-+++ b/gui/wxpython/animation/toolbars.py
-@@ -226,7 +226,7 @@ class MiscToolbar(BaseToolbar):
-
- class AnimSimpleLmgrToolbar(SimpleLmgrToolbar):
- """Simple layer manager toolbar for animation tool.
-- Allows to add space-time dataset or series of maps.
-+ Allows adding space-time dataset or series of maps.
- """
- def __init__(self, parent, lmgrStyle):
- SimpleLmgrToolbar.__init__(self, parent, lmgrStyle)
---- a/gui/wxpython/docs/wxGUI.iscatt.html
-+++ b/gui/wxpython/docs/wxGUI.iscatt.html
-@@ -3,7 +3,7 @@
-
- <h2>DESCRIPTION</h2>
-
--<b>Interactive Scatter Plot Tool</b> allows to analyze group of raster
-+<b>Interactive Scatter Plot Tool</b> allows analyzing group of raster
- maps. The tool is integrated into <em><a href="wxGUI.iclass.html">
- Supervised Classification Tool</a></em> (see the screen shot bellow).
- Also it is possible to launch it from Map Display Window (<tt>Analyze map
---- a/gui/wxpython/gcp/g.gui.gcp.py
-+++ b/gui/wxpython/gcp/g.gui.gcp.py
-@@ -20,7 +20,7 @@
- ############################################################################
-
- #%module
--#% description: Georectifies a map and allows to manage Ground Control Points.
-+#% description: Georectifies a map and allows managing Ground Control Points.
- #% keyword: general
- #% keyword: GUI
- #% keyword: georectification
---- a/gui/wxpython/gmodeler/g.gui.gmodeler.py
-+++ b/gui/wxpython/gmodeler/g.gui.gmodeler.py
-@@ -20,7 +20,7 @@
-
- #%module
- #% label: Graphical Modeler.
--#% description: Allows to interactively create, edit and manage models.
-+#% description: Allows interactively creating, editing and managing models.
- #% keyword: general
- #% keyword: GUI
- #% keyword: graphical modeler
---- a/gui/wxpython/mapdisp/test_mapdisp.py
-+++ b/gui/wxpython/mapdisp/test_mapdisp.py
-@@ -20,7 +20,7 @@
- ############################################################################
-
- #%module
--#% description: Georectifies a map and allows to manage Ground Control Points.
-+#% description: Georectifies a map and allows managing Ground Control Points.
- #% keyword: general
- #% keyword: GUI
- #% keyword: georectification
---- a/gui/wxpython/timeline/g.gui.timeline.py
-+++ b/gui/wxpython/timeline/g.gui.timeline.py
-@@ -20,7 +20,7 @@
- ############################################################################
-
- #%module
--#% description: Allows to compare temporal datasets by displaying their temporal extents in a plot.
-+#% description: Allows comparing temporal datasets by displaying their temporal extents in a plot.
- #% keyword: general
- #% keyword: GUI
- #% keyword: temporal
---- a/include/vect/dig_structs.h
-+++ b/include/vect/dig_structs.h
-@@ -502,7 +502,7 @@ struct Format_info_cache {
- /*!
- \brief Cache type
-
-- Currenly used only by PostGIS Topology which allows to cache the
-+ Currenly used only by PostGIS Topology which allows caching the
- whole map (CACHE_MAP) */
- int ctype;
- };
---- a/lib/arraystats/arraystatslib.dox
-+++ b/lib/arraystats/arraystatslib.dox
-@@ -30,7 +30,7 @@ The algorithm described above creates cl
- identical to a specific observation. It is thus necessary to decide to
- which class these observations should be attributed. It seems logical to
- prefer the densest, i.e. the one with the strongest slope. The
--automatisation of this method allows to distinguish classes with high
-+automatisation of this method allows distinguishing classes with high
- frequencies from those with low frequencies, but also to introduce
- subtleties and to delimit transition classes.
-
---- a/lib/init/variables.html
-+++ b/lib/init/variables.html
-@@ -91,7 +91,7 @@ PERMANENT
- modules extra to the standard distribution.</dd>
-
- <dt>GRASS_ADDON_BASE</dt>
-- <dd>[grass startup script]<br> allows to specify additional GISBASE
-+ <dd>[grass startup script]<br> allows specifying additional GISBASE
- for local GRASS modules (normally installed as GRASS Addons
- by <tt>g.extension</tt> module) extra to standard
- distribution. The default on GNU/Linux
---- a/lib/python/pydispatch/signal.py
-+++ b/lib/python/pydispatch/signal.py
-@@ -230,9 +230,9 @@ class Signal(object):
-
- # TODO: remove args?
- def __call__(self, *args, **kwargs):
-- """Allows to emit signal with function call syntax.
-+ """Allows emitting signal with function call syntax.
-
-- It allows to handle signal as a function or other callable object.
-+ It allows handling signal as a function or other callable object.
- So, the signal can be in the list of fuctions or can be connected as
- a handler for another signal.
- However, it is strongly recommended to use emit method for direct
---- a/raster/r.horizon/r.horizon.html
-+++ b/raster/r.horizon/r.horizon.html
-@@ -100,7 +100,7 @@ raster will be constructed as <i>basenam
- is the angle in degrees with the direction. If you use <b>r.horizon</b>
- in the single point mode this option will be ignored.
-
--<p>The <i>output</i> parameter allows to save the resulting horizon
-+<p>The <i>output</i> parameter allows saving the resulting horizon
- angles in a comma separated ASCII file (single point mode only). If
- you use <b>r.horizon</b> in the raster map mode this option will be ignored.
-
---- a/raster/r.in.lidar/r.in.lidar.html
-+++ b/raster/r.in.lidar/r.in.lidar.html
-@@ -89,12 +89,12 @@ A LiDAR pulse can have multiple returns.
- used to obtain a digital surface model (DSM) where e.g. canopy cover is
- represented. The last return values can be used to obtain a digital
- terrain model (DTM) where e.g. the forest floor instead of canopy
--cover is represented. The <b>return_filter</b> option allows to select one of
-+cover is represented. The <b>return_filter</b> option allows selecting one of
- first, mid, or last returns.
- <p>
- LiDAR points can be already classified into standardized classes. For example,
- class number 2 represents ground (for other classes see LAS format specification
--in references). The <b>class_filter</b> option allows to select one or more
-+in references). The <b>class_filter</b> option allows selecting one or more
- classes, as numbers (integers) separated by comma.
- <p>
- The default map <b>type</b>=<tt>FCELL</tt> is intended as compromise between
---- a/raster/r.li/r.li.html
-+++ b/raster/r.li/r.li.html
-@@ -32,7 +32,7 @@ The general procedure to calculate an in
-
- <ol>
- <li>run <em>g.gui.rlisetup</em>: create a configuration file selecting
-- the parts of raster map to be analyzed. This file allows to re-run
-+ the parts of raster map to be analyzed. This file allows re-running
- an analysis easily. It is stored on Windows in the directory <tt>C:\Users\userxy\AppData\Roaming\GRASS7\r.li\</tt>, on GNU/Linux in
- <tt>$HOME/.grass7/r.li/</tt>. <!-- TODO: and Mac OSX? -->
-
---- a/raster/r.regression.multi/r.regression.multi.html
-+++ b/raster/r.regression.multi/r.regression.multi.html
-@@ -47,7 +47,7 @@ excluding this variable, that is, this a
- by the current explaining variable after taking into consideration all
- the other explaining variables.
- <p>
--The F score for each explaining variable allows to test if the inclusion
-+The F score for each explaining variable allows testing if the inclusion
- of this variable significantly increases the explaining power of the
- model, relative to the global model excluding this explaining variable.
- That means that the F value for a given explaining variable is only
---- a/scripts/d.shade/d.shade.html
-+++ b/scripts/d.shade/d.shade.html
-@@ -7,7 +7,7 @@ table (as opposed to gray scale color ta
- used including categorical raster maps.
-
- <p>
--The advantage of this module is that it allows to visualize the shaded map
-+The advantage of this module is that it allows visualizing the shaded map
- without a need to create a new raster which would combine both.
- Comparing to creating shaded relief as semi-transparent overlay on
- the color raster map, this module gives result with more saturated colors.
---- a/scripts/db.droptable/db.droptable.html
-+++ b/scripts/db.droptable/db.droptable.html
-@@ -31,7 +31,7 @@ db.droptable -f table=sometable
-
- <h3>Removing an attribute table from given database</h3>
-
--<em>db.droptable</em> allows to define optionally <b>driver</b>
-+<em>db.droptable</em> allows defining optionally <b>driver</b>
- and <b>database</b> options different from default connection settings
- (<tt>db.connect -p</tt>).
-
---- a/scripts/r.in.wms/wms_drv.py
-+++ b/scripts/r.in.wms/wms_drv.py
-@@ -585,7 +585,7 @@ class WMTSRequestMgr(BaseRequestMgr):
- return best_t_mat
-
- def _getMetersPerUnit(self):
-- """!Get coefficient which allows to convert units of request projection into meters.
-+ """!Get coefficient which allows converting units of request projection into meters.
- """
- if self.meters_per_unit:
- return self.meters_per_unit
---- a/scripts/r.unpack/r.unpack.html
-+++ b/scripts/r.unpack/r.unpack.html
-@@ -1,6 +1,6 @@
- <h2>DESCRIPTION</h2>
-
--<em>r.unpack</em> allows to unpack raster maps packed by <em><a href="r.pack.html">r.pack</a></em>.
-+<em>r.unpack</em> allows unpacking raster maps packed by <em><a href="r.pack.html">r.pack</a></em>.
-
- <h2>NOTES</h2>
-
---- a/scripts/v.krige/v.krige.html
-+++ b/scripts/v.krige/v.krige.html
-@@ -1,6 +1,6 @@
- <h2>DESCRIPTION</h2>
-
--<em>v.krige</em> allows to perform kriging operations in GRASS
-+<em>v.krige</em> allows performing kriging operations in GRASS
- environment, using R software functions in background.
-
-
---- a/scripts/v.unpack/v.unpack.html
-+++ b/scripts/v.unpack/v.unpack.html
-@@ -1,6 +1,6 @@
- <h2>DESCRIPTION</h2>
-
--<em>v.unpack</em> allows to unpack vector maps packed by <em><a href="v.pack.html">v.pack</a></em>.
-+<em>v.unpack</em> allows unpacking vector maps packed by <em><a href="v.pack.html">v.pack</a></em>.
-
- <h2>NOTES</h2>
-
---- a/temporal/t.support/t.support.html
-+++ b/temporal/t.support/t.support.html
-@@ -4,7 +4,7 @@ This module is dedicated to modify and u
- <p>
- The title, description and the semantic type can be modified.
- <p>
--The flag <em>-u</em> allows to update the STDS metadata from registered
-+The flag <em>-u</em> allows updating the STDS metadata from registered
- map layers. This is useful in case the map layers have been modified
- without using temporal commands.
- <p>
---- a/vector/v.colors/v.colors.html
-+++ b/vector/v.colors/v.colors.html
-@@ -1,6 +1,6 @@
- <h2>DESCRIPTION</h2>
-
--<em>v.colors</em> allows to create or modify color table associated
-+<em>v.colors</em> allows creating or modifying color table associated
- with a vector map similarly
- to <em><a href="r.colors.html">r.colors</a></em> for raster maps.
-
---- a/vector/v.in.db/v.in.db.html
-+++ b/vector/v.in.db/v.in.db.html
-@@ -6,7 +6,7 @@ containing coordinates.
- <h2>NOTES</h2>
-
- If GRASS comes with <a href="grass-ogr.html">OGR</a> support
--than <em>v.in.db</em> allows to import data from different input
-+than <em>v.in.db</em> allows importing data from different input
- files, eg. CSV or MS Excel (assuming that GDAL/OGR library is compiled
- with this support).
-
---- a/vector/v.in.lidar/v.in.lidar.html
-+++ b/vector/v.in.lidar/v.in.lidar.html
-@@ -19,12 +19,12 @@ A LiDAR pulse can have multiple returns.
- used to obtain a digital surface model (DSM) where e.g. canopy cover is
- represented. The last return values can be used to obtain a digital
- terrain model (DTM) where e.g. the forest floor instead of canopy
--cover is represented. The <b>return_filter</b> option allows to select one of
-+cover is represented. The <b>return_filter</b> option allows selecting one of
- first, mid, or last returns.
- <p>
- LiDAR points can be already classified into standardized classes. For example,
- class number 2 represents ground (for other classes see LAS format specification
--in references). The <b>class_filter</b> option allows to select one or more
-+in references). The <b>class_filter</b> option allows selecting one or more
- classes, as numbers (integers) separated by comma.
-
- <h2>Location Creation</h2>
---- a/vector/v.out.postgis/v.out.postgis.html
-+++ b/vector/v.out.postgis/v.out.postgis.html
-@@ -93,7 +93,7 @@ Multigeometries are not currently suppor
- category are exported as multiple singe features.
-
- <p>
--<em>v.out.postgis</em> also allows to export vector features as
-+<em>v.out.postgis</em> also allows exporting vector features as
- <em>topological elements</em>
- in <a href="http://postgis.refractions.net/docs/Topology.html">PostGIS
- Topology</a> schema. PostGIS Topology extension uses three tables to
-@@ -218,7 +218,7 @@ by <em><a href="v.info.html">v.info</a><
-
- <h3>Export data without attributes</h3>
-
--<em>v.out.postgis</em> allows to ignore attributes when exporting
-+<em>v.out.postgis</em> allows ignoring attributes when exporting
- vector features by specifying <b>-t</b> flag.
-
- Command bellow exports vector features without attributes. The feature
-@@ -231,7 +231,7 @@ v.out.postgis -t input=railroads output=
- <h3>Export topological data</h3>
-
- By default <em>v.out.postgis</em> exports data as simple
--features. Flag <b>-l</b> allows to export data as topological elements
-+features. Flag <b>-l</b> allows exporting data as topological elements
- instead of simple features. Export topological elements is stored in
- <a href="http://postgis.refractions.net/docs/Topology.html">PostGIS
- Topology</a> schema.
---- a/vector/v.vol.rst/README
-+++ b/vector/v.vol.rst/README
-@@ -22,7 +22,7 @@ HISTORY:
- including 3D topo parameters, and 2nd RST derivatives
-
- 12/07/00 (MN) - added field selection parameter for sites lists
-- (allows to select column in site_lists)
-+ (allows selecting column in site_lists)
-
- copied from Mark 15.may.1996,
- just a beta version, not fully tested
diff --git a/debian/patches/desktop.patch b/debian/patches/desktop.patch
index f49d952..23dc530 100644
--- a/debian/patches/desktop.patch
+++ b/debian/patches/desktop.patch
@@ -3,7 +3,7 @@ Author: Bas Couwenberg <sebastic at xs4all.nl>
--- a/gui/icons/grass.desktop
+++ b/gui/icons/grass.desktop
-@@ -47,6 +47,7 @@ Comment[tr]=Coğrafi bilgi sistemi
+@@ -47,7 +47,7 @@ Comment[tr]=Coğrafi bilgi sistemi
Comment[uk]=Геоінформаційна система
Comment[uz]=Geografik axborot tizimi
Categories=Education;Science;Geoscience;Geography;
@@ -12,4 +12,4 @@ Author: Bas Couwenberg <sebastic at xs4all.nl>
+Exec=grass70
+Icon=grass70
Terminal=true
-+Keywords=wms;wfs;ogc;osgeo
+ Keywords=wms;wfs;ogc;osgeo
diff --git a/debian/patches/series b/debian/patches/series
index a7227ca..ba4211d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,6 @@
-www-browser
pager
instdir
python-ctypes-ternary.patch
no-fail-html.patch
-wxpy3.0-compat.patch
-allows-to-typo.patch
desktop.patch
appstream.patch
diff --git a/debian/patches/www-browser b/debian/patches/www-browser
deleted file mode 100644
index d361086..0000000
--- a/debian/patches/www-browser
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Prefer xdg-open and x-www-browser for HTML browser.
- GRASS 6 used a shell script to set the GRASS_HTML_BROWSER environment variable.
- GRASS 7 reimplemented the shell script in Python.
- .
- The original version of this patch was made by Francesco Paolo Lovergine, and
- ported to Python by Bas Couwenberg.
-Author: Francesco Paolo Lovergine <frankie at debian.org>
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Applied-Upstream: r64609, https://trac.osgeo.org/grass/changeset/64609
-
---- a/lib/init/grass.py
-+++ b/lib/init/grass.py
-@@ -476,7 +476,7 @@ def set_browser():
- browser = "explorer"
- else:
- # the usual suspects
-- browsers = ["xdg-open", "htmlview", "konqueror", "mozilla",
-+ browsers = ["xdg-open", "x-www-browser", "htmlview", "konqueror", "mozilla",
- "mozilla-firefox", "firefox", "iceweasel", "opera",
- "netscape", "dillo", "lynx", "links", "w3c"]
- for b in browsers:
diff --git a/debian/patches/wxpy3.0-compat.patch b/debian/patches/wxpy3.0-compat.patch
deleted file mode 100644
index 4f3022e..0000000
--- a/debian/patches/wxpy3.0-compat.patch
+++ /dev/null
@@ -1,291 +0,0 @@
-Description: Fix to work with wxPython 3.0
-Author: Olly Betts <olly at survex.com>
-Last-Update: 2014-08-16
-Bug: http://trac.osgeo.org/grass/ticket/2167
-Applied-Upstream: r64611, https://trac.osgeo.org/grass/changeset/64611
-
---- a/gui/wxpython/wxplot/profile.py
-+++ b/gui/wxpython/wxplot/profile.py
-@@ -341,7 +341,7 @@ class ProfileFrame(BasePlotFrame):
- dlg = wx.FileDialog(parent = self,
- message = _("Choose prefix for file(s) where to save profile values..."),
- defaultDir = os.getcwd(),
-- wildcard = _("Comma separated value (*.csv)|*.csv"), style = wx.SAVE)
-+ wildcard = _("Comma separated value (*.csv)|*.csv"), style = wx.FD_SAVE)
- pfile = []
- if dlg.ShowModal() == wx.ID_OK:
- path = dlg.GetPath()
---- a/gui/wxpython/psmap/frame.py
-+++ b/gui/wxpython/psmap/frame.py
-@@ -398,7 +398,7 @@ class PsMapFrame(wx.Frame):
- filename = ''
- dlg = wx.FileDialog(self, message = _("Save file as"), defaultDir = "",
- defaultFile = mapName, wildcard = wildcard,
-- style = wx.CHANGE_DIR | wx.SAVE | wx.OVERWRITE_PROMPT)
-+ style = wx.FD_CHANGE_DIR | wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT)
- if dlg.ShowModal() == wx.ID_OK:
- filename = dlg.GetPath()
- suffix = suffix[dlg.GetFilterIndex()]
-@@ -423,7 +423,7 @@ class PsMapFrame(wx.Frame):
- filename = ''
- dlg = wx.FileDialog(self, message = "Find instructions file", defaultDir = "",
- defaultFile = '', wildcard = "All files (*.*)|*.*",
-- style = wx.CHANGE_DIR|wx.OPEN)
-+ style = wx.FD_CHANGE_DIR|wx.FD_OPEN)
- if dlg.ShowModal() == wx.ID_OK:
- filename = dlg.GetPath()
- dlg.Destroy()
---- a/gui/wxpython/psmap/dialogs.py
-+++ b/gui/wxpython/psmap/dialogs.py
-@@ -1970,7 +1970,7 @@ class VPropertiesDialog(PsmapDialog):
- self.epsFileCtrl = filebrowse.FileBrowseButton(panel, id = wx.ID_ANY, labelText = '',
- buttonText = _("Browse"), toolTip = _("Type filename or click browse to choose file"),
- dialogTitle = _("Choose a file"), startDirectory = '', initialValue = '',
-- fileMask = "Encapsulated PostScript (*.eps)|*.eps|All files (*.*)|*.*", fileMode = wx.OPEN)
-+ fileMask = "Encapsulated PostScript (*.eps)|*.eps|All files (*.*)|*.*", fileMode = wx.FD_OPEN)
- if not self.vPropertiesDict['eps']:
- self.epsFileCtrl.SetValue('')
- else: #eps chosen
-@@ -2159,7 +2159,7 @@ class VPropertiesDialog(PsmapDialog):
- self.patFileCtrl = filebrowse.FileBrowseButton(panel, id = wx.ID_ANY, labelText = _("Choose pattern file:"),
- buttonText = _("Browse"), toolTip = _("Type filename or click browse to choose file"),
- dialogTitle = _("Choose a file"), startDirectory = self.patternPath, initialValue = '',
-- fileMask = "Encapsulated PostScript (*.eps)|*.eps|All files (*.*)|*.*", fileMode = wx.OPEN)
-+ fileMask = "Encapsulated PostScript (*.eps)|*.eps|All files (*.*)|*.*", fileMode = wx.FD_OPEN)
- self.patWidthText = wx.StaticText(panel, id = wx.ID_ANY, label = _("pattern line width (pts):"))
- self.patWidthSpin = wx.SpinCtrl(panel, id = wx.ID_ANY, min = 1, max = 25, initial = 1)
- self.patScaleText = wx.StaticText(panel, id = wx.ID_ANY, label = _("pattern scale factor:"))
---- a/gui/wxpython/modules/colorrules.py
-+++ b/gui/wxpython/modules/colorrules.py
-@@ -408,7 +408,7 @@ class ColorTable(wx.Frame):
- buttonText = _('Load'),
- toolTip = _("Type filename or click to choose "
- "file and load color table"),
-- startDirectory = os.getcwd(), fileMode = wx.OPEN,
-+ startDirectory = os.getcwd(), fileMode = wx.FD_OPEN,
- changeCallback = self.OnLoadRulesFile)
- self.saveRules = filebrowse.FileBrowseButton(parent = parent, id = wx.ID_ANY, fileMask = '*',
- labelText = '',
-@@ -416,7 +416,7 @@ class ColorTable(wx.Frame):
- toolTip = _("Type filename or click to choose "
- "file and save color table"),
- buttonText = _('Save'),
-- startDirectory = os.getcwd(), fileMode = wx.SAVE,
-+ startDirectory = os.getcwd(), fileMode = wx.FD_SAVE,
- changeCallback = self.OnSaveRulesFile)
-
- colorTable = ColorTablesComboBox(parent = parent, size=globalvar.DIALOG_COMBOBOX_SIZE,
---- a/gui/wxpython/modules/histogram.py
-+++ b/gui/wxpython/modules/histogram.py
-@@ -423,7 +423,7 @@ class HistogramFrame(wx.Frame):
- message = _("Choose a file name to save the image "
- "(no need to add extension)"),
- wildcard = filetype,
-- style=wx.SAVE | wx.FD_OVERWRITE_PROMPT)
-+ style=wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT)
-
- if dlg.ShowModal() == wx.ID_OK:
- path = dlg.GetPath()
---- a/gui/wxpython/modules/mcalc_builder.py
-+++ b/gui/wxpython/modules/mcalc_builder.py
-@@ -615,7 +615,7 @@ class MapCalcFrame(wx.Frame):
- dlg = wx.FileDialog(parent = self,
- message = _("Choose a file name to save the expression"),
- wildcard = _("Expression file (*)|*"),
-- style = wx.SAVE | wx.FD_OVERWRITE_PROMPT)
-+ style = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT)
- if dlg.ShowModal() == wx.ID_OK:
- path = dlg.GetPath()
- if not path:
-@@ -636,7 +636,7 @@ class MapCalcFrame(wx.Frame):
- dlg = wx.FileDialog(parent = self,
- message = _("Choose a file name to load the expression"),
- wildcard = _("Expression file (*)|*"),
-- style = wx.OPEN)
-+ style = wx.FD_OPEN)
- if dlg.ShowModal() == wx.ID_OK:
- path = dlg.GetPath()
- if not path:
---- a/gui/wxpython/location_wizard/wizard.py
-+++ b/gui/wxpython/location_wizard/wizard.py
-@@ -73,6 +73,8 @@ class TitledPage(BaseClass, wiz.WizardPa
- # main sizers
- self.pagesizer = wx.BoxSizer(wx.VERTICAL)
- self.sizer = wx.GridBagSizer(vgap = 0, hgap = 0)
-+ self.sizer.SetCols(5)
-+ self.sizer.SetRows(6)
-
- def DoLayout(self):
- """Do page layout"""
-@@ -1219,7 +1221,7 @@ class GeoreferencedFilePage(TitledPage):
- """Choose file"""
- dlg = wx.FileDialog(self,
- _("Select georeferenced file"),
-- os.getcwd(), "", "*.*", wx.OPEN)
-+ os.getcwd(), "", "*.*", wx.FD_OPEN)
- if dlg.ShowModal() == wx.ID_OK:
- path = dlg.GetPath()
- self.tfile.SetValue(path)
-@@ -1292,7 +1294,7 @@ class WKTPage(TitledPage):
- message = _("Select Well Known Text (WKT) .prj file"),
- defaultDir = os.getcwd(),
- wildcard = "PRJ files (*.prj)|*.prj|Files (*.*)|*.*",
-- style = wx.OPEN)
-+ style = wx.FD_OPEN)
-
- if dlg.ShowModal() == wx.ID_OK:
- path = dlg.GetPath()
-@@ -1469,7 +1471,7 @@ class EPSGPage(TitledPage):
- path = os.getcwd()
-
- dlg = wx.FileDialog(parent = self, message = _("Choose EPSG codes file"),
-- defaultDir = path, defaultFile = "", wildcard = "*", style = wx.OPEN)
-+ defaultDir = path, defaultFile = "", wildcard = "*", style = wx.FD_OPEN)
-
- if dlg.ShowModal() == wx.ID_OK:
- path = dlg.GetPath()
---- a/gui/wxpython/mapdisp/frame.py
-+++ b/gui/wxpython/mapdisp/frame.py
-@@ -592,7 +592,7 @@ class MapFrame(SingleMapFrame):
- message = _("Choose a file name to save the image "
- "(no need to add extension)"),
- wildcard = filetype,
-- style = wx.SAVE | wx.FD_OVERWRITE_PROMPT)
-+ style = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT)
-
- if dlg.ShowModal() == wx.ID_OK:
- path = dlg.GetPath()
---- a/gui/wxpython/gui_core/goutput.py
-+++ b/gui/wxpython/gui_core/goutput.py
-@@ -375,7 +375,7 @@ class GConsoleWindow(wx.SplitterWindow):
- defaultFile = "grass_cmd_output.txt",
- wildcard = _("%(txt)s (*.txt)|*.txt|%(files)s (*)|*") %
- {'txt': _("Text files"), 'files': _("Files")},
-- style = wx.SAVE | wx.FD_OVERWRITE_PROMPT)
-+ style = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT)
-
- # Show the dialog and retrieve the user response. If it is the OK response,
- # process the data.
-@@ -462,7 +462,7 @@ class GConsoleWindow(wx.SplitterWindow):
- defaultFile = "grass_cmd_log.txt",
- wildcard = _("%(txt)s (*.txt)|*.txt|%(files)s (*)|*") %
- {'txt': _("Text files"), 'files': _("Files")},
-- style = wx.SAVE)
-+ style = wx.FD_SAVE)
- if dlg.ShowModal() == wx.ID_OK:
- self.cmdFileProtocol = dlg.GetPath()
- else:
---- a/gui/wxpython/gui_core/forms.py
-+++ b/gui/wxpython/gui_core/forms.py
-@@ -1504,9 +1504,9 @@ class CmdPanel(wx.Panel):
- # file selector
- elif p.get('prompt','') != 'color' and p.get('prompt', '') == 'file':
- if p.get('age', 'new') == 'new':
-- fmode = wx.SAVE
-+ fmode = wx.FD_SAVE
- else:
-- fmode = wx.OPEN
-+ fmode = wx.FD_OPEN
- # check wildcard
- try:
- fExt = os.path.splitext(p.get('key_desc', ['*.*'])[0])[1]
-@@ -1915,7 +1915,7 @@ class CmdPanel(wx.Panel):
- dlg = wx.FileDialog(parent = self,
- message = _("Save input as..."),
- defaultDir = os.getcwd(),
-- style = wx.SAVE | wx.FD_OVERWRITE_PROMPT)
-+ style = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT)
-
- if dlg.ShowModal() == wx.ID_OK:
- path = dlg.GetPath()
---- a/gui/wxpython/gmodeler/frame.py
-+++ b/gui/wxpython/gmodeler/frame.py
-@@ -578,7 +578,7 @@ class ModelFrame(wx.Frame):
- defaultDir = "",
- defaultFile = "",
- wildcard = filetype,
-- style=wx.SAVE | wx.FD_OVERWRITE_PROMPT)
-+ style=wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT)
-
- if dlg.ShowModal() == wx.ID_OK:
- path = dlg.GetPath()
---- a/gui/wxpython/gcp/mapdisplay.py
-+++ b/gui/wxpython/gcp/mapdisplay.py
-@@ -383,7 +383,7 @@ class MapFrame(SingleMapFrame):
- message = _("Choose a file name to save the image "
- "(no need to add extension)"),
- wildcard = filetype,
-- style=wx.SAVE | wx.FD_OVERWRITE_PROMPT)
-+ style=wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT)
-
- if dlg.ShowModal() == wx.ID_OK:
- path = dlg.GetPath()
---- a/gui/wxpython/core/globalvar.py
-+++ b/gui/wxpython/core/globalvar.py
-@@ -43,7 +43,7 @@ from grass.script.core import get_comman
-
- def CheckWxVersion(version):
- """Check wx version"""
-- ver = wx.version().split(' ')[0]
-+ ver = wx.__version__
- if map(int, ver.split('.')) < version:
- return False
-
-@@ -63,7 +63,7 @@ def CheckForWx():
- # wxversion.select(str(minVersion[0]) + '.' + str(minVersion[1]))
- wxversion.ensureMinimal(str(minVersion[0]) + '.' + str(minVersion[1]))
- import wx
-- version = wx.version().split(' ')[0]
-+ version = wx.__version__
-
- if map(int, version.split('.')) < minVersion:
- raise ValueError('Your wxPython version is %s.%s.%s.%s' % tuple(version.split('.')))
---- a/gui/wxpython/animation/dialogs.py
-+++ b/gui/wxpython/animation/dialogs.py
-@@ -854,7 +854,7 @@ class ExportDialog(wx.Dialog):
- labelText=_("Image file:"),
- dialogTitle=_('Choose image file'),
- buttonText=_('Browse'),
-- startDirectory=os.getcwd(), fileMode=wx.OPEN,
-+ startDirectory=os.getcwd(), fileMode=wx.FD_OPEN,
- changeCallback=self.OnSetImage)
- self.imageBox.Add(self.browse, proportion=1, flag=wx.EXPAND)
- self.hidevbox.Add(self.imageBox, proportion=0, flag=wx.EXPAND | wx.BOTTOM, border=5)
-@@ -948,7 +948,7 @@ class ExportDialog(wx.Dialog):
- labelText=_("GIF file:"),
- dialogTitle=_("Choose file to save animation"),
- buttonText=_("Browse"),
-- startDirectory=os.getcwd(), fileMode=wx.SAVE)
-+ startDirectory=os.getcwd(), fileMode=wx.FD_SAVE)
- gifGridSizer = wx.GridBagSizer(hgap=5, vgap=5)
- gifGridSizer.AddGrowableCol(0)
- gifGridSizer.Add(self.gifBrowse, pos=(0, 0), flag = wx.EXPAND)
-@@ -965,7 +965,7 @@ class ExportDialog(wx.Dialog):
- labelText=_("SWF file:"),
- dialogTitle=_("Choose file to save animation"),
- buttonText=_("Browse"),
-- startDirectory=os.getcwd(), fileMode=wx.SAVE)
-+ startDirectory=os.getcwd(), fileMode=wx.FD_SAVE)
- swfGridSizer = wx.GridBagSizer(hgap=5, vgap=5)
- swfGridSizer.AddGrowableCol(0)
- swfGridSizer.Add(self.swfBrowse, pos=(0, 0), flag = wx.EXPAND)
-@@ -988,7 +988,7 @@ class ExportDialog(wx.Dialog):
- labelText=_("AVI file:"),
- dialogTitle=_("Choose file to save animation"),
- buttonText=_("Browse"),
-- startDirectory=os.getcwd(), fileMode=wx.SAVE)
-+ startDirectory=os.getcwd(), fileMode=wx.FD_SAVE)
- encodingLabel = wx.StaticText(parent=aviPanel, id=wx.ID_ANY, label=_("Video codec:"))
- self.encodingText = wx.TextCtrl(parent=aviPanel, id=wx.ID_ANY, value='mpeg4')
- optionsLabel = wx.StaticText(parent=aviPanel, label=_("Additional options:"))
---- a/gui/wxpython/mapswipe/frame.py
-+++ b/gui/wxpython/mapswipe/frame.py
-@@ -524,7 +524,7 @@ class SwipeMapFrame(DoubleMapFrame):
- message = _("Choose a file name to save the image "
- "(no need to add extension)"),
- wildcard = filetype,
-- style = wx.SAVE | wx.FD_OVERWRITE_PROMPT)
-+ style = wx.FD_SAVE | wx.FD_OVERWRITE_PROMPT)
-
- if dlg.ShowModal() == wx.ID_OK:
- path = dlg.GetPath()
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/grass.git
More information about the Pkg-grass-devel
mailing list