Build using Meson

7 files changed, 56 insertions, 27 deletions

diff --git a/debian/control b/debian/control
index f4eeb06..8653626 100644
--- a/debian/control
+++ b/debian/control
@@ -8,9 +8,6 @@ Uploaders:
  Simon McVittie <smcv@debian.org>,
  Loic Minier <lool@dooz.org>,
 Build-Depends:
- autoconf,
- autoconf-archive,
- automake,
  dbus (>= 1.8),
  debhelper-compat (= 13),
  dh-python,
@@ -18,6 +15,8 @@ Build-Depends:
  dpkg-dev (>= 1.16.1),
  libdbus-1-dev (>= 1.8),
  libglib2.0-dev (>= 2.40),
+ meson (>= 0.56.2),
+ ninja-build,
  python3-all-dev,
  python3-gi,
  python3-tap <!nocheck>,
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
new file mode 100644
index 0000000..5142f04
--- /dev/null
+++ b/debian/patches/Make-installed-tests-from-multiple-builds-co-installable.patch
@@ -0,0 +1,44 @@
+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
new file mode 100644
index 0000000..e7ae765
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+Make-installed-tests-from-multiple-builds-co-installable.patch
diff --git a/debian/python-dbus-doc.docs b/debian/python-dbus-doc.docs
index 617f5fb..50bd824 100644
--- a/debian/python-dbus-doc.docs
+++ b/debian/python-dbus-doc.docs
@@ -1,3 +1,2 @@
 NEWS
 README
-debian/tmp-indep/usr/share/doc/python-dbus-doc/html
diff --git a/debian/python-dbus-doc.install b/debian/python-dbus-doc.install
new file mode 100644
index 0000000..519fc23
--- /dev/null
+++ b/debian/python-dbus-doc.install
@@ -0,0 +1 @@
+debian/tmp-indep/usr/share/doc/dbus-python/html usr/share/doc/python-dbus-doc
diff --git a/debian/python3-dbus-tests.install b/debian/python3-dbus-tests.install
index 452df68..b4e9f89 100644
--- a/debian/python3-dbus-tests.install
+++ b/debian/python3-dbus-tests.install
@@ -1,3 +1,2 @@
-usr/lib/python3/dist-packages/dbus_py_test.*.so
 usr/libexec/installed-tests/dbus-python/python3*
 usr/share/installed-tests/dbus-python/python3*
diff --git a/debian/rules b/debian/rules
index 86ebb52..a30cc87 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ PYDEFAULTVER := $(shell py3versions --default --version)
 FLAVOURS := $(PYTHON3)
 
 %:
-	dh $@ $(DH_ADDONS) --buildsystem=autoconf
+	dh $@ $(DH_ADDONS) --buildsystem=meson
 build binary %-indep: DH_ADDONS=--with=sphinxdoc
 
 override_dh_auto_configure-arch:
@@ -28,9 +28,10 @@ override_dh_auto_configure-arch:
 		dh_auto_configure \
 			--builddirectory=build-$$x \
 			-- \
-			PYTHON=/usr/bin/python$$x \
-			--disable-documentation \
-			--enable-installed-tests \
+			-Dpython=/usr/bin/python$$x \
+			-Ddoc=false \
+			-Dinstalled_tests=true \
+			-Dinstalled_tests_subdir=python$$x \
 			--libdir=/usr/lib \
 			; \
 	done
@@ -38,12 +39,10 @@ override_dh_auto_configure-indep:
 	dh_auto_configure \
 		--builddirectory=build-indep \
 		-- \
-		PYTHON=/usr/bin/python3 \
+		-Dpython=/usr/bin/python3 \
 		--libdir=/usr/lib \
-		--disable-installed-tests \
-		--enable-documentation \
-		--docdir=/usr/share/doc/python-dbus-doc \
-		--htmldir=/usr/share/doc/python-dbus-doc/html \
+		-Dinstalled_tests=false \
+		-Ddoc=true \
 		${NULL}
 
 override_dh_auto_build-arch:
@@ -53,8 +52,6 @@ override_dh_auto_build-arch:
 			--arch \
 			--builddirectory=build-$$x \
 			-- \
-			installed_testdir='$${libexecdir}/installed-tests/$${PACKAGE_TARNAME}/'"python$$x" \
-			installed_test_metadir='$${datadir}/installed-tests/$${PACKAGE_TARNAME}/'"python$$x" \
 			$(NULL); \
 	done
 override_dh_auto_build-indep:
@@ -78,18 +75,7 @@ override_dh_auto_install-arch:
 			--builddirectory=build-$$x \
 			--destdir=debian/tmp \
 			-- \
-			installed_testdir='$${libexecdir}/installed-tests/$${PACKAGE_TARNAME}/'"python$$x" \
-			installed_test_metadir='$${datadir}/installed-tests/$${PACKAGE_TARNAME}/'"python$$x" \
-			pyexecdir='$${pythondir}' \
-			pythondir='$${libdir}/python3/dist-packages' \
 			; \
-		so=`/usr/bin/python$$x -c "import sysconfig; print(sysconfig.get_config_var('EXT_SUFFIX') or sysconfig.get_config_var('SO'))"`; \
-		mv debian/tmp/usr/lib/python3/dist-packages/_dbus_bindings.so \
-			debian/tmp/usr/lib/python3/dist-packages/_dbus_bindings$$so; \
-		mv debian/tmp/usr/lib/python3/dist-packages/_dbus_glib_bindings.so \
-			debian/tmp/usr/lib/python3/dist-packages/_dbus_glib_bindings$$so; \
-		mv "debian/tmp/usr/libexec/installed-tests/dbus-python/python$$x/test/dbus_py_test.so" \
-			"debian/tmp/usr/lib/python3/dist-packages/dbus_py_test$$so"; \
 	done
 	install -d debian/tmp/usr/lib/python3/dist-packages/dbus_python-${DEB_VERSION_UPSTREAM}.egg-info
 	install -m644 dbus_python.egg-info/PKG-INFO debian/tmp/usr/lib/python3/dist-packages/dbus_python-${DEB_VERSION_UPSTREAM}.egg-info/