Merge lp:~jbicha/indicator-keyboard/fix-dependencies into lp:indicator-keyboard

Proposed by Jeremy Bícha
Status: Merged
Approved by: William Hua
Approved revision: 84
Merged at revision: 90
Proposed branch: lp:~jbicha/indicator-keyboard/fix-dependencies
Merge into: lp:indicator-keyboard
Diff against target: 36 lines (+11/-3)
2 files modified
debian/changelog (+10/-2)
debian/control (+1/-1)
To merge this branch: bzr merge lp:~jbicha/indicator-keyboard/fix-dependencies
Reviewer Review Type Date Requested Status
William Hua (community) Approve
Review via email: mp+174900@code.launchpad.net

Description of the change

Since I released 18 to the ~desktop ppa, I went ahead and bumped the version number to 19.

Without the dbus dependency, the tests fail with:

/indicator-keyboard/activate-input-source: **
GLib-GIO:ERROR:/build/buildd/glib2.0-2.37.3/./gio/gtestdbus.c:617:start_daemon: assertion failed (error == NULL): Failed to execute child process "dbus-daemon" (No such file or directory) (g-exec-error-quark, 8)

To post a comment you must log in.
Revision history for this message
William Hua (attente) wrote :

Thanks, looks good.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/changelog'
2--- debian/changelog 2013-07-02 13:10:50 +0000
3+++ debian/changelog 2013-07-16 01:34:29 +0000
4@@ -1,9 +1,17 @@
5-indicator-keyboard (0.0.0-0ubuntu18) UNRELEASED; urgency=low
6+indicator-keyboard (0.0.0-0ubuntu19) saucy; urgency=low
7+
8+ * debian/control:
9+ - Don't build-depend on vala-0.20-vapi
10+ - Build-depend on dbus for tests
11+
12+ -- Jeremy Bicha <jbicha@ubuntu.com> Mon, 15 Jul 2013 21:00:06 -0400
13+
14+indicator-keyboard (0.0.0-0ubuntu18) saucy; urgency=low
15
16 * Add indicator schema.
17 * Repair test fixtures.
18
19- -- William Hua <william.hua@canonical.com> Mon, 01 Jul 2013 10:21:40 -0400
20+ -- William Hua <william.hua@canonical.com> Mon, 15 Jul 2013 20:37:40 -0400
21
22 indicator-keyboard (0.0.0-0ubuntu17) saucy; urgency=low
23
24
25=== modified file 'debian/control'
26--- debian/control 2013-06-24 21:16:17 +0000
27+++ debian/control 2013-07-16 01:34:29 +0000
28@@ -8,7 +8,7 @@
29 dh-translations,
30 libgirepository1.0-dev,
31 valac,
32- valac-0.20-vapi,
33+ dbus-test-runner,
34 libgee-dev,
35 libgtk-3-dev,
36 libgnome-desktop-3-dev,

Subscribers

People subscribed via source and target branches

to all changes: