On Tue, 6 Aug 2019 18:04:25 +0200 Gianfranco Costamagna 
<locutusofb...@debian.org> wrote:
> Source: magics++
> Version 4.1.2-1
> Severity: important
> 
> Hello, please apply this patch, to be sure python3.7 is picked correctly up 
> during runtime.
> 
> It fixes a metview build failure when magics++ is built with wl, asneeded gcc 
> flag.
> 
> E.g. Debian will have this issue on the next gcc-default update to 9
> 
> diff -Nru magics++-4.1.2/debian/changelog magics++-4.1.2/debian/changelog
> --- magics++-4.1.2/debian/changelog   2019-08-05 18:10:02.000000000 +0200
> +++ magics++-4.1.2/debian/changelog   2019-08-06 17:42:50.000000000 +0200
> @@ -1,3 +1,10 @@
> +magics++ (4.1.2-1ubuntu1) eoan; urgency=medium
> +
> +  * Add python3-all-dev runtime dependency, it is needed by reverse-deps
> +    (libpython-X-Ym.so is used and exposed outside)
> +
> + -- Gianfranco Costamagna <locutusofb...@debian.org>  Tue, 06 Aug 2019 
> 17:42:50 +0200
> +
>  magics++ (4.1.2-1) unstable; urgency=medium
>  
>    * New upstream release
> diff -Nru magics++-4.1.2/debian/control magics++-4.1.2/debian/control
> --- magics++-4.1.2/debian/control     2019-08-05 18:10:02.000000000 +0200
> +++ magics++-4.1.2/debian/control     2019-08-06 17:42:50.000000000 +0200
> @@ -62,7 +62,7 @@
>  Section: libdevel
>  Architecture: any
>  Multi-Arch: same
> -Depends: libmagplus3v5 ( = ${binary:Version} ), ${misc:Depends}, python3,
> +Depends: libmagplus3v5 ( = ${binary:Version} ), ${misc:Depends}, 
> python3-all-dev,
>   libterralib-dev, magics++, libodb-api-dev
>  Recommends: pkg-config
>  Description: Development files for ECMWF  plotting software MAGICS++
> 
> 


unfortunately also some build paths have been screwed up, this is a working 
patch:
+magics++ (4.1.2-2) unstable; urgency=medium
+
+  * add dependency for libmagics++-dev to libmagics++-metview-dev
+    LP: #1566061
+  * Add some more magic seds to cmake target files.
+  * Fix typo in install target
+  * Add python3-all-dev runtime dependency, it is needed by reverse-deps
+    (libpython-X-Ym.so is used and exposed outside)
+    (Closes: #934064)
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org>  Tue, 06 Aug 2019 
17:42:50 +0200
+
 magics++ (4.1.2-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru magics++-4.1.2/debian/control magics++-4.1.2/debian/control
--- magics++-4.1.2/debian/control       2019-08-05 18:10:02.000000000 +0200
+++ magics++-4.1.2/debian/control       2019-08-06 17:42:50.000000000 +0200
@@ -62,8 +62,8 @@
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libmagplus3v5 ( = ${binary:Version} ), ${misc:Depends}, python3,
- libterralib-dev, magics++, libodb-api-dev
+Depends: libmagplus3v5 ( = ${binary:Version} ), ${misc:Depends}, 
python3-all-dev,
+ libmagics++-metview-dev, libterralib-dev, magics++, libodb-api-dev
 Recommends: pkg-config
 Description: Development files for ECMWF  plotting software MAGICS++
  Magics++ is the latest generation of the ECMWF's Meteorological plotting
diff -Nru magics++-4.1.2/debian/rules magics++-4.1.2/debian/rules
--- magics++-4.1.2/debian/rules 2019-08-05 18:10:02.000000000 +0200
+++ magics++-4.1.2/debian/rules 2019-08-06 17:42:50.000000000 +0200
@@ -112,12 +112,15 @@
        mkdir -p debian/tmp/$(LIBDIR)/cmake/magics
        cp -a debian/tmp/usr/lib/cmake/magics/* 
debian/tmp/$(LIBDIR)/cmake/magics
        sed -e 's%$${_IMPORT_PREFIX}/lib%$(LIBDIR)%' \
-               < debian/tmp/usr/lib/magics/magics-targets-none.cmake \
+               < debian/tmp/usr/lib/cmake/magics/magics-targets-none.cmake \

^^ this sed was failing because of ENOFILE

        | sed -e 's%$${_IMPORT_PREFIX}/bin%/usr/bin%' \
-       | sed -e 's%$(OLD_GF_PATH)%$(NEW_GF_PATH)%'   \

^^ this one is translated into sed -e 's/%%%' and fails too

                > debian/tmp/$(LIBDIR)/cmake/magics/magics-targets-none.cmake
+       sed -e 's%$${_IMPORT_PREFIX}/include/magics%/usr/include/magics%' \
+               < debian/tmp/usr/lib/cmake/magics/magics-targets.cmake \
+               > debian/tmp/$(LIBDIR)/cmake/magics/magics-targets.cmake

^^ fixing also magics-targets.cmake

        sed -e 's%$${CURDIR}%/build/magics++%g' \
                < debian/tmp/usr/lib/cmake/magics/magics-config.cmake \
+       | sed -e 
's%$${PACKAGE_PREFIX_DIR}/lib/cmake/magics%$${PACKAGE_PREFIX_DIR}/${DEB_HOST_MULTIARCH}/cmake/magics%'
 \

^^ fixing also the prefix_dir

                > debian/tmp/$(LIBDIR)/cmake/magics/magics-config.cmake
        sed -e 's%$${CURDIR}%/build/magics++%g' \
                < debian/tmp/usr/lib/cmake/magics/magics-import.cmake \


if you push your changes on git I'll be happy to commit and upload!

G.
diff -Nru magics++-4.1.2/debian/changelog magics++-4.1.2/debian/changelog
--- magics++-4.1.2/debian/changelog     2019-08-05 18:10:02.000000000 +0200
+++ magics++-4.1.2/debian/changelog     2019-08-06 17:42:50.000000000 +0200
@@ -1,3 +1,15 @@
+magics++ (4.1.2-2) unstable; urgency=medium
+
+  * add dependency for libmagics++-dev to libmagics++-metview-dev
+    LP: #1566061
+  * Add some more magic seds to cmake target files.
+  * Fix typo in install target
+  * Add python3-all-dev runtime dependency, it is needed by reverse-deps
+    (libpython-X-Ym.so is used and exposed outside)
+    (Closes: #934064)
+
+ -- Gianfranco Costamagna <locutusofb...@debian.org>  Tue, 06 Aug 2019 
17:42:50 +0200
+
 magics++ (4.1.2-1) unstable; urgency=medium
 
   * New upstream release
diff -Nru magics++-4.1.2/debian/control magics++-4.1.2/debian/control
--- magics++-4.1.2/debian/control       2019-08-05 18:10:02.000000000 +0200
+++ magics++-4.1.2/debian/control       2019-08-06 17:42:50.000000000 +0200
@@ -62,8 +62,8 @@
 Section: libdevel
 Architecture: any
 Multi-Arch: same
-Depends: libmagplus3v5 ( = ${binary:Version} ), ${misc:Depends}, python3,
- libterralib-dev, magics++, libodb-api-dev
+Depends: libmagplus3v5 ( = ${binary:Version} ), ${misc:Depends}, 
python3-all-dev,
+ libmagics++-metview-dev, libterralib-dev, magics++, libodb-api-dev
 Recommends: pkg-config
 Description: Development files for ECMWF  plotting software MAGICS++
  Magics++ is the latest generation of the ECMWF's Meteorological plotting
diff -Nru magics++-4.1.2/debian/rules magics++-4.1.2/debian/rules
--- magics++-4.1.2/debian/rules 2019-08-05 18:10:02.000000000 +0200
+++ magics++-4.1.2/debian/rules 2019-08-06 17:42:50.000000000 +0200
@@ -112,12 +112,15 @@
        mkdir -p debian/tmp/$(LIBDIR)/cmake/magics
        cp -a debian/tmp/usr/lib/cmake/magics/* 
debian/tmp/$(LIBDIR)/cmake/magics
        sed -e 's%$${_IMPORT_PREFIX}/lib%$(LIBDIR)%' \
-               < debian/tmp/usr/lib/magics/magics-targets-none.cmake \
+               < debian/tmp/usr/lib/cmake/magics/magics-targets-none.cmake \
        | sed -e 's%$${_IMPORT_PREFIX}/bin%/usr/bin%' \
-       | sed -e 's%$(OLD_GF_PATH)%$(NEW_GF_PATH)%'   \
                > debian/tmp/$(LIBDIR)/cmake/magics/magics-targets-none.cmake
+       sed -e 's%$${_IMPORT_PREFIX}/include/magics%/usr/include/magics%' \
+               < debian/tmp/usr/lib/cmake/magics/magics-targets.cmake \
+               > debian/tmp/$(LIBDIR)/cmake/magics/magics-targets.cmake
        sed -e 's%$${CURDIR}%/build/magics++%g' \
                < debian/tmp/usr/lib/cmake/magics/magics-config.cmake \
+       | sed -e 
's%$${PACKAGE_PREFIX_DIR}/lib/cmake/magics%$${PACKAGE_PREFIX_DIR}/${DEB_HOST_MULTIARCH}/cmake/magics%'
 \
                > debian/tmp/$(LIBDIR)/cmake/magics/magics-config.cmake
        sed -e 's%$${CURDIR}%/build/magics++%g' \
                < debian/tmp/usr/lib/cmake/magics/magics-import.cmake \

Reply via email to