2004-03-19 Havoc Pennington <hp@redhat.com>dbus-0.21

	* NEWS: 0.21 updates

	* configure.in: 0.21

	* doc/Makefile.am: add all XMLTO usage to DBUS_XML_DOCS_ENABLED

	* python/Makefile.am: change to avoid dist of dbus_bindings.c so
	you don't need pyrex to make dist

	* qt/Makefile.am (libdbus_qt_1_la_SOURCES): add integrator.h to
	sources; run moc

6 files changed, 46 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index afafe0a8..8685abeb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2004-03-19  Havoc Pennington  <hp@redhat.com>
+
+	* NEWS: 0.21 updates
+
+	* configure.in: 0.21
+
+	* doc/Makefile.am: add all XMLTO usage to DBUS_XML_DOCS_ENABLED
+	
+	* python/Makefile.am: change to avoid dist of dbus_bindings.c so
+	you don't need pyrex to make dist
+
+	* qt/Makefile.am (libdbus_qt_1_la_SOURCES): add integrator.h to
+	sources; run moc
+	
 2004-03-18  Richard Hult  <richard@imendio.com>
 
 	* dbus/dbus-message.c (dbus_message_get_auto_activation) 
diff --git a/NEWS b/NEWS
index 7ce0f2ac..5ad79a21 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,19 @@
+D-BUS 0.21
+===
+
+- implement "auto activation" flag on messages, so the destination 
+  service can be launched automatically
+- fix a bug in custom type marshaling
+- optimize case where multiple apps activate the same service
+  (avoid "thundering herd")
+- add dynamic service file discovery/reloading
+- fix a busy loop when blocking for a reply
+- fix a 64-bit crash involving varargs
+- fix a bus crash when processing an AcquireService
+- allow appending TYPE_BYTE via append_args_valist
+- fix dicts-inside-dicts
+- enhancements to Python and Qt bindings
+
 D-BUS 0.20
 ===
 
diff --git a/configure.in b/configure.in
index 2e323155..5612f301 100644
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ AC_PREREQ(2.52)
 
 AC_INIT(dbus/dbus.h)
 
-AM_INIT_AUTOMAKE(dbus, 0.20)
+AM_INIT_AUTOMAKE(dbus, 0.21)
 
 AM_CONFIG_HEADER(config.h)
 
@@ -695,6 +695,8 @@ AC_SUBST(DBUS_GTK_CFLAGS)
 AC_SUBST(DBUS_GTK_LIBS)
 
 # Qt detection
+AC_PATH_PROG(QT_MOC, moc, no)
+
 have_qt=no
 AC_MSG_CHECKING([for qglobal.h])
 if test -n "$QTDIR" -a -f "$QTDIR/include/qglobal.h"; then
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 7bd392a6..337fb4f0 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -15,7 +15,6 @@ HTML_FILES=					\
 
 if DBUS_XML_DOCS_ENABLED
 all-local: $(HTML_FILES)
-endif
 
 dbus-specification.html: dbus-specification.xml
 	$(XMLTO) html-nochunks $<
@@ -25,6 +24,7 @@ dbus-test-plan.html: dbus-test-plan.xml
 
 dbus-tutorial.html: dbus-tutorial.xml
 	$(XMLTO) html-nochunks $<
+endif
 
 maintainer-clean-local:
 	rm -f $(HTML_FILES)
diff --git a/python/Makefile.am b/python/Makefile.am
index 5ef1b732..d57e08f5 100644
--- a/python/Makefile.am
+++ b/python/Makefile.am
@@ -8,7 +8,8 @@ dbusbindings_LTLIBRARIES = dbus_bindings.la
 
 dbus_bindings_la_LDFLAGS = -module -avoid-version -fPIC -export-symbols-regex initdbus_bindings
 dbus_bindings_la_LIBADD = $(top_builddir)/dbus/libdbus-1.la $(top_builddir)/glib/libdbus-glib-1.la
-dbus_bindings_la_SOURCES = dbus_bindings.c
+nodist_dbus_bindings_la_SOURCES = dbus_bindings.c
+
 
 EXTRA_DIST = 			\
 	dbus_h_wrapper.h	\
diff --git a/qt/Makefile.am b/qt/Makefile.am
index 80d0a9b4..e6f7a08b 100644
--- a/qt/Makefile.am
+++ b/qt/Makefile.am
@@ -10,7 +10,16 @@ dbusinclude_HEADERS=				\
 
 libdbus_qt_1_la_SOURCES = 			\
 	dbus-qthread.cpp message.cpp connection.cpp \
-	integrator.cpp server.cpp
+	integrator.cpp server.cpp integrator.h
+
+connection.cpp: connection.moc
+integrator.cpp: integrator.moc
+server.cpp: server.moc
+
+CLEANFILES=connection.moc integrator.moc server.moc
 
 libdbus_qt_1_la_LIBADD= $(DBUS_QT_LIBS) $(top_builddir)/dbus/libdbus-1.la
 libdbus_qt_1_la_LDFLAGS= -version-info 1:0
+
+%.moc: %.h
+	$(QT_MOC) $< > $@