Bug#993523: bullseye-pu: package osmcoastline/2.3.0-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 ]
As reported on the GIS list by the upstream author, osmcoastline in
bullseye doesn't work with projections other than WGS84.

[ Impact ]
Only partially functional osmcoastline.

[ Tests ]
Upstream CI.

[ Risks ]
Very 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 ]
Updated branch in gbp.conf & Vcs-Git URL.

Add upstream patch to fix #993518.

[ Other info ]
N/A

Kind Regards,

Bas
-------------- next part --------------
diff -Nru osmcoastline-2.3.0/debian/changelog osmcoastline-2.3.0/debian/changelog
--- osmcoastline-2.3.0/debian/changelog	2021-01-08 16:22:58.000000000 +0100
+++ osmcoastline-2.3.0/debian/changelog	2021-09-02 15:43:37.000000000 +0200
@@ -1,3 +1,11 @@
+osmcoastline (2.3.0-1+deb11u1) bullseye; urgency=medium
+
+  * Update branch in gbp.conf & Vcs-Git URL.
+  * Add upstream patch to fix projections other than WGS84.
+    (closes: #993518)
+
+ -- Bas Couwenberg <sebastic at debian.org>  Thu, 02 Sep 2021 15:43:37 +0200
+
 osmcoastline (2.3.0-1) unstable; urgency=medium
 
   * New upstream release.
diff -Nru osmcoastline-2.3.0/debian/control osmcoastline-2.3.0/debian/control
--- osmcoastline-2.3.0/debian/control	2021-01-08 16:22:30.000000000 +0100
+++ osmcoastline-2.3.0/debian/control	2021-09-02 15:43:31.000000000 +0200
@@ -18,7 +18,7 @@
                zlib1g-dev
 Standards-Version: 4.5.1
 Vcs-Browser: https://salsa.debian.org/debian-gis-team/osmcoastline
-Vcs-Git: https://salsa.debian.org/debian-gis-team/osmcoastline.git
+Vcs-Git: https://salsa.debian.org/debian-gis-team/osmcoastline.git -b bullseye
 Homepage: https://osmcode.org/osmcoastline/
 
 Package: osmcoastline
diff -Nru osmcoastline-2.3.0/debian/gbp.conf osmcoastline-2.3.0/debian/gbp.conf
--- osmcoastline-2.3.0/debian/gbp.conf	2019-07-07 09:13:36.000000000 +0200
+++ osmcoastline-2.3.0/debian/gbp.conf	2021-09-02 15:43:23.000000000 +0200
@@ -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 osmcoastline-2.3.0/debian/patches/0001-Fix-axis-order-problem-with-GDAL-3.patch osmcoastline-2.3.0/debian/patches/0001-Fix-axis-order-problem-with-GDAL-3.patch
--- osmcoastline-2.3.0/debian/patches/0001-Fix-axis-order-problem-with-GDAL-3.patch	1970-01-01 01:00:00.000000000 +0100
+++ osmcoastline-2.3.0/debian/patches/0001-Fix-axis-order-problem-with-GDAL-3.patch	2021-09-02 15:43:37.000000000 +0200
@@ -0,0 +1,20 @@
+Description: Fix axis order problem with GDAL 3.
+ In GDAL 3 the axis order for WGS84 changed from lon, lat to lat, lon!
+ So we need to use the magic "CRS84" instead which does the same thing in
+ GDAL 2 and GDAL 3. See https://gdal.org/tutorials/osr_api_tut.html .
+Author: Jochen Topf <jochen at topf.org>
+Origin: https://github.com/osmcode/osmcoastline/commit/a0a95090410106730d57eb31d2cf5869f4539be8
+Bug-Debian: https://bugs.debian.org/993518
+Forwarded: not-needed
+
+--- a/src/srs.hpp
++++ b/src/srs.hpp
+@@ -60,7 +60,7 @@ public:
+     }; // class TransformationException
+ 
+     SRS() noexcept {
+-        m_srs_wgs84.SetWellKnownGeogCS("WGS84");
++        m_srs_wgs84.SetWellKnownGeogCS("CRS84");
+     }
+ 
+     /**
diff -Nru osmcoastline-2.3.0/debian/patches/series osmcoastline-2.3.0/debian/patches/series
--- osmcoastline-2.3.0/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ osmcoastline-2.3.0/debian/patches/series	2021-09-02 15:43:37.000000000 +0200
@@ -0,0 +1 @@
+0001-Fix-axis-order-problem-with-GDAL-3.patch