[thuban] 02/03: Add patch for 'occurred' typo.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sun Feb 7 11:43:19 UTC 2016
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository thuban.
commit 041523ce59e9267ee259e178f2cd33bcfd6ae6a8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Feb 7 12:42:53 2016 +0100
Add patch for 'occurred' typo.
---
debian/changelog | 1 +
debian/patches/occurred-typo.patch | 226 +++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 228 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 42294cb..edacbc2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
thuban (1.2.2-10) UNRELEASED; urgency=medium
* Update Vcs-Git URL to use HTTPS.
+ * Add patch for 'occurred' typo.
-- Bas Couwenberg <sebastic at debian.org> Sat, 06 Feb 2016 12:10:42 +0100
diff --git a/debian/patches/occurred-typo.patch b/debian/patches/occurred-typo.patch
new file mode 100644
index 0000000..362ee15
--- /dev/null
+++ b/debian/patches/occurred-typo.patch
@@ -0,0 +1,226 @@
+Description: Fix 'occured' typo, replace with 'occurred'.
+Author: Bas Couwenberg <sebastic at debian.org>
+
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -8266,7 +8266,7 @@
+
+ 2003-06-18 Jonathan Coles <jonathan at intevation.de>
+
+- * setup.py: Fix a few problems that occured under Windows.
++ * setup.py: Fix a few problems that occurred under Windows.
+
+ 2003-06-18 Jonathan Coles <jonathan at intevation.de>
+
+--- a/Extensions/importAPR/apr.py
++++ b/Extensions/importAPR/apr.py
+@@ -196,7 +196,7 @@ class APR_TClr(ODBBaseObject):
+
+ def GetThubanColor(self):
+ """Return a Thuban Color object; returns None if a problem
+- occured.
++ occurred.
+ """
+ if hasattr(self, 'Red') or hasattr(self, 'Green') or \
+ hasattr(self, 'Blue'):
+--- a/Extensions/ogr/ogrstart.py
++++ b/Extensions/ogr/ogrstart.py
+@@ -110,7 +110,7 @@ def open_db(context):
+ if not has_layers:
+ canvas.FitMapToWindow()
+ except:
+- # Some error occured while initializing the layer
++ # Some error occurred while initializing the layer
+ context.mainwindow.RunMessageBox(_("Add Layer from database"),
+ _("Can't open the database table '%s'")
+ % dbtable)
+@@ -154,7 +154,7 @@ def OpenFileShapestore(mainwindow, sessi
+ store = ogrshapes.OGRFileShapeStore(session, filename, layername)
+ return store
+ except:
+- # Some error occured while initializing the layer
++ # Some error occurred while initializing the layer
+ mainwindow.RunMessageBox(_("Open datasource"),
+ _("Can't open the datasource '%s'")
+ % filename)
+@@ -182,7 +182,7 @@ def OpenDBShapestore(session, dbconn, la
+ id_column = id_column)
+ return store
+ except:
+- # Some error occured while initializing the layer
++ # Some error occurred while initializing the layer
+ context.mainwindow.RunMessageBox(_("Open datasource"),
+ _("Can't open the datasource '%s'")
+ % filename)
+--- a/Extensions/wms/capabilities.py
++++ b/Extensions/wms/capabilities.py
+@@ -86,7 +86,7 @@ class WMSCapabilities(WMSClient, WMSCapa
+ retrieve particular information from the fetched or loaded
+ capabilities XML.
+
+- If an error occured during processing an error text is assigned to
++ If an error occurred during processing an error text is assigned to
+ self.errorMsg. If everything went fine, this variable is set to
+ None. The current value can be retrieved by the getErrorMsg()
+ method.
+--- a/Extensions/wms/layer.py
++++ b/Extensions/wms/layer.py
+@@ -92,7 +92,7 @@ class WMSLayer(BaseLayer):
+ title -- Title of this layer.
+ url -- URL of the WMS-Server wich must contain '?'
+
+- If an error occured, self.error_msg is a string describing
++ If an error occurred, self.error_msg is a string describing
+ the problem(s). Else, self.error_msg is None.
+ """
+ BaseLayer.__init__(self, title, visible = True, projection = None)
+--- a/Thuban/UI/mainwindow.py
++++ b/Thuban/UI/mainwindow.py
+@@ -663,7 +663,7 @@ class MainWindow(DockFrame):
+ geometry_column = geo_column)
+ layer = Layer(title, store)
+ except:
+- # Some error occured while initializing the layer
++ # Some error occurred while initializing the layer
+ traceback.print_exc(file=sys.stderr)
+ self.RunMessageBox(_("Add Layer from database"),
+ _("Can't open the database table '%s'")
+--- a/Thuban/UI/projdialog.py
++++ b/Thuban/UI/projdialog.py
+@@ -388,7 +388,7 @@ class ProjFrame(NonModalNonParentDialog)
+
+ def __ShowError(self, filename, errstr):
+ wx.MessageDialog(self,
+- _("The following error occured:\n") +
++ _("The following error occurred:\n") +
+ filename + "\n" + errstr,
+ _("Error"), wx.OK | wx.ICON_ERROR).ShowModal()
+
+--- a/libraries/thuban/gdalwarp.cpp
++++ b/libraries/thuban/gdalwarp.cpp
+@@ -340,7 +340,7 @@ static CPLErr GetImageData(GDALDataset *
+ if (ret == CE_Failure)
+ {
+ PyErr_Format(PyExc_IOError,
+- "An unknown error occured while reading band %i in %s",
++ "An unknown error occurred while reading band %i in %s",
+ i, pszSrcFilename);
+ break;
+ }
+@@ -386,7 +386,7 @@ static CPLErr GetImageData(GDALDataset *
+ if (ret == CE_Failure)
+ {
+ PyErr_Format(PyExc_IOError,
+- "An unknown error occured while reading band 1 in %s", pszSrcFilename);
++ "An unknown error occurred while reading band 1 in %s", pszSrcFilename);
+ break;
+ }
+
+@@ -431,7 +431,7 @@ static CPLErr GetImageData(GDALDataset *
+ if (ret == CE_Failure)
+ {
+ PyErr_Format(PyExc_IOError,
+- "An unknown error occured while reading band 1 in %s",
++ "An unknown error occurred while reading band 1 in %s",
+ pszSrcFilename);
+ break;
+ }
+--- a/po/cs.po
++++ b/po/cs.po
+@@ -1626,7 +1626,7 @@ msgid "Export"
+ msgstr "Export"
+
+ #: ../Thuban/UI/projdialog.py:391
+-msgid "The following error occured:\n"
++msgid "The following error occurred:\n"
+ msgstr "Byla zji�t�na n�sleduj�c� chyba:\n"
+
+ #: ../Thuban/UI/projdialog.py:393
+--- a/po/de.po
++++ b/po/de.po
+@@ -1633,7 +1633,7 @@ msgid "Export"
+ msgstr "Export"
+
+ #: ../Thuban/UI/projdialog.py:391
+-msgid "The following error occured:\n"
++msgid "The following error occurred:\n"
+ msgstr "Der folgende Fehler trat auf:\n"
+
+ #: ../Thuban/UI/projdialog.py:393
+--- a/po/es.po
++++ b/po/es.po
+@@ -1633,7 +1633,7 @@ msgid "Export"
+ msgstr "Exportar"
+
+ #: ../Thuban/UI/projdialog.py:391
+-msgid "The following error occured:\n"
++msgid "The following error occurred:\n"
+ msgstr "Ocurrió el error siguiente:\n"
+
+ #: ../Thuban/UI/projdialog.py:393
+--- a/po/fr.po
++++ b/po/fr.po
+@@ -1633,7 +1633,7 @@ msgid "Export"
+ msgstr "Exporter"
+
+ #: ../Thuban/UI/projdialog.py:391
+-msgid "The following error occured:\n"
++msgid "The following error occurred:\n"
+ msgstr "L'erreur suivante s'est produite:\n"
+
+ #: ../Thuban/UI/projdialog.py:393
+--- a/po/hu.po
++++ b/po/hu.po
+@@ -1625,7 +1625,7 @@ msgid "Export"
+ msgstr "Export�l�s"
+
+ #: ../Thuban/UI/projdialog.py:391
+-msgid "The following error occured:\n"
++msgid "The following error occurred:\n"
+ msgstr "A k�vetkez� hiba t�rt�nt:\n"
+
+ #: ../Thuban/UI/projdialog.py:393
+--- a/po/it.po
++++ b/po/it.po
+@@ -1642,7 +1642,7 @@ msgid "Export"
+ msgstr "Esporta"
+
+ #: ../Thuban/UI/projdialog.py:391
+-msgid "The following error occured:\n"
++msgid "The following error occurred:\n"
+ msgstr "Si è verificato il seguente errore:\n"
+
+ #: ../Thuban/UI/projdialog.py:393
+--- a/po/pt_BR.po
++++ b/po/pt_BR.po
+@@ -1635,7 +1635,7 @@ msgid "Export"
+ msgstr "Exportar"
+
+ #: ../Thuban/UI/projdialog.py:391
+-msgid "The following error occured:\n"
++msgid "The following error occurred:\n"
+ msgstr "O seguinte erro ocorreu:\n"
+
+ #: ../Thuban/UI/projdialog.py:393
+--- a/po/ru.po
++++ b/po/ru.po
+@@ -1636,7 +1636,7 @@ msgid "Export"
+ msgstr "�������"
+
+ #: ../Thuban/UI/projdialog.py:391
+-msgid "The following error occured:\n"
++msgid "The following error occurred:\n"
+ msgstr "��������� ��������� ������: \n"
+
+ #: ../Thuban/UI/projdialog.py:393
+--- a/po/thuban.pot
++++ b/po/thuban.pot
+@@ -1587,7 +1587,7 @@ msgid "Export"
+ msgstr ""
+
+ #: ../Thuban/UI/projdialog.py:391
+-msgid "The following error occured:\n"
++msgid "The following error occurred:\n"
+ msgstr ""
+
+ #: ../Thuban/UI/projdialog.py:393
diff --git a/debian/patches/series b/debian/patches/series
index 7a363c5..a4c706b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ setup.patch
bitmappath.patch
gdal.patch
wxpython3.0.patch
+occurred-typo.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/thuban.git
More information about the Pkg-grass-devel
mailing list