diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-08-27 11:50:59 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2012-08-27 11:50:59 +0100 |
| commit | b5e82890de690905cabe24203ecd46ae41075998 (patch) | |
| tree | 9bba86c6f289725438a093fdb19fb1505862dbc1 | |
| parent | a3cb554fd61cd91aec453052356570602e802475 (diff) | |
| parent | 47f3cb54fcda485e3fbfc9b297dd556a504273b7 (diff) | |
| download | telepathy-mission-control-b5e82890de690905cabe24203ecd46ae41075998.tar.gz | |
Merge branch 'telepathy-mission-control-5.12', rejecting stable-only changes
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | NEWS | 1 |
2 files changed, 2 insertions, 1 deletions
@@ -21,7 +21,7 @@ telepathy-mission-control-configure-real: PKG_CONFIG_LIBDIR="$(CONFIGURE_PKG_CONFIG_LIBDIR)" \ PKG_CONFIG_TOP_BUILD_DIR=$(PKG_CONFIG_TOP_BUILD_DIR) \ $(TELEPATHY_MISSION_CONTROL_TOP)/$(CONFIGURE) --host=arm-linux-androideabi \ - --disable-gtk-doc && \ + --disable-gtk-doc --disable-conn-setting && \ for file in $(TELEPATHY_MISSION_CONTROL_BUILT_SOURCES); do \ rm -f $$file && \ make -C $$(dirname $$file) $$(basename $$file) ; \ @@ -17,6 +17,7 @@ Fixes: • If service-activated under both names o.fd.Telepathy.MissionControl5 and o.fd.Telepathy.AccountManager simultaneously, avoid one or both failing to activate due to a race condition (fd.o #53220, Simon) +• When built for Android, don't use GSettings (fd.o #53497, Simon) telepathy-mission-control 5.13.0 (2012-07-23) ============================================= |