Commit e48de6be authored by Simon McVittie's avatar Simon McVittie

Merge branch 'dbus-1.4'

Conflicts:
	NEWS
	dbus/dbus-internals.c
	dbus/dbus-mainloop.c
	dbus/dbus-sysdeps-unix.c
	dbus/dbus-sysdeps-win.c
	dbus/dbus-sysdeps.c
	dbus/dbus-sysdeps.h
parents 8734e4a1 b19e1433
D-Bus 1.5.14 (UNRELEASED)
==
...
Changes:
• Be more careful about monotonic time vs. real time, fixing DBUS_COOKIE_SHA1
spec-compliance (fd.o #48580, David Zeuthen)
• Don't use install(1) within the source/build trees, fixing the build as
non-root when using OpenBSD install(1) (fd.o #48217, Antoine Jacoutot)
D-Bus 1.5.12 (2012-03-27)
==
......
......@@ -308,12 +308,12 @@ int _dbus_poll (DBusPollFD *fds,
void _dbus_sleep_milliseconds (int milliseconds);
void _dbus_get_real_time (long *tv_sec,
long *tv_usec);
void _dbus_get_monotonic_time (long *tv_sec,
long *tv_usec);
void _dbus_get_real_time (long *tv_sec,
long *tv_usec);
/**
* directory interface
*/
......
......@@ -287,14 +287,14 @@ EXTRA_DIST += $(static_data)
## copy tests to builddir so that generated tests and static tests
## are all in one place.
all-local:
$(AM_V_at)$(INSTALL) -d data/valid-config-files/session.d
$(AM_V_at)$(MKDIR_P) data/valid-config-files/session.d
$(AM_V_at)set -e && \
if test $(srcdir) = . || test $(srcdir) -ef .; then \
echo '-- No need to copy test data as srcdir = builddir'; \
else \
for F in $(static_data); do \
$(INSTALL) -d $${F%/*}; \
$(INSTALL_DATA) $(srcdir)/$$F $$F; \
$(MKDIR_P) $${F%/*}; \
cp $(srcdir)/$$F $$F; \
done; \
fi
......@@ -315,9 +315,9 @@ noinst_DATA = $(imported_data)
CLEANFILES = $(noinst_DATA)
data/valid-config-files/session.conf: $(top_builddir)/bus/session.conf
$(AM_V_at)$(INSTALL) -d data/valid-config-files
$(AM_V_GEN)$(INSTALL_DATA) $< $@
$(AM_V_at)$(MKDIR_P) data/valid-config-files
$(AM_V_GEN)cp $< $@
data/valid-config-files/system.conf: $(top_builddir)/bus/system.conf
$(AM_V_at)$(INSTALL) -d data/valid-config-files
$(AM_V_GEN)$(INSTALL_DATA) $< $@
$(AM_V_at)$(MKDIR_P) data/valid-config-files
$(AM_V_GEN)cp $< $@
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment