diff options
| author | Simon McVittie <smcv@debian.org> | 2022-09-06 18:45:38 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2022-09-06 18:46:21 +0100 |
| commit | 48f0c432d7be185ba323c35aa429b2d3e21674e1 (patch) | |
| tree | 413086a231e5f03be7db2f200d1d2ab449250edb | |
| parent | ff0e1a783c4ddc6eb8607bf3606f33e55ec4efe2 (diff) | |
New upstream release
| -rw-r--r-- | debian/changelog | 11 | ||||
| -rw-r--r-- | debian/patches/Make-installed-tests-from-multiple-builds-co-installable.patch | 44 | ||||
| -rw-r--r-- | debian/patches/series | 1 |
3 files changed, 7 insertions, 49 deletions
diff --git a/debian/changelog b/debian/changelog index 9ea9da4..d80e1a6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,12 @@ -dbus-python (1.2.18+git20220905-1) UNRELEASED; urgency=medium +dbus-python (1.3.0-1) UNRELEASED; urgency=medium - * New upstream snapshot + * New upstream release + * Build using Meson * d/copyright: Update - * Work around #998059 in sphinx by resetting language environment variables. - This should make the documentation reproducible. + * Work around #998059 in sphinx by resetting language environment + variables. This should make the documentation reproducible. + * Standards-Version: 4.6.1 (no changes required) + * Update Lintian overrides -- Simon McVittie <smcv@debian.org> Mon, 05 Sep 2022 19:49:57 +0100 diff --git a/debian/patches/Make-installed-tests-from-multiple-builds-co-installable.patch b/debian/patches/Make-installed-tests-from-multiple-builds-co-installable.patch deleted file mode 100644 index 5142f04..0000000 --- a/debian/patches/Make-installed-tests-from-multiple-builds-co-installable.patch +++ /dev/null @@ -1,44 +0,0 @@ -From: Simon McVittie <smcv@debian.org> -Date: Mon, 5 Sep 2022 20:36:59 +0100 -Subject: Make installed-tests from multiple builds co-installable - -Signed-off-by: Simon McVittie <smcv@debian.org> ---- - meson_options.txt | 7 +++++++ - test/meson.build | 4 ++-- - 2 files changed, 9 insertions(+), 2 deletions(-) - -diff --git a/meson_options.txt b/meson_options.txt -index 7dc5218..b45debb 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -15,6 +15,13 @@ option( - description: 'Enable "as-installed" testing', - ) - -+option( -+ 'installed_tests_subdir', -+ type: 'string', -+ value: '', -+ description: 'Suffix to make installed-tests from multiple builds co-installable', -+) -+ - option( - 'python', - type: 'string', -diff --git a/test/meson.build b/test/meson.build -index 3539f8d..7c2db7b 100644 ---- a/test/meson.build -+++ b/test/meson.build -@@ -1,9 +1,9 @@ - # Copyright 2022 Collabora Ltd. - # SPDX-License-Identifier: MIT - --installed_testdir = get_option('libexecdir') / 'installed-tests' / meson.project_name() -+installed_testdir = get_option('libexecdir') / 'installed-tests' / meson.project_name() / get_option('installed_tests_subdir') - installed_test_testdir = installed_testdir / 'test' --installed_test_metadir = get_option('datadir') / 'installed-tests' / meson.project_name() -+installed_test_metadir = get_option('datadir') / 'installed-tests' / meson.project_name() / get_option('installed_tests_subdir') - test_env = environment() - test_env.set('DBUS_TOP_SRCDIR', meson.project_source_root()) - test_env.set('DBUS_TOP_BUILDDIR', meson.project_build_root()) diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index e7ae765..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -Make-installed-tests-from-multiple-builds-co-installable.patch |