Your message dated Sat, 17 Aug 2019 11:05:29 +0000
with message-id <e1hywwx-0008ls...@fasolo.debian.org>
and subject line Bug#934159: fixed in metview 5.6.1-1
has caused the Debian Bug report #934159,
regarding metview: FTBFS after new magics++
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
934159: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=934159
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Source: metview
Version: 5.3.0-3
Severity: serious
tags: patch

Hello, magics++ changed interpretAsMatrix prototype, and now metview is FTBFS.

The new upstream release has already a fix, but I'm posting a minimal debdiff 
here.

Also, new metview changed the METVIEW_EXTRA_INCLUDES variable, so also a change 
in rules file is needed now.


diff -Nru metview-5.3.0/debian/changelog metview-5.3.0/debian/changelog
--- metview-5.3.0/debian/changelog      2019-07-18 16:30:29.000000000 +0200
+++ metview-5.3.0/debian/changelog      2019-08-07 17:13:08.000000000 +0200
@@ -1,3 +1,10 @@
+metview (5.3.0-4) unstable; urgency=medium
+
+  * debian/rules: fixup includes directive for terralib
+  * Cherry-pick upstream build fix (Closes: #-1)
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org>  Wed, 07 Aug 2019 
17:13:08 +0200
+
 metview (5.3.0-3) unstable; urgency=medium

   * Standards-Version: 4.4.0
diff -Nru metview-5.3.0/debian/patches/fix-build-new-magics.patch 
metview-5.3.0/debian/patches/fix-build-new-magics.patch
--- metview-5.3.0/debian/patches/fix-build-new-magics.patch     1970-01-01 
01:00:00.000000000 +0100
+++ metview-5.3.0/debian/patches/fix-build-new-magics.patch     2019-08-07 
17:13:07.000000000 +0200
@@ -0,0 +1,16 @@
+Description: Cherry-pick upstream fix for the metview build.
+
+Last-Update: 2019-08-07
+
+--- metview-5.3.0.orig/src/Reprojection/ReprojectService.cc
++++ metview-5.3.0/src/Reprojection/ReprojectService.cc
+@@ -57,7 +57,8 @@ ReprojectService::execute()
+ 
+ 
+     magics::Matrix *matrix = 0;
+-    gribInterpreter.interpretAsMatrix(grib, &matrix);
++    gribInterpreter.interpretAsMatrix(grib);
++    matrix = grib.u();
+     if (!matrix)
+     {
+         MagLog::dev() << "ERROR: interpretAsMatrix failed on file " << 
gribIn_ << "\n";
diff -Nru metview-5.3.0/debian/patches/series 
metview-5.3.0/debian/patches/series
--- metview-5.3.0/debian/patches/series 2019-07-18 16:30:29.000000000 +0200
+++ metview-5.3.0/debian/patches/series 2019-08-07 17:12:51.000000000 +0200
@@ -12,3 +12,4 @@
 syserrlist.patch
 qt5-transition.patch
 g++14.patch
+fix-build-new-magics.patch
diff -Nru metview-5.3.0/debian/rules metview-5.3.0/debian/rules
--- metview-5.3.0/debian/rules  2019-07-18 16:30:29.000000000 +0200
+++ metview-5.3.0/debian/rules  2019-08-07 17:13:08.000000000 +0200
@@ -72,7 +72,7 @@
                -DMETVIEW_SITE=debian  \
                -DCMAKE_BUILD_TYPE=Release \
                -DMETVIEW_EXTRA_LIBRARIES='terralib -lemosR64 -leccodes 
-leckit' \
-               -DMETVIEW_EXTRA_INCLUDES='/usr/include/terralib/kernel' \
+               -DMETVIEW_EXTRA_INCLUDE_DIRS='/usr/include/terralib/kernel' \
                -DMAGICS_HAVE_METVIEW=True \
diff -Nru metview-5.3.0/debian/changelog metview-5.3.0/debian/changelog
--- metview-5.3.0/debian/changelog      2019-07-18 16:30:29.000000000 +0200
+++ metview-5.3.0/debian/changelog      2019-08-07 17:13:08.000000000 +0200
@@ -1,3 +1,10 @@
+metview (5.3.0-4) unstable; urgency=medium
+
+  * debian/rules: fixup includes directive for terralib
+  * Cherry-pick upstream build fix (Closes: #-1)
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org>  Wed, 07 Aug 2019 
17:13:08 +0200
+
 metview (5.3.0-3) unstable; urgency=medium

   * Standards-Version: 4.4.0
diff -Nru metview-5.3.0/debian/patches/fix-build-new-magics.patch 
metview-5.3.0/debian/patches/fix-build-new-magics.patch
--- metview-5.3.0/debian/patches/fix-build-new-magics.patch     1970-01-01 
01:00:00.000000000 +0100
+++ metview-5.3.0/debian/patches/fix-build-new-magics.patch     2019-08-07 
17:13:07.000000000 +0200
@@ -0,0 +1,16 @@
+Description: Cherry-pick upstream fix for the metview build.
+
+Last-Update: 2019-08-07
+
+--- metview-5.3.0.orig/src/Reprojection/ReprojectService.cc
++++ metview-5.3.0/src/Reprojection/ReprojectService.cc
+@@ -57,7 +57,8 @@ ReprojectService::execute()
+ 
+ 
+     magics::Matrix *matrix = 0;
+-    gribInterpreter.interpretAsMatrix(grib, &matrix);
++    gribInterpreter.interpretAsMatrix(grib);
++    matrix = grib.u();
+     if (!matrix)
+     {
+         MagLog::dev() << "ERROR: interpretAsMatrix failed on file " << 
gribIn_ << "\n";
diff -Nru metview-5.3.0/debian/patches/series 
metview-5.3.0/debian/patches/series
--- metview-5.3.0/debian/patches/series 2019-07-18 16:30:29.000000000 +0200
+++ metview-5.3.0/debian/patches/series 2019-08-07 17:12:51.000000000 +0200
@@ -12,3 +12,4 @@
 syserrlist.patch
 qt5-transition.patch
 g++14.patch
+fix-build-new-magics.patch
diff -Nru metview-5.3.0/debian/rules metview-5.3.0/debian/rules
--- metview-5.3.0/debian/rules  2019-07-18 16:30:29.000000000 +0200
+++ metview-5.3.0/debian/rules  2019-08-07 17:13:08.000000000 +0200
@@ -72,7 +72,7 @@
                -DMETVIEW_SITE=debian  \
                -DCMAKE_BUILD_TYPE=Release \
                -DMETVIEW_EXTRA_LIBRARIES='terralib -lemosR64 -leccodes 
-leckit' \
-               -DMETVIEW_EXTRA_INCLUDES='/usr/include/terralib/kernel' \
+               -DMETVIEW_EXTRA_INCLUDE_DIRS='/usr/include/terralib/kernel' \
                -DMAGICS_HAVE_METVIEW=True \
                -DMAGICS_HAVE_NETCDF=True \
                -DMAGICS_PATH=/usr \

--- End Message ---
--- Begin Message ---
Source: metview
Source-Version: 5.6.1-1

We believe that the bug you reported is fixed in the latest version of
metview, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 934...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
Alastair McKinstry <mckins...@debian.org> (supplier of updated metview package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Format: 1.8
Date: Fri, 16 Aug 2019 15:52:11 +0100
Source: metview
Architecture: source
Version: 5.6.1-1
Distribution: unstable
Urgency: medium
Maintainer: Alastair McKinstry <mckins...@debian.org>
Changed-By: Alastair McKinstry <mckins...@debian.org>
Closes: 934064 934159
Changes:
 metview (5.6.1-1) unstable; urgency=medium
 .
   * New upstream release
   * fixes from Gianfranco Costamagna: Closes: #934064, #934159
   * Use debhelper-compat (=12)
   * Update hack in d/rules to read fortran mod dir
   * no-zero-size-arrays.patch: fix compile error
   * Now require magics >= 4.0.3-1 to build
   * Build-depend on libncurses5-dev for eckit to build
   * Disable downloads in build ; supply -data file with source
   * Enable mir-tools
   * METVIEW_EXTRA_INCLUDES now METVIEW_EXTRA_INCLUDE_DIRS
   * -dev pkg now depends on libodb-api-dev for eckit includes, libs
   * Metview recommends: flextra, flexpart
Checksums-Sha1:
 f2ec74b27563cedb0fd14ab4f88b55dda39317ec 2974 metview_5.6.1-1.dsc
 021cd233a1ea150bdbd81649468be72dbad0b90d 5561480 metview_5.6.1.orig-data.tar.xz
 b44b671db392e76deeb18590357b35234f44e8a5 42450484 metview_5.6.1.orig.tar.xz
 06f0de4ad8e538353f2458f17774753a3a5716e8 38128 metview_5.6.1-1.debian.tar.xz
Checksums-Sha256:
 f8f4491ccfaf8ebbbc8ef650364397bd24a234dc75390ee3b8e8f955a7f748dc 2974 
metview_5.6.1-1.dsc
 c8c98e3cd0c0310132f4c90acd7ccfdd8ad0c2e99e3f63b550ed229d981bf560 5561480 
metview_5.6.1.orig-data.tar.xz
 a751b5e305aee8969f27c86dc48bcc6ea4b94742fb9aab25b69d34bdca38cc2a 42450484 
metview_5.6.1.orig.tar.xz
 066eef9ac64007ee39658462093dcceb2d0c9b993cbb9494091620401b56476c 38128 
metview_5.6.1-1.debian.tar.xz
Files:
 acfcc97ac0f9fc2e6952864d49a35906 2974 science optional metview_5.6.1-1.dsc
 8632dda64d963ded4faad85c1cf3d39b 5561480 science optional 
metview_5.6.1.orig-data.tar.xz
 9185b0156fd32e7fb9d1e6b066043563 42450484 science optional 
metview_5.6.1.orig.tar.xz
 b96cdc1cad900650713d0f2975bb1fb6 38128 science optional 
metview_5.6.1-1.debian.tar.xz

-----BEGIN PGP SIGNATURE-----

iQIzBAEBCAAdFiEEgjg86RZbNHx4cIGiy+a7Tl2a06UFAl1X078ACgkQy+a7Tl2a
06UZnQ/9Hm9TOUJa9/ten02ICo+I3tQZAzsDaNhf2VA/MYh98gZe81czMeE2zdfE
ZeKtIf45OXAh2MkG5fpL236ruWt9ZrsAZviGGLyyBwedIBg6K5B2UUJNjG0rjt6w
USNlSvoZ1OvVmN8EnqMsB2oE/ZhBMrImyEAmfxypPfDwPwGQkNA7psLMeenzYjBU
C1Zg41b74x7m1qxYRFbTJT+Vt2GxmIInTEfLi6AQPVlbjFiffTYn3tn9rCXT6q0A
vZy4l0sF6mY3m3tNamzZzi0mAiR5DEVUmKpvR6C6swajI/1zGBeXkns9rjDhCzW7
PC6ZvH0TO3jrfFGucCibIVq8r7aKYkm6DGQ2F71zCEXwTTeI2yAl7NHGaRHO5P5x
EVXe4/JzCKdiXP7u/xhRQE1oB65+8aVMQazGbCYFDiVi5Bh8qQgGafx9eJ5JCzqN
srZEThtuKyJfC2mfy3hA73zep5BqWoeB9UJdeqcZMthskndwoNTvJ43ZW1bWTFTZ
RZdxA4ozOXFG/7T3Sa3u+2IWM93jRJsW0xT/ZycN+OnLTi6DJRPDwkZCgUd7Yqch
qO/cv6CFioJd4f/IfrboeeuGyUQI1wPDyykXGo+C12g3c3O7/V52wdCvlE97RFVB
/UbJFWLz5n1vLm266RumSMqmB9xwFT+3E88zrQukMmhqzSvtFak=
=A4MF
-----END PGP SIGNATURE-----

--- End Message ---

Reply via email to