Merge lp:~ted/libindicator/bug587811 into lp:libindicator/0.4

Proposed by Ted Gould
Status: Merged
Merged at revision: 397
Proposed branch: lp:~ted/libindicator/bug587811
Merge into: lp:libindicator/0.4
Diff against target: 17 lines (+6/-1)
1 file modified
tests/Makefile.am (+6/-1)
To merge this branch: bzr merge lp:~ted/libindicator/bug587811
Reviewer Review Type Date Requested Status
Sebastien Bacher Approve
Indicator Applet Developers Pending
Review via email: mp+49827@code.launchpad.net

Description of the change

Adds the session.conf.in to the dist

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

sorry but I just tested, you will need also the 3 .service.in files add to the tarball for make check to run

Revision history for this message
Sebastien Bacher (seb128) :
review: Needs Fixing
lp:~ted/libindicator/bug587811 updated
398. By Ted Gould

Adding the service.in files as well

Revision history for this message
Ted Gould (ted) wrote :

Adding the service.in files as well. Some tests still fail, but the
test suite builds properly now.

Revision history for this message
Sebastien Bacher (seb128) wrote :

ok, with that version a disted tarball run through make check (with some errors but that's another issue)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'tests/Makefile.am'
2--- tests/Makefile.am 2011-01-08 05:17:19 +0000
3+++ tests/Makefile.am 2011-02-15 20:35:11 +0000
4@@ -18,7 +18,12 @@
5 DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf
6 XVFB_RUN=". $(srcdir)/run-xvfb.sh"
7
8-EXTRA_DIST = run-xvfb.sh
9+EXTRA_DIST = \
10+ run-xvfb.sh \
11+ session.conf.in \
12+ service-manager-connect.service.in \
13+ service-version-bad.service.in \
14+ service-version-good.service.in
15
16 #############################
17 # Test Loader

Subscribers

People subscribed via source and target branches