[grass] 07/10: Drop patches applied upstream, refresh remaining patches.
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Thu Oct 22 00:01:57 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 d1d5ae5c5ad3ce1fa67e7ef07842c9b02e26979a
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Oct 21 22:28:57 2015 +0200
Drop patches applied upstream, refresh remaining patches.
---
debian/changelog | 1 +
debian/patches/appstream.patch | 2 +-
debian/patches/desktop.patch | 12 +-
debian/patches/launched-typo.patch | 15 -
debian/patches/maintained-typo.patch | 21 --
debian/patches/no-fail-html.patch | 2 +-
debian/patches/optionally-typo.patch | 519 -----------------------------
debian/patches/pager | 2 +-
debian/patches/python-ctypes-ternary.patch | 54 ---
debian/patches/series | 4 -
10 files changed, 9 insertions(+), 623 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b480854..2ee5215 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ grass (7.0.2~rc1-1) UNRELEASED; urgency=medium
* New upstream release candidate.
* Update copyright years in copyright file.
+ * Drop patches applied upstream, refresh remaining patches.
-- Bas Couwenberg <sebastic at debian.org> Wed, 21 Oct 2015 22:07:29 +0200
diff --git a/debian/patches/appstream.patch b/debian/patches/appstream.patch
index d170e7a..67ea8fb 100644
--- a/debian/patches/appstream.patch
+++ b/debian/patches/appstream.patch
@@ -1,5 +1,5 @@
Description: Fix desktop filename.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
+Author: Bas Couwenberg <sebastic at debian.org>
Forwarded: not-needed
--- a/gui/icons/grass.appdata.xml
diff --git a/debian/patches/desktop.patch b/debian/patches/desktop.patch
index 356ea70..dd17f5b 100644
--- a/debian/patches/desktop.patch
+++ b/debian/patches/desktop.patch
@@ -1,16 +1,14 @@
-Description: Fix Exec & Icon for Debian.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
+Description: Fix desktop file for Debian.
+Author: Bas Couwenberg <sebastic at debian.org>
Forwarded: not-needed
--- a/gui/icons/grass.desktop
+++ b/gui/icons/grass.desktop
-@@ -47,7 +47,7 @@ Comment[tr]=Coğrafi bilgi sistemi
- Comment[uk]=Геоінформаційна система
+@@ -48,6 +48,6 @@ Comment[uk]=Геоінформаційн
Comment[uz]=Geografik axborot tizimi
Categories=Education;Science;Geoscience;Geography;
--Exec=grass7
+ Exec=grass70
-Icon=grass
-+Exec=grass70
+Icon=grass70
Terminal=true
- Keywords=wms;wfs;ogc;osgeo
+ Keywords=wms;wfs;ogc;osgeo;gis;
diff --git a/debian/patches/launched-typo.patch b/debian/patches/launched-typo.patch
deleted file mode 100644
index 047740a..0000000
--- a/debian/patches/launched-typo.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Fix 'lauched' typo, replace with 'launched'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://trac.osgeo.org/grass/ticket/2725
-
---- a/scripts/d.polar/d.polar.html
-+++ b/scripts/d.polar/d.polar.html
-@@ -20,7 +20,7 @@ are used.
- <h2>NOTES</h2>
-
- If the <b>output</b> parameter is used, the diagram is generated
--as EPS file. If the <b>-x</b> flag is used <em>xgraph</em> is lauched.
-+as EPS file. If the <b>-x</b> flag is used <em>xgraph</em> is launched.
- Otherwise <em>d.polar</em> will use <em>d.graph</em> to draw the plot
- in the current display frame.
- <p>If <em>d.polar</em> is used on an aspect map generated by
diff --git a/debian/patches/maintained-typo.patch b/debian/patches/maintained-typo.patch
deleted file mode 100644
index 9c67d20..0000000
--- a/debian/patches/maintained-typo.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Fix 'mantained' typo, replace with 'maintained'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://trac.osgeo.org/grass/ticket/2725
-
---- a/scripts/v.krige/v.krige.html
-+++ b/scripts/v.krige/v.krige.html
-@@ -163,12 +163,12 @@ R package gstat and will be part of a fu
- <h2>SEE ALSO</h2>
-
- R package <a href="http://cran.r-project.org/web/packages/gstat/index.html">gstat</a>,
--mantained by Edzer J. Pebesma and others
-+maintained by Edzer J. Pebesma and others
- <br>
-
- R
- package <a href="http://cran.r-project.org/web/packages/spgrass6/index.html">spgrass6</a>,
--mantained by Roger Bivand
-+maintained by Roger Bivand
- <br>
-
- The <a href="http://grasswiki.osgeo.org/wiki/R_statistics">Short
diff --git a/debian/patches/no-fail-html.patch b/debian/patches/no-fail-html.patch
index e77b143..7a86bd4 100644
--- a/debian/patches/no-fail-html.patch
+++ b/debian/patches/no-fail-html.patch
@@ -5,7 +5,7 @@ Description: Don't fail the build if HTML generation fails.
.
This single documentation error fails the entire build, to prevent this HTML
description errors are ignored.
-Author: Bas Couwenberg <sebastic at xs4all.nl>
+Author: Bas Couwenberg <sebastic at debian.org>
Forwarded: not-needed
--- a/include/Make/Html.make
diff --git a/debian/patches/optionally-typo.patch b/debian/patches/optionally-typo.patch
deleted file mode 100644
index 2ed5e03..0000000
--- a/debian/patches/optionally-typo.patch
+++ /dev/null
@@ -1,519 +0,0 @@
-Description: Fix 'optionaly' typo, replace with 'optionally'.
-Author: Bas Couwenberg <sebastic at debian.org>
-Forwarded: https://trac.osgeo.org/grass/ticket/2725
-
---- a/lib/symbol/README
-+++ b/lib/symbol/README
-@@ -64,7 +64,7 @@ END
-
- ARC X Y R A1 A2 [C]
- Arc specified by center (X Y), radius (R), start/end angle in degrees (A1/A2)
-- and optionaly direction (C for clockwise, default counter clockwise)
-+ and optionally direction (C for clockwise, default counter clockwise)
- Note degrees are polar theta not navigational, i.e. 0 is east and
- values increase counter-clockwise from there. Reducing the angle
- from a full circle does not make it draw like a pacman but rather
---- a/locale/po/grassmods_ar.po
-+++ b/locale/po/grassmods_ar.po
-@@ -6763,7 +6763,7 @@ msgid "Creates topology for vector map."
- msgstr "اسم الخريطة الراسترية المدخلة"
-
- #: ../vector/v.build/main.c:40
--msgid "Optionaly also checks for topological errors."
-+msgid "Optionally also checks for topological errors."
- msgstr ""
-
- #: ../vector/v.build/main.c:44
---- a/locale/po/grassmods_cs.po
-+++ b/locale/po/grassmods_cs.po
-@@ -6780,7 +6780,7 @@ msgid "Creates topology for vector map."
- msgstr "Vytvoří topologii vektorové vrstvy."
-
- #: ../vector/v.build/main.c:40
--msgid "Optionaly also checks for topological errors."
-+msgid "Optionally also checks for topological errors."
- msgstr ""
-
- #: ../vector/v.build/main.c:44
---- a/locale/po/grassmods_de.po
-+++ b/locale/po/grassmods_de.po
-@@ -6672,7 +6672,7 @@ msgid "Creates topology for vector map."
- msgstr "Erzeugt Topologie für GRASS Vektorkarten."
-
- #: ../vector/v.build/main.c:40
--msgid "Optionaly also checks for topological errors."
-+msgid "Optionally also checks for topological errors."
- msgstr ""
-
- #: ../vector/v.build/main.c:44
---- a/locale/po/grassmods_el.po
-+++ b/locale/po/grassmods_el.po
-@@ -6513,7 +6513,7 @@ msgid "Creates topology for vector map."
- msgstr "Αδυναμία ανάγνωσης διανυσματικού χάρτη"
-
- #: ../vector/v.build/main.c:40
--msgid "Optionaly also checks for topological errors."
-+msgid "Optionally also checks for topological errors."
- msgstr ""
-
- #: ../vector/v.build/main.c:44
---- a/locale/po/grassmods_es.po
-+++ b/locale/po/grassmods_es.po
-@@ -6769,7 +6769,7 @@ msgid "Creates topology for vector map."
- msgstr "Crea topología para mapa vectorial."
-
- #: ../vector/v.build/main.c:40
--msgid "Optionaly also checks for topological errors."
-+msgid "Optionally also checks for topological errors."
- msgstr "Opcionalmente revisa también errores topologícos."
-
- #: ../vector/v.build/main.c:44
---- a/locale/po/grassmods_fr.po
-+++ b/locale/po/grassmods_fr.po
-@@ -7037,7 +7037,7 @@ msgid "Creates topology for vector map."
- msgstr "Créer des icones pour le fichier vecteur GRASS et les attributs liés"
-
- #: ../vector/v.build/main.c:40
--msgid "Optionaly also checks for topological errors."
-+msgid "Optionally also checks for topological errors."
- msgstr ""
-
- #: ../vector/v.build/main.c:44
---- a/locale/po/grassmods_it.po
-+++ b/locale/po/grassmods_it.po
-@@ -6668,7 +6668,7 @@ msgid "Creates topology for vector map."
- msgstr "Crea etichette per vettoriali GRASS e attributi associati"
-
- #: ../vector/v.build/main.c:40
--msgid "Optionaly also checks for topological errors."
-+msgid "Optionally also checks for topological errors."
- msgstr ""
-
- #: ../vector/v.build/main.c:44
---- a/locale/po/grassmods_ja.po
-+++ b/locale/po/grassmods_ja.po
-@@ -6688,7 +6688,7 @@ msgid "Creates topology for vector map."
- msgstr "ベクトルマップのカテゴリーを編集，構築します"
-
- #: ../vector/v.build/main.c:40
--msgid "Optionaly also checks for topological errors."
-+msgid "Optionally also checks for topological errors."
- msgstr ""
-
- #: ../vector/v.build/main.c:44
---- a/locale/po/grassmods_ko.po
-+++ b/locale/po/grassmods_ko.po
-@@ -6531,7 +6531,7 @@ msgid "Creates topology for vector map."
- msgstr "출력할 격자지도"
-
- #: ../vector/v.build/main.c:40
--msgid "Optionaly also checks for topological errors."
-+msgid "Optionally also checks for topological errors."
- msgstr ""
-
- #: ../vector/v.build/main.c:44
---- a/locale/po/grassmods_lv.po
-+++ b/locale/po/grassmods_lv.po
-@@ -6767,7 +6767,7 @@ msgid "Creates topology for vector map."
- msgstr "Vektorkartes nosaukums"
-
- #: ../vector/v.build/main.c:40
--msgid "Optionaly also checks for topological errors."
-+msgid "Optionally also checks for topological errors."
- msgstr ""
-
- #: ../vector/v.build/main.c:44
---- a/locale/po/grassmods_pl.po
-+++ b/locale/po/grassmods_pl.po
-@@ -6704,7 +6704,7 @@ msgid "Creates topology for vector map."
- msgstr "Tworzy topologię dla wektorowej mapy GRASS."
-
- #: ../vector/v.build/main.c:40
--msgid "Optionaly also checks for topological errors."
-+msgid "Optionally also checks for topological errors."
- msgstr ""
-
- #: ../vector/v.build/main.c:44
---- a/locale/po/grassmods_pt.po
-+++ b/locale/po/grassmods_pt.po
-@@ -6857,7 +6857,7 @@ msgstr ""
- "relacionados."
-
- #: ../vector/v.build/main.c:40
--msgid "Optionaly also checks for topological errors."
-+msgid "Optionally also checks for topological errors."
- msgstr ""
-
- #: ../vector/v.build/main.c:44
---- a/locale/po/grassmods_pt_br.po
-+++ b/locale/po/grassmods_pt_br.po
-@@ -6850,7 +6850,7 @@ msgstr ""
- "relacionados."
-
- #: ../vector/v.build/main.c:40
--msgid "Optionaly also checks for topological errors."
-+msgid "Optionally also checks for topological errors."
- msgstr ""
-
- #: ../vector/v.build/main.c:44
---- a/locale/po/grassmods_ro.po
-+++ b/locale/po/grassmods_ro.po
-@@ -6296,7 +6296,7 @@ msgid "Creates topology for vector map."
- msgstr ""
-
- #: ../vector/v.build/main.c:40
--msgid "Optionaly also checks for topological errors."
-+msgid "Optionally also checks for topological errors."
- msgstr ""
-
- #: ../vector/v.build/main.c:44
---- a/locale/po/grassmods_ru.po
-+++ b/locale/po/grassmods_ru.po
-@@ -6750,7 +6750,7 @@ msgid "Creates topology for vector map."
- msgstr "Создать топологию для векторного слоя GRASS."
-
- #: ../vector/v.build/main.c:40
--msgid "Optionaly also checks for topological errors."
-+msgid "Optionally also checks for topological errors."
- msgstr ""
-
- #: ../vector/v.build/main.c:44
---- a/locale/po/grassmods_sl.po
-+++ b/locale/po/grassmods_sl.po
-@@ -6790,7 +6790,7 @@ msgid "Creates topology for vector map."
- msgstr "Ime vhodnega rastrskega sloja"
-
- #: ../vector/v.build/main.c:40
--msgid "Optionaly also checks for topological errors."
-+msgid "Optionally also checks for topological errors."
- msgstr ""
-
- #: ../vector/v.build/main.c:44
---- a/locale/po/grassmods_th.po
-+++ b/locale/po/grassmods_th.po
-@@ -1017,7 +1017,7 @@ msgid ""
- "Either 'from_table' (optionally with 'where') can be used or 'select' "
- "option, but not 'from_table' and 'select' at the same time."
- msgstr ""
--"คัดลอกตาราง. โดยใช้คำสั่ง 'from_table' (optionaly with 'where') หรือ 'select' "
-+"คัดลอกตาราง. โดยใช้คำสั่ง 'from_table' (optionally with 'where') หรือ 'select' "
- "option, แต่ไม่ใช่ 'from_table' และ 'select' พร้อมกัน"
-
- #: ../db/db.copy/main.c:46
-@@ -6750,7 +6750,7 @@ msgid "Creates topology for vector map."
- msgstr "สร้าง topology สำหรับ แผนที่เชิงเส้น GRASS."
-
- #: ../vector/v.build/main.c:40
--msgid "Optionaly also checks for topological errors."
-+msgid "Optionally also checks for topological errors."
- msgstr ""
-
- #: ../vector/v.build/main.c:44
---- a/locale/po/grassmods_tr.po
-+++ b/locale/po/grassmods_tr.po
-@@ -6666,7 +6666,7 @@ msgid "Creates topology for vector map."
- msgstr "GRASS vektör dosyası için topoloji oluşturur."
-
- #: ../vector/v.build/main.c:40
--msgid "Optionaly also checks for topological errors."
-+msgid "Optionally also checks for topological errors."
- msgstr ""
-
- #: ../vector/v.build/main.c:44
---- a/locale/po/grassmods_vi.po
-+++ b/locale/po/grassmods_vi.po
-@@ -6755,7 +6755,7 @@ msgid "Creates topology for vector map."
- msgstr "Tạo tôpô cho bản đồ vector của GRASS."
-
- #: ../vector/v.build/main.c:40
--msgid "Optionaly also checks for topological errors."
-+msgid "Optionally also checks for topological errors."
- msgstr ""
-
- #: ../vector/v.build/main.c:44
---- a/locale/po/grassmods_zh.po
-+++ b/locale/po/grassmods_zh.po
-@@ -6755,7 +6755,7 @@ msgid "Creates topology for vector map."
- msgstr "为 GRASS 矢量文件和附加属性创建标签。"
-
- #: ../vector/v.build/main.c:40
--msgid "Optionaly also checks for topological errors."
-+msgid "Optionally also checks for topological errors."
- msgstr ""
-
- #: ../vector/v.build/main.c:44
---- a/locale/po/grasswxpy_cs.po
-+++ b/locale/po/grasswxpy_cs.po
-@@ -11733,7 +11733,7 @@ msgstr "Vytvořit nebo přebudovat topol
-
- #: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1459
- msgid ""
--"Creates topology for vector map. Optionaly also checks for topological "
-+"Creates topology for vector map. Optionally also checks for topological "
- "errors."
- msgstr ""
- "Vytvoří topologii vektorové vrstvy. Volitelně také zkontroluje topologické "
---- a/locale/po/grasswxpy_de.po
-+++ b/locale/po/grasswxpy_de.po
-@@ -11593,7 +11593,7 @@ msgstr "Topologie erzeugen/wiederherstel
-
- #: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1459
- msgid ""
--"Creates topology for vector map. Optionaly also checks for topological "
-+"Creates topology for vector map. Optionally also checks for topological "
- "errors."
- msgstr ""
-
---- a/locale/po/grasswxpy_el.po
-+++ b/locale/po/grasswxpy_el.po
-@@ -10930,7 +10930,7 @@ msgstr ""
-
- #: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1459
- msgid ""
--"Creates topology for vector map. Optionaly also checks for topological "
-+"Creates topology for vector map. Optionally also checks for topological "
- "errors."
- msgstr ""
-
---- a/locale/po/grasswxpy_es.po
-+++ b/locale/po/grasswxpy_es.po
-@@ -11790,7 +11790,7 @@ msgstr "Crear o reconstruir topología."
-
- #: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1459
- msgid ""
--"Creates topology for vector map. Optionaly also checks for topological "
-+"Creates topology for vector map. Optionally also checks for topological "
- "errors."
- msgstr ""
-
---- a/locale/po/grasswxpy_fr.po
-+++ b/locale/po/grasswxpy_fr.po
-@@ -10605,7 +10605,7 @@ msgid "Create or rebuild topology"
- msgstr "Créer ou reconstruire la topologie"
-
- #: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1459
--msgid "Creates topology for vector map. Optionaly also checks for topological errors."
-+msgid "Creates topology for vector map. Optionally also checks for topological errors."
- msgstr "Créer la topologie pour la carte vecteur. En option, vérifie les erreurs de topologie."
-
- #: ../gui/wxpython/menustrings.py:561 ../gui/wxpython/menustrings.py:1460
---- a/locale/po/grasswxpy_id.po
-+++ b/locale/po/grasswxpy_id.po
-@@ -11934,7 +11934,7 @@ msgstr "Buat/bangun-ulang topologi"
-
- #: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1459
- msgid ""
--"Creates topology for vector map. Optionaly also checks for topological "
-+"Creates topology for vector map. Optionally also checks for topological "
- "errors."
- msgstr ""
-
---- a/locale/po/grasswxpy_it.po
-+++ b/locale/po/grasswxpy_it.po
-@@ -11142,7 +11142,7 @@ msgstr "Crea o ricrea topologia"
-
- #: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1459
- msgid ""
--"Creates topology for vector map. Optionaly also checks for topological "
-+"Creates topology for vector map. Optionally also checks for topological "
- "errors."
- msgstr ""
-
---- a/locale/po/grasswxpy_ja.po
-+++ b/locale/po/grasswxpy_ja.po
-@@ -11527,7 +11527,7 @@ msgstr "トポロジーの作成/再ビ�
-
- #: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1459
- msgid ""
--"Creates topology for vector map. Optionaly also checks for topological "
-+"Creates topology for vector map. Optionally also checks for topological "
- "errors."
- msgstr ""
-
---- a/locale/po/grasswxpy_ko.po
-+++ b/locale/po/grasswxpy_ko.po
-@@ -10632,7 +10632,7 @@ msgstr ""
-
- #: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1459
- msgid ""
--"Creates topology for vector map. Optionaly also checks for topological "
-+"Creates topology for vector map. Optionally also checks for topological "
- "errors."
- msgstr ""
-
---- a/locale/po/grasswxpy_lv.po
-+++ b/locale/po/grasswxpy_lv.po
-@@ -10863,7 +10863,7 @@ msgstr ""
-
- #: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1459
- msgid ""
--"Creates topology for vector map. Optionaly also checks for topological "
-+"Creates topology for vector map. Optionally also checks for topological "
- "errors."
- msgstr ""
-
---- a/locale/po/grasswxpy_ml.po
-+++ b/locale/po/grasswxpy_ml.po
-@@ -11298,7 +11298,7 @@ msgstr ""
-
- #: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1459
- msgid ""
--"Creates topology for vector map. Optionaly also checks for topological "
-+"Creates topology for vector map. Optionally also checks for topological "
- "errors."
- msgstr ""
-
---- a/locale/po/grasswxpy_pl.po
-+++ b/locale/po/grasswxpy_pl.po
-@@ -11326,7 +11326,7 @@ msgstr "Utwórz/przebuduj topologię"
-
- #: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1459
- msgid ""
--"Creates topology for vector map. Optionaly also checks for topological "
-+"Creates topology for vector map. Optionally also checks for topological "
- "errors."
- msgstr ""
-
---- a/locale/po/grasswxpy_pt.po
-+++ b/locale/po/grasswxpy_pt.po
-@@ -12117,7 +12117,7 @@ msgstr "Crear/reconstruir topología"
-
- #: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1459
- msgid ""
--"Creates topology for vector map. Optionaly also checks for topological "
-+"Creates topology for vector map. Optionally also checks for topological "
- "errors."
- msgstr ""
-
---- a/locale/po/grasswxpy_pt_br.po
-+++ b/locale/po/grasswxpy_pt_br.po
-@@ -12403,7 +12403,7 @@ msgstr "Crear/reconstruir topología"
-
- #: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1459
- msgid ""
--"Creates topology for vector map. Optionaly also checks for topological "
-+"Creates topology for vector map. Optionally also checks for topological "
- "errors."
- msgstr ""
-
---- a/locale/po/grasswxpy_ro.po
-+++ b/locale/po/grasswxpy_ro.po
-@@ -11646,7 +11646,7 @@ msgstr "Crează sau reconstruiește topo
-
- #: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1459
- msgid ""
--"Creates topology for vector map. Optionaly also checks for topological "
-+"Creates topology for vector map. Optionally also checks for topological "
- "errors."
- msgstr ""
-
---- a/locale/po/grasswxpy_ru.po
-+++ b/locale/po/grasswxpy_ru.po
-@@ -11874,7 +11874,7 @@ msgstr "Создать/построит�
-
- #: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1459
- msgid ""
--"Creates topology for vector map. Optionaly also checks for topological "
-+"Creates topology for vector map. Optionally also checks for topological "
- "errors."
- msgstr ""
-
---- a/locale/po/grasswxpy_th.po
-+++ b/locale/po/grasswxpy_th.po
-@@ -11387,7 +11387,7 @@ msgstr ""
-
- #: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1459
- msgid ""
--"Creates topology for vector map. Optionaly also checks for topological "
-+"Creates topology for vector map. Optionally also checks for topological "
- "errors."
- msgstr ""
-
---- a/locale/po/grasswxpy_tr.po
-+++ b/locale/po/grasswxpy_tr.po
-@@ -11812,7 +11812,7 @@ msgstr "Topoloji oluştur/yeniden kur"
-
- #: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1459
- msgid ""
--"Creates topology for vector map. Optionaly also checks for topological "
-+"Creates topology for vector map. Optionally also checks for topological "
- "errors."
- msgstr ""
-
---- a/locale/po/grasswxpy_vi.po
-+++ b/locale/po/grasswxpy_vi.po
-@@ -11935,7 +11935,7 @@ msgstr "Tạo hoặc dựng lại tôpô
-
- #: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1459
- msgid ""
--"Creates topology for vector map. Optionaly also checks for topological "
-+"Creates topology for vector map. Optionally also checks for topological "
- "errors."
- msgstr ""
-
---- a/locale/po/grasswxpy_zh.po
-+++ b/locale/po/grasswxpy_zh.po
-@@ -11451,7 +11451,7 @@ msgstr "创建或重建拓扑"
-
- #: ../gui/wxpython/menustrings.py:560 ../gui/wxpython/menustrings.py:1459
- msgid ""
--"Creates topology for vector map. Optionaly also checks for topological "
-+"Creates topology for vector map. Optionally also checks for topological "
- "errors."
- msgstr ""
-
---- a/scripts/r.pack/r.pack.html
-+++ b/scripts/r.pack/r.pack.html
-@@ -9,7 +9,7 @@ by <em><a href="r.unpack.html">r.unpack<
- <h2>NOTES</h2>
-
- Name of the pack file is determined by default from <b>input</b>
--parameter. Optionaly the name can be given by <b>output</b> parameter.
-+parameter. Optionally the name can be given by <b>output</b> parameter.
-
- Currently only 2D raster maps are supported.
-
---- a/scripts/r.unpack/r.unpack.html
-+++ b/scripts/r.unpack/r.unpack.html
-@@ -5,7 +5,7 @@
- <h2>NOTES</h2>
-
- Name of the raster map is determined by default from pack file
--internals. Optionaly the name can be given by <b>output</b> parameter.
-+internals. Optionally the name can be given by <b>output</b> parameter.
-
- Currently only 2D raster maps are supported.
-
---- a/scripts/v.pack/v.pack.html
-+++ b/scripts/v.pack/v.pack.html
-@@ -10,7 +10,7 @@ by <em><a href="v.unpack.html">v.unpack<
- <h2>NOTES</h2>
-
- Name of the pack file is determined by default from <b>input</b>
--parameter. Optionaly the name can be given by <b>output</b> parameter.
-+parameter. Optionally the name can be given by <b>output</b> parameter.
-
-
- <h2>EXAMPLE</h2>
---- a/scripts/v.unpack/v.unpack.html
-+++ b/scripts/v.unpack/v.unpack.html
-@@ -5,7 +5,7 @@
- <h2>NOTES</h2>
-
- Name of the vector map is determined by default from pack file
--internals. Optionaly the name can be given by <b>output</b> parameter.
-+internals. Optionally the name can be given by <b>output</b> parameter.
-
- <h2>EXAMPLE</h2>
-
---- a/vector/v.build/main.c
-+++ b/vector/v.build/main.c
-@@ -37,7 +37,7 @@ int main(int argc, char *argv[])
- G_add_keyword(_("topology"));
- G_add_keyword(_("geometry"));
- module->label = _("Creates topology for vector map.");
-- module->description = _("Optionaly also checks for topological errors.");
-+ module->description = _("Optionally also checks for topological errors.");
-
- map_opt = G_define_standard_option(G_OPT_V_MAP);
- map_opt->label = NULL;
diff --git a/debian/patches/pager b/debian/patches/pager
index e8b5784..b3c96e2 100644
--- a/debian/patches/pager
+++ b/debian/patches/pager
@@ -5,7 +5,7 @@ Description: Perfer pager over more.
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>
+Author: Bas Couwenberg <sebastic at debian.org>
Forwarded: not-needed
--- a/lib/init/grass.py
diff --git a/debian/patches/python-ctypes-ternary.patch b/debian/patches/python-ctypes-ternary.patch
deleted file mode 100644
index b5f8cda..0000000
--- a/debian/patches/python-ctypes-ternary.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-Description: Enclose Python ternary in parenthesis.
- This fixes an issue with the C to Python conversion of the stat & stat64
- structs on GNU/Hurd. The structs define the final member conditionally:
- .
- #define _SPARE_SIZE ((sizeof (__fsid_t) == sizeof (int)) ? 9 : 8)
- int st_spare[_SPARE_SIZE]; /* Room for future expansion. */
- #undef _SPARE_SIZE
- .
- This gets converted by ctypesgen to:
- .
- ('st_spare', c_int * (sizeof(__fsid_t) == sizeof(c_int)) and 9 or 8),
- .
- Which causes a TypeError:
- .
- TypeError: second item in _fields_ tuple (index 17) must be a C type
- .
- Enclosing the Python expression in parenthesis to become:
- .
- ('st_spare', c_int * ((sizeof(__fsid_t) == sizeof(c_int)) and 9 or 8)),
- .
- fixes the TypeError.
- .
- While the and/or idiom is common it's also unsafe, because it can return
- wrong results when the "and" value has a false boolean value. See:
- .
- https://docs.python.org/3.4/faq/programming.html#is-there-an-equivalent-of-c-s-ternary-operator
- .
- In the st_spare case this is not a problem, but it can cause problems for
- other conversions in the future.
- .
- Instead of the and/or idiom the recommended if/else idiom is used.
- .
- The st_spare member thus becomes:
- .
- ('st_spare', c_int * (9 if (sizeof(__fsid_t) == sizeof(c_int)) else 8)),
- .
-Author: Bas Couwenberg <sebastic at xs4all.nl>
-Forwarded: https://trac.osgeo.org/grass/ticket/2581
-
---- a/lib/python/ctypes/ctypesgencore/expressions.py
-+++ b/lib/python/ctypes/ctypesgencore/expressions.py
-@@ -208,9 +208,9 @@ class ConditionalExpressionNode(Expressi
- return self.no.evaluate(context)
-
- def py_string(self, can_be_ctype):
-- return "%s and %s or %s" % \
-- (self.cond.py_string(True),
-- self.yes.py_string(can_be_ctype),
-+ return "(%s if %s else %s)" % \
-+ (self.yes.py_string(can_be_ctype),
-+ self.cond.py_string(True),
- self.no.py_string(can_be_ctype))
-
- class AttributeExpressionNode(ExpressionNode):
diff --git a/debian/patches/series b/debian/patches/series
index df03c4f..964da22 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,9 +1,5 @@
pager
instdir
-python-ctypes-ternary.patch
no-fail-html.patch
desktop.patch
appstream.patch
-optionally-typo.patch
-maintained-typo.patch
-launched-typo.patch
--
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