Bug#999838: bullseye-pu: package grass/7.8.5-1+deb11u1

[Bas Couwenberg]

Package: release.debian.org
Severity: normal
Tags: bullseye
User: release.debian.org at packages.debian.org
Usertags: pu
X-Debbugs-Cc: pkg-grass-devel at lists.alioth.debian.org

[ Reason ]
GDAL based GRASS utilities fail as reported in #999828. This is fixed in 7.8.6, but still affects 7.8.5 bullseye. Cherry-picking the fix from 7.8.6 resolves the issue.

[ Impact ]
Unusuable GDAL based utilities.

[ Tests ]
Manually tested the fix in a bullseye VM.

[ Risks ]
Low.

[ Checklist ]
  [x] *all* changes are documented in the d/changelog
  [x] I reviewed all changes and I approve them
  [x] attach debdiff against the package in (old)stable
  [x] the issue is verified as fixed in unstable

[ Changes ]
The VCS branch is updated in the packaging metadata for the stable update.

The upstream commit fixing the issue is added as a patch.

[ Other info ]
N/A

Kind Regards,

Bas
-------------- next part --------------
diff -Nru grass-7.8.5/debian/changelog grass-7.8.5/debian/changelog
--- grass-7.8.5/debian/changelog	2020-12-21 20:35:24.000000000 +0100
+++ grass-7.8.5/debian/changelog	2021-11-17 13:33:25.000000000 +0100
@@ -1,3 +1,11 @@
+grass (7.8.5-1+deb11u1) bullseye; urgency=medium
+
+  * Update branch in gbp.conf & Vcs-Git URL.
+  * Add upstream patch to fix parsing GDAL formats with colon in description.
+    (closes: #999828)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Wed, 17 Nov 2021 13:33:25 +0100
+
 grass (7.8.5-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru grass-7.8.5/debian/control grass-7.8.5/debian/control
--- grass-7.8.5/debian/control	2020-12-21 20:24:53.000000000 +0100
+++ grass-7.8.5/debian/control	2021-11-17 13:33:15.000000000 +0100
@@ -53,7 +53,7 @@
                zlib1g-dev
 Standards-Version: 4.5.1
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/grass
-Vcs-Git: https://salsa.debian.org/debian-gis-team/grass.git
+Vcs-Git: https://salsa.debian.org/debian-gis-team/grass.git -b bullseye
 Homepage: https://grass.osgeo.org/
 
 Package: grass
diff -Nru grass-7.8.5/debian/gbp.conf grass-7.8.5/debian/gbp.conf
--- grass-7.8.5/debian/gbp.conf	2020-12-21 20:24:53.000000000 +0100
+++ grass-7.8.5/debian/gbp.conf	2021-11-17 13:33:06.000000000 +0100
@@ -6,7 +6,7 @@
 
 # The default name for the Debian branch is "master".
 # Change it if the name is different (for instance, "debian/unstable").
-debian-branch = master
+debian-branch = bullseye
 
 # git-import-orig uses the following names for the upstream tags.
 # Change the value if you are not using git-import-orig
diff -Nru grass-7.8.5/debian/patches/0001-fix-parsing-GDAL-OGR-formats-which-contains-a-colon-.patch grass-7.8.5/debian/patches/0001-fix-parsing-GDAL-OGR-formats-which-contains-a-colon-.patch
--- grass-7.8.5/debian/patches/0001-fix-parsing-GDAL-OGR-formats-which-contains-a-colon-.patch	1970-01-01 01:00:00.000000000 +0100
+++ grass-7.8.5/debian/patches/0001-fix-parsing-GDAL-OGR-formats-which-contains-a-colon-.patch	2021-11-17 13:33:25.000000000 +0100
@@ -0,0 +1,17 @@
+Description: fix parsing GDAL/OGR formats which contains a colon in a description
+Author: Martin Landa <landa.martin at gmail.com>
+Origin: https://github.com/OSGeo/grass/commit/0623bffd27cc499372a342d85a58ea928fd4bc27
+Bug: https://github.com/OSGeo/grass/pull/1226
+Bug-Debian: https://bugs.debian.org/999828
+
+--- a/gui/wxpython/core/utils.py
++++ b/gui/wxpython/core/utils.py
+@@ -672,7 +672,7 @@ def _parseFormats(output, writableOnly=F
+         patt = re.compile('\(rw\+?\)$', re.IGNORECASE)
+ 
+     for line in output.splitlines():
+-        key, name = map(lambda x: x.strip(), line.strip().rsplit(':', -1))
++        key, name = map(lambda x: x.strip(), line.strip().split(':', 1))
+ 
+         if writableOnly and not patt.search(key):
+             continue
diff -Nru grass-7.8.5/debian/patches/series grass-7.8.5/debian/patches/series
--- grass-7.8.5/debian/patches/series	2020-12-21 20:24:40.000000000 +0100
+++ grass-7.8.5/debian/patches/series	2021-11-17 13:33:25.000000000 +0100
@@ -2,3 +2,4 @@
 instdir
 no-fail-html.patch
 jquery.patch
+0001-fix-parsing-GDAL-OGR-formats-which-contains-a-colon-.patch