diff -Nru libxmlb-0.1.15/debian/changelog libxmlb-0.1.15/debian/changelog --- libxmlb-0.1.15/debian/changelog 2020-03-04 17:51:10.000000000 +0000 +++ libxmlb-0.1.15/debian/changelog 2020-04-02 17:39:22.000000000 +0000 @@ -1,3 +1,24 @@ +libxmlb (0.1.15-2) unstable; urgency=medium + + * Team upload. + * Bump debhelper compatibility to 12 + * debian/control: Bump Standards-Version to 4.5.0 (no further changes) + * debian/control: Add libglib2.0-doc to the BD to fix the links between the + gtk-doc files + * debian/libxmlb-dev.install: Install the .gir file and add the proper + dependencies + * debian/rules: Run the gir sequence + * Ship the installed-tests in new libxmlb-tests package + * debian/control: Build gir1.2-xmlb-1.0 on all architectures + * d/p/tests-Make-the-build-reproducible.patch: Make the installed tests + reproductible + * debian/libxmlb1.symbols: Add the Build-Depends-Package field + * debian/control: Drop uuid-dev BD, this is not needed since 0.1.14 + * debian/control: Fix the short description of gir1.2-xmlb-1.0 + (Closes: #921833) + + -- Laurent Bigonville Thu, 02 Apr 2020 19:39:22 +0200 + libxmlb (0.1.15-1) unstable; urgency=medium * New upstream version (0.1.15) diff -Nru libxmlb-0.1.15/debian/compat libxmlb-0.1.15/debian/compat --- libxmlb-0.1.15/debian/compat 2020-03-04 17:50:42.000000000 +0000 +++ libxmlb-0.1.15/debian/compat 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -9 diff -Nru libxmlb-0.1.15/debian/control libxmlb-0.1.15/debian/control --- libxmlb-0.1.15/debian/control 2020-03-04 17:50:42.000000000 +0000 +++ libxmlb-0.1.15/debian/control 2020-04-02 17:39:22.000000000 +0000 @@ -5,28 +5,28 @@ Uploaders: Steve McIntyre <93sam@debian.org>, Matthias Klumpp , Mario Limonciello -Build-Depends: debhelper (>=9), +Build-Depends: debhelper-compat (=12), gir1.2-glib-2.0, gobject-introspection, gtk-doc-tools, libglib2.0-dev, + libglib2.0-doc, libgirepository1.0-dev, - meson, + meson (>= 0.52.0), shared-mime-info, - uuid-dev, -Standards-Version: 4.3.0 +Standards-Version: 4.5.0 Homepage: https://github.com/hughsie/libxmlb Vcs-Git: https://salsa.debian.org/efi-team/libxmlb.git Vcs-Browser: https://salsa.debian.org/efi-team/libxmlb Package: gir1.2-xmlb-1.0 -Architecture: linux-any +Architecture: any Multi-Arch: same Depends: ${misc:Depends}, ${gir:Depends} Section: introspection Description: GObject introspection data for libxmlb - This package provides the introspection data for libfwupd. + This package provides the introspection data for libxmlb. . It can be used by packages using the GIRepository format to generate dynamic bindings. @@ -36,7 +36,7 @@ Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} -Depends: ${misc:Depends}, ${shlibs:Depends} +Depends: ${misc:Depends}, ${shlibs:Depends}, gir1.2-xmlb-1.0 (= ${binary:Version}) Description: development files for libxmlb This package provides development libraryes for libxmlb. . @@ -62,3 +62,20 @@ This allows an application to mmap the binary XML file, do an XPath query and return some strings without actually parsing the entire document. This is all done using (almost) zero allocations and no actual copying of the binary data. + +Package: libxmlb-tests +Architecture: any +Depends: libxmlb1 (= ${binary:Version}), + shared-mime-info, + ${misc:Depends}, + ${shlibs:Depends} +Description: Installed tests for libxmlb1 + The libxmlb library takes XML source, and + converts it to a structured binary representation with a deduplicated string + table -- where the strings have the NULs included. + . + This allows an application to mmap the binary XML file, do an XPath query and + return some strings without actually parsing the entire document. This is all + done using (almost) zero allocations and no actual copying of the binary data. + . + This package contains the installed tests for libxmlb1. diff -Nru libxmlb-0.1.15/debian/libxmlb1.symbols libxmlb-0.1.15/debian/libxmlb1.symbols --- libxmlb-0.1.15/debian/libxmlb1.symbols 2020-03-04 17:51:10.000000000 +0000 +++ libxmlb-0.1.15/debian/libxmlb1.symbols 2020-04-02 17:39:22.000000000 +0000 @@ -1,4 +1,5 @@ libxmlb.so.1 libxmlb1 #MINVER# +* Build-Depends-Package: libxmlb-dev LIBXMLB_0.1.0@LIBXMLB_0.1.0 0.1.0 LIBXMLB_0.1.11@LIBXMLB_0.1.11 0.1.11 LIBXMLB_0.1.12@LIBXMLB_0.1.12 0.1.12 diff -Nru libxmlb-0.1.15/debian/libxmlb-dev.install libxmlb-0.1.15/debian/libxmlb-dev.install --- libxmlb-0.1.15/debian/libxmlb-dev.install 2020-03-04 17:50:42.000000000 +0000 +++ libxmlb-0.1.15/debian/libxmlb-dev.install 2020-04-02 17:39:22.000000000 +0000 @@ -1,5 +1,6 @@ usr/include/ usr/lib/*/*.so usr/lib/*/pkgconfig +usr/share/gir-1.0 usr/share/gtk-doc usr/lib/*/xb-tool diff -Nru libxmlb-0.1.15/debian/libxmlb-tests.install libxmlb-0.1.15/debian/libxmlb-tests.install --- libxmlb-0.1.15/debian/libxmlb-tests.install 1970-01-01 00:00:00.000000000 +0000 +++ libxmlb-0.1.15/debian/libxmlb-tests.install 2020-04-02 17:39:22.000000000 +0000 @@ -0,0 +1,2 @@ +usr/libexec/installed-tests +usr/share/installed-tests diff -Nru libxmlb-0.1.15/debian/patches/series libxmlb-0.1.15/debian/patches/series --- libxmlb-0.1.15/debian/patches/series 1970-01-01 00:00:00.000000000 +0000 +++ libxmlb-0.1.15/debian/patches/series 2020-04-02 17:39:22.000000000 +0000 @@ -0,0 +1 @@ +tests-Make-the-build-reproducible.patch diff -Nru libxmlb-0.1.15/debian/patches/tests-Make-the-build-reproducible.patch libxmlb-0.1.15/debian/patches/tests-Make-the-build-reproducible.patch --- libxmlb-0.1.15/debian/patches/tests-Make-the-build-reproducible.patch 1970-01-01 00:00:00.000000000 +0000 +++ libxmlb-0.1.15/debian/patches/tests-Make-the-build-reproducible.patch 2020-04-02 17:39:22.000000000 +0000 @@ -0,0 +1,77 @@ +From: Laurent Bigonville +Date: Sat, 21 Mar 2020 13:32:58 +0100 +Subject: tests: Make the build reproducible + +--- + meson.build | 2 +- + src/meson.build | 5 +++-- + src/xb-self-test.c | 8 +++++--- + 3 files changed, 9 insertions(+), 6 deletions(-) + +diff --git a/meson.build b/meson.build +index 38486c9..475cee4 100644 +--- a/meson.build ++++ b/meson.build +@@ -1,7 +1,7 @@ + project('libxmlb', 'c', + version : '0.1.15', + license : 'LGPL-2.1+', +- meson_version : '>=0.47.0', ++ meson_version : '>=0.52.0', + default_options : ['warning_level=2', 'c_std=c99'], + ) + +diff --git a/src/meson.build b/src/meson.build +index 936cc1d..ffbd97d 100644 +--- a/src/meson.build ++++ b/src/meson.build +@@ -184,6 +184,8 @@ if get_option('introspection') + endif + + if get_option('tests') ++ testdir = environment({'TESTDIR' : join_paths(meson.current_source_dir(), '..', 'data')}) ++ + e = executable( + 'xb-self-test', + sources : [ +@@ -209,7 +211,6 @@ if get_option('tests') + configinc, + ], + c_args : [ +- '-DTESTDIR="@0@/../data"'.format(meson.current_source_dir()), + '-DINSTALLEDTESTDIR="' + installed_test_datadir + '"', + ], + dependencies : [ +@@ -219,5 +220,5 @@ if get_option('tests') + install : true, + install_dir : installed_test_bindir + ) +- test('xb-self-test', e) ++ test('xb-self-test', e, env : testdir) + endif +diff --git a/src/xb-self-test.c b/src/xb-self-test.c +index f1b4f2a..85cf062 100644 +--- a/src/xb-self-test.c ++++ b/src/xb-self-test.c +@@ -449,6 +449,7 @@ static void + xb_builder_chained_adapters_func (void) + { + gboolean ret; ++ const gchar *testdir; + g_autofree gchar *xml = NULL; + g_autofree gchar *path = NULL; + g_autofree gchar *tmp_xmlb = g_build_filename (g_get_tmp_dir (), "temp.xmlb", NULL); +@@ -460,9 +461,10 @@ xb_builder_chained_adapters_func (void) + g_autoptr(XbSilo) silo = NULL; + + /* import a source file */ +- path = g_build_filename (TESTDIR, "test.xml.gz.gz.gz", NULL); +- if (!g_file_test (path, G_FILE_TEST_EXISTS)) { +- g_free (path); ++ testdir = g_getenv ("TESTDIR"); ++ if (testdir != NULL) { ++ path = g_build_filename (testdir, "test.xml.gz.gz.gz", NULL); ++ } else { + path = g_build_filename (INSTALLEDTESTDIR, "test.xml.gz.gz.gz", NULL); + } + file_src = g_file_new_for_path (path); diff -Nru libxmlb-0.1.15/debian/rules libxmlb-0.1.15/debian/rules --- libxmlb-0.1.15/debian/rules 2020-03-04 17:50:42.000000000 +0000 +++ libxmlb-0.1.15/debian/rules 2020-04-02 17:39:22.000000000 +0000 @@ -1,4 +1,8 @@ #!/usr/bin/make -f %: - dh $@ + dh $@ --with gir + +override_dh_install-arch: + mv debian/tmp/usr/libexec/xb-tool debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) + dh_install -a diff -Nru libxmlb-0.1.15/debian/tests/control libxmlb-0.1.15/debian/tests/control --- libxmlb-0.1.15/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 +++ libxmlb-0.1.15/debian/tests/control 2020-04-02 17:39:22.000000000 +0000 @@ -0,0 +1,2 @@ +Tests: installed-tests +Depends: gnome-desktop-testing, libxmlb-tests diff -Nru libxmlb-0.1.15/debian/tests/installed-tests libxmlb-0.1.15/debian/tests/installed-tests --- libxmlb-0.1.15/debian/tests/installed-tests 1970-01-01 00:00:00.000000000 +0000 +++ libxmlb-0.1.15/debian/tests/installed-tests 2020-04-02 17:39:22.000000000 +0000 @@ -0,0 +1,5 @@ +#!/bin/sh + +set -e + +gnome-desktop-testing-runner libxmlb