aboutsummaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorMathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>2012-12-04 19:13:40 -0500
committerMathieu Trudel-Lapierre <mathieu-tl@ubuntu.com>2012-12-04 19:13:40 -0500
commit4855bd8639c7666817f8b5162b5cd6408b61af62 (patch)
treed75540e2c79b179f462e20e271218589dfdee1f2 /debian
parent60b7a28449567cbd3605c7aa04ae4ff7f784fef4 (diff)
downloadlibdbusmenu-4855bd8639c7666817f8b5162b5cd6408b61af62.tar.gz
libdbusmenu-4855bd8639c7666817f8b5162b5cd6408b61af62.tar.bz2
libdbusmenu-4855bd8639c7666817f8b5162b5cd6408b61af62.zip
- Add xvfb to Build-Depends.
- Run dh_auto_test through xvfb-run.
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog2
-rw-r--r--debian/control1
-rwxr-xr-xdebian/rules2
3 files changed, 4 insertions, 1 deletions
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