Merge lp:~cyphermox/ido/xvfb into lp:ido/13.04

Proposed by Mathieu Trudel-Lapierre
Status: Merged
Approved by: Didier Roche-Tolomelli
Approved revision: 120
Merged at revision: 120
Proposed branch: lp:~cyphermox/ido/xvfb
Merge into: lp:ido/13.04
Diff against target: 39 lines (+5/-0)
3 files modified
debian/changelog (+2/-0)
debian/control (+1/-0)
debian/rules (+2/-0)
To merge this branch: bzr merge lp:~cyphermox/ido/xvfb
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Didier Roche-Tolomelli Approve
Review via email: mp+138223@code.launchpad.net

Commit message

Run tests through xfvb-run.

To post a comment you must log in.
Revision history for this message
Didier Roche-Tolomelli (didrocks) wrote :

builds fine here

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2012-11-26 16:43:09 +0000
+++ debian/changelog 2012-12-05 15:44:11 +0000
@@ -9,11 +9,13 @@
9 other indicator stack packages.9 other indicator stack packages.
10 - List libgtest-dev explicitly in Build-Depends.10 - List libgtest-dev explicitly in Build-Depends.
11 - Add Vcs-Bzr, Vcs-Browser fields with a notice to uploaders.11 - Add Vcs-Bzr, Vcs-Browser fields with a notice to uploaders.
12 - Add xvfb to Build-Depends.
12 * debian/rules:13 * debian/rules:
13 - Add and export DPKG_GENSYMBOLS_CHECK_LEVEL instead of passing -c4 to14 - Add and export DPKG_GENSYMBOLS_CHECK_LEVEL instead of passing -c4 to
14 dh_makeshlibs.15 dh_makeshlibs.
15 - Override dh_autoreconf to call autogen.sh and not run configure...16 - Override dh_autoreconf to call autogen.sh and not run configure...
16 - Drop the override for dh_makeshlibs.17 - Drop the override for dh_makeshlibs.
18 - Override dh_auto_test to run them through xvfb-run.
1719
18 [ Didier Roche ]20 [ Didier Roche ]
19 * Automatic snapshot from revision 118 (bootstrap)21 * Automatic snapshot from revision 118 (bootstrap)
2022
=== modified file 'debian/control'
--- debian/control 2012-11-19 19:12:44 +0000
+++ debian/control 2012-12-05 15:44:11 +0000
@@ -7,6 +7,7 @@
7 gnome-common,7 gnome-common,
8 libxorg-gtest-dev,8 libxorg-gtest-dev,
9 libgtest-dev,9 libgtest-dev,
10 xvfb,
10 libglib2.0-dev (>=2.14.0),11 libglib2.0-dev (>=2.14.0),
11 libgtk-3-dev (>= 3.0),12 libgtk-3-dev (>= 3.0),
12 gtk-doc-tools,13 gtk-doc-tools,
1314
=== modified file 'debian/rules'
--- debian/rules 2012-11-26 15:35:20 +0000
+++ debian/rules 2012-12-05 15:44:11 +0000
@@ -12,3 +12,5 @@
12 find debian/tmp/usr/lib -name *.la -delete12 find debian/tmp/usr/lib -name *.la -delete
13 dh_install --fail-missing13 dh_install --fail-missing
1414
15override_dh_auto_test:
16 xvfb-run dh_auto_test

Subscribers

People subscribed via source and target branches