fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-05 20:27:59 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'dbus-1.4'

Browse source
This commit is contained in:
Simon McVittie 2011-08-15 10:26:48 +01:00
commit 6d4fe188e5
2 changed files with 11 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
NEWS
View file

@ -12,6 +12,9 @@ D-Bus 1.5.8 (UNRELEASED)
• Fix duplicates in authors list (Ralf Habacker)
• Fix broken links from dbus-tutorial.html if $(htmldir) != $(docdir)
(fd.o #39879, Chris Mayo)
• Unix-specific:
· Clean up (non-abstract) Unix sockets on bus daemon exit (fd.o #38656;
Brian Cameron, Simon McVittie)
@ -22,7 +25,7 @@ D-Bus 1.5.8 (UNRELEASED)
• Windows-specific:
· Fix compilation on MSVC, which doesn't understand "inline" with its
C99 meaning (Ralf Habacker)
C99 meaning (fd.o #40000; Ralf Habacker, Simon McVittie)
· Fix misuse of GPid in test/dbus-daemon.c (fd.o #40003, Simon McVittie)
· Fix cross-compilation to Windows with Automake (fd.o #40003, Simon McVittie)

14
doc/Makefile.am
View file

@ -28,10 +28,7 @@ DTDS = \
busconfig.dtd \
introspect.dtd
dist_doc_DATA = \
diagram.png \
diagram.svg \
system-activation.txt
dist_doc_DATA = system-activation.txt
STATIC_DOCS = \
dbus-faq.xml \
@ -51,7 +48,10 @@ EXTRA_DIST = \
html_DATA =
# we distribute these in the tarball so users don't necessarily need xmlto
dist_html_DATA = $(XMLTO_OUTPUT)
dist_html_DATA = \
diagram.png \
diagram.svg \
$(XMLTO_OUTPUT)
XMLTO_OUTPUT= \
dbus-faq.html \
@ -99,8 +99,8 @@ uninstall-local::
rm -f $(DESTDIR)$(apidir)/*.css
rm -f $(DESTDIR)$(htmldir)/*.html
rm -f $(DESTDIR)$(docdir)/*.txt
rm -f $(DESTDIR)$(docdir)/*.png
rm -f $(DESTDIR)$(docdir)/*.svg
rm -f $(DESTDIR)$(htmldir)/*.png
rm -f $(DESTDIR)$(htmldir)/*.svg
rmdir --ignore-fail-on-non-empty $(DESTDIR)$(apidir) || \
rmdir $(DESTDIR)$(apidir)
endif