diff -Nru libxmlb-0.1.8/debian/changelog libxmlb-0.1.8/debian/changelog --- libxmlb-0.1.8/debian/changelog 2019-03-26 20:45:12.000000000 +0000 +++ libxmlb-0.1.8/debian/changelog 2019-05-09 14:58:46.000000000 +0000 @@ -1,3 +1,13 @@ +libxmlb (0.1.8-1~ubuntu18.04.1) bionic; urgency=medium + + * Upload of libxmlb to bionic, it's needed to update fwupd to the + current upstream version (lp: #1820768) + * debian/patches/old_meson_build.patch: + - don't require a newer-than-bionic meson version to build, + thanks Mario Limonciello + + -- Sebastien Bacher Thu, 09 May 2019 16:50:27 +0200 + libxmlb (0.1.8-1) unstable; urgency=medium * New upstream version (0.1.8) diff -Nru libxmlb-0.1.8/debian/patches/old_meson_build.patch libxmlb-0.1.8/debian/patches/old_meson_build.patch --- libxmlb-0.1.8/debian/patches/old_meson_build.patch 1970-01-01 00:00:00.000000000 +0000 +++ libxmlb-0.1.8/debian/patches/old_meson_build.patch 2019-05-09 14:55:59.000000000 +0000 @@ -0,0 +1,87 @@ +From 378e1c3049ec94f344c2d8f336e84b5a1b0fdb31 Mon Sep 17 00:00:00 2001 +From: Mario Limonciello +Date: Mon, 11 Mar 2019 15:51:41 -0500 +Subject: [PATCH] Allow compilation on older versions of meson + +This reverts commit 96437763b2b179e402e2660c06a0036397c29fcd +and makes adjustments to dynamically decide what to do based upon +meson version. + +This is intended to be used for backporting libxmlb to 18.04. +--- + meson.build | 20 +++++++++++++++----- + src/libxmlb/meson.build | 18 +++++++++++++----- + 2 files changed, 28 insertions(+), 10 deletions(-) + +Index: libxmlb-0.1.8/meson.build +=================================================================== +--- libxmlb-0.1.8.orig/meson.build ++++ libxmlb-0.1.8/meson.build +@@ -1,7 +1,7 @@ + project('libxmlb', 'c', + version : '0.1.8', + license : 'LGPL-2.1+', +- meson_version : '>=0.47.0', ++ meson_version : '>=0.45.0', + default_options : ['warning_level=2', 'c_std=c99'], + ) + +@@ -90,8 +90,14 @@ test_link_args = [ + '-Wl,-z,now', + ] + foreach link_arg: test_link_args +- if cc.has_link_argument(link_arg) +- global_link_args += link_arg ++ if meson.version().version_compare('>=0.46.0') ++ if cc.has_link_argument(link_arg) ++ global_link_args += link_arg ++ endif ++ else ++ if cc.has_argument(link_arg) ++ global_link_args += link_arg ++ endif + endif + endforeach + add_project_link_arguments( +@@ -132,8 +138,12 @@ configure_file( + configuration : conf + ) + +-python = import('python') +-python3 = python.find_installation('python3') ++if meson.version().version_compare('>=0.46.0') ++ python = import('python') ++ python3 = python.find_installation('python3') ++else ++ python3 = find_program('python3') ++endif + + subdir('data') + subdir('src') +Index: libxmlb-0.1.8/src/libxmlb/meson.build +=================================================================== +--- libxmlb-0.1.8.orig/src/libxmlb/meson.build ++++ libxmlb-0.1.8/src/libxmlb/meson.build +@@ -2,9 +2,17 @@ + # in order for including the headers from parent projects to work + # until https://github.com/mesonbuild/meson/issues/2546 is fixed + foreach header : xb_headers +- configure_file( +- copy : true, +- input : header, +- output : '@PLAINNAME@', +- ) ++ if meson.version().version_compare('>=0.47.0') ++ configure_file( ++ copy : true, ++ input : header, ++ output : '@PLAINNAME@', ++ ) ++ else ++ configure_file( ++ configuration : configuration_data(), ++ input : header, ++ output : '@PLAINNAME@', ++ ) ++ endif + endforeach diff -Nru libxmlb-0.1.8/debian/patches/series libxmlb-0.1.8/debian/patches/series --- libxmlb-0.1.8/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ libxmlb-0.1.8/debian/patches/series 2019-05-09 14:55:53.000000000 +0000 @@ -0,0 +1 @@ +old_meson_build.patch