* NEWS: Update for 0.31dbus-0.31.0

* configure.in: Release 0.31
  add LT_CURRENT, LT_REVISION, LT_AGE for easy soname bumping

* qt/Makefile.am: fixed build

* dbus/Makefile.am: soname bump for libdbus

* glib/Makefile.am: soname bump for libdbus-glib

6 files changed, 71 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index e3392d07..fa567f72 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2005-03-07  John (J5) Palmieri  <johnp@redhat.com>
+	* NEWS: Update for 0.31
+
+	* configure.in: Release 0.31
+	add LT_CURRENT, LT_REVISION, LT_AGE for easy soname bumping
+
+	* qt/Makefile.am: fixed build
+
+	* dbus/Makefile.am: soname bump for libdbus
+
+	* glib/Makefile.am: soname bump for libdbus-glib
+
 2005-03-05  Havoc Pennington  <hp@redhat.com>
 
 	* dbus/dbus-sysdeps.c:
diff --git a/NEWS b/NEWS
index a6c25ea3..dc1199d7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,30 @@
+D-BUS 0.31 (07 Mar 2005)
+===
+
+- land the new message args API and recursive type system
+- add docs and fixed Doxygen warnings throught source
+- split out some functions not needed in libdbus to *-util.c source files
+- take out type convienience functions
+- libdbus now back below 150K
+- booleans are now 32-bit instead of 8-bit
+- specification updated
+- grand renaming to strip out the use of "service"
+  just say "name" instead (or "bus name" when ambiguous)
+- rename dbus-daemon-1 to dbus-daemon throughout
+- rename activation to auto-start
+- auto-start on by default now
+- note that libdbus is the low-level API
+- python bindings updated to the new API
+- mono bindings updated to the new API
+- add 16 bit types
+- dictionaries are now ARRAYS of DICT_ENTRY
+- dbus-glib-tool renamed to dbus-binding-tool
+- massive rewrite of the glib bindings
+- saner names for the dbus interface, object path and service defines
+- new functions for handling type signitures
+- bump sonames for libdbus and libdbus-glib
+- various small fixes
+
 D-BUS 0.23 (11 Jan 2005)
 ===
 
diff --git a/configure.in b/configure.in
index 0e76921b..300c41e8 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.30)
+AM_INIT_AUTOMAKE(dbus, 0.31)
 
 AM_CONFIG_HEADER(config.h)
 
@@ -17,6 +17,18 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE",[The name of the gettext d
  ## must come before we use the $USE_MAINTAINER_MODE variable later
 AM_MAINTAINER_MODE
 
+# libtool versioning - this applies to libhal and libhal-storage
+#
+# See http://sources.redhat.com/autobook/autobook/autobook_91.html#SEC91 for details
+#
+LT_CURRENT=1
+LT_REVISION=0
+LT_AGE=0
+AC_SUBST(LT_CURRENT)
+AC_SUBST(LT_REVISION)
+AC_SUBST(LT_AGE)
+
+
 AC_PROG_CC
 AC_PROG_CXX
 AC_ISC_POSIX
diff --git a/dbus/Makefile.am b/dbus/Makefile.am
index ed58cd75..41a9929b 100644
--- a/dbus/Makefile.am
+++ b/dbus/Makefile.am
@@ -153,6 +153,7 @@ libdbus_convenience_la_SOURCES=			\
 	$(DBUS_SHARED_SOURCES)			\
 	$(DBUS_UTIL_SOURCES)
 
+
 BUILT_SOURCES=$(dbusarchinclude_HEADERS) $(DBUS_GLIB_BUILT_INCLUDES)
 EXTRA_DIST=dbus-arch-deps.h.in make-dbus-glib-error-enum.sh
 CLEANFILES=$(DBUS_GLIB_BUILT_INCLUDES)
@@ -164,7 +165,7 @@ noinst_LTLIBRARIES=libdbus-convenience.la
 libdbus_1_la_LIBADD= $(DBUS_CLIENT_LIBS)
 ## don't export symbols that start with "_" (we use this 
 ## convention for internal symbols)
-libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*"
+libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
 ## note that TESTS has special meaning (stuff to use in make check)
 ## so if adding tests not to be run in make check, don't add them to 
diff --git a/glib/Makefile.am b/glib/Makefile.am
index 757aa5ea..6d81e7d1 100644
--- a/glib/Makefile.am
+++ b/glib/Makefile.am
@@ -21,7 +21,7 @@ libdbus_glib_1_la_SOURCES = 			\
 libdbus_glib_1_la_LIBADD= $(DBUS_GLIB_LIBS) $(top_builddir)/dbus/libdbus-1.la
 ## don't export symbols that start with "_" (we use this 
 ## convention for internal symbols)
-libdbus_glib_1_la_LDFLAGS= -export-symbols-regex "^[^_].*"
+libdbus_glib_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE)
 
 # convenience lib used here and by dbus-viewer
 noinst_LTLIBRARIES=libdbus-gtool.la
diff --git a/qt/Makefile.am b/qt/Makefile.am
index fd273500..d4e9cdc8 100644
--- a/qt/Makefile.am
+++ b/qt/Makefile.am
@@ -10,12 +10,22 @@ dbusinclude_HEADERS=				\
 	server.h
 
 libdbus_qt_1_la_SOURCES = 			\
-	dbus-qthread.cpp message.cpp connection.cpp \
-	integrator.cpp server.cpp integrator.h
-
-connection.cpp: connection.moc
-integrator.cpp: integrator.moc
-server.cpp: server.moc
+	dbus-qthread.cpp \
+	$(top_srcdir)/qt/message.cpp \
+	$(top_srcdir)/qt/connection.cpp \
+	$(top_srcdir)/qt/integrator.cpp \
+	$(top_srcdir)/qt/server.cpp \
+	$(top_srcdir)/qt/connection.h \
+	$(top_srcdir)/qt/integrator.h \
+	$(top_srcdir)/qt/server.h
+
+
+$(top_srcdir)/qt/connection.cpp: connection.moc
+$(top_srcdir)/qt/integrator.cpp: integrator.moc
+$(top_srcdir)/qt/server.cpp: server.moc
+$(top_srcdir)/qt/connection.h: connection.moc
+$(top_srcdir)/qt/integrator.h: integrator.moc
+$(top_srcdir)/qt/server.h: server.moc
 
 CLEANFILES=connection.moc integrator.moc server.moc