From 4855bd8639c7666817f8b5162b5cd6408b61af62 Mon Sep 17 00:00:00 2001 From: Mathieu Trudel-Lapierre Date: Tue, 4 Dec 2012 19:13:40 -0500 Subject: - Add xvfb to Build-Depends. - Run dh_auto_test through xvfb-run. --- debian/changelog | 2 ++ debian/control | 1 + debian/rules | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index dc472b8..cfa0ceb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,6 +8,7 @@ libdbusmenu (12.10.3-0ubuntu1) UNRELEASED; urgency=low - Update Vcs-Bzr, Vcs-Browser and add a notice to uploaders. - Remove outdated Breaks:. - Add dbus-test-runner to Build-Depends. + - Add xvfb to Build-Depends. * debian/rules: - Convert to dh9; some variables where kept but renamed to brevity. - Override dh_autoreconf to make sure it calls autogen.sh, and doesn't run @@ -16,6 +17,7 @@ libdbusmenu (12.10.3-0ubuntu1) UNRELEASED; urgency=low can complete. - Override dh_auto_test to make sure they can be run for both the gtk2 and gtk3 flavors. + - Run dh_auto_test through xvfb-run. * debian/compat: bump to compat level 9. * debian/libdbusmenu-gtk-doc.install: add the glib-server-nomenu.c example. * debian/libdbusmenu-tools.install: install dbusmenu-* binaries from the diff --git a/debian/control b/debian/control index c383ec3..74461c7 100644 --- a/debian/control +++ b/debian/control @@ -13,6 +13,7 @@ Build-Depends: debhelper (>= 9), gtk-doc-tools, valgrind, dbus-test-runner, + xvfb, libgtk2.0-dev (>= 2.24.4-1~), libgtk-3-dev (>= 2.99.2-1ubuntu2), libgdk-pixbuf2.0-dev (>= 2.22.1-0ubuntu4), diff --git a/debian/rules b/debian/rules index f64efa6..f838d26 100755 --- a/debian/rules +++ b/debian/rules @@ -35,7 +35,7 @@ doinstall-%: override_dh_auto_test: $(FLAVORS:%=dotest-%) dotest-%: - dh_auto_test --builddirectory=builddir/$* + xvfb-run dh_auto_test --builddirectory=builddir/$* override_dh_install: find debian/tmp -name \*.la -delete -- cgit v1.2.3