2009-06-08 Mark Doffman <mark.doffman@codethink.co.uk>

        Change version info to 0.1
        Move D-Bus activation files to registryd folder.

diff --git a/configure.ac b/configure.ac
index c79e58d..03948e3 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,9 +1,9 @@
-AC_INIT([at-spi-core], [2.0.0], [accessibility-atspi@lists.linux-foundation.org])
+AC_INIT([at-spi2-core], [0.1.0], [accessibility-atspi@lists.linux-foundation.org])
 AC_CONFIG_AUX_DIR(config)
 AC_CONFIG_MACRO_DIR([m4])
 
-AT_SPI_CORE_MAJOR_VERSION=2
-AT_SPI_CORE_MINOR_VERSION=0
+AT_SPI_CORE_MAJOR_VERSION=0
+AT_SPI_CORE_MINOR_VERSION=1
 AT_SPI_CORE_VERSION="$AT_SPI_CORE_MAJOR_VERSION.$AT_SPI_CORE_MINOR_VERSION"
 AC_SUBST(AT_SPI_CORE_VERSION)
 

diff --git a/dbind/Makefile.am b/dbind/Makefile.am
index 437f88f..88bdaa4 100644 (file)
--- a/dbind/Makefile.am
+++ b/dbind/Makefile.am
@@ -22,13 +22,3 @@ TESTS = dbtest
 check_PROGRAMS = dbtest
 dbtest_SOURCES = dbtest.c
 dbtest_LDFLAGS = libdbind.la
-
-servicedir       = $(DBUS_SERVICES_DIR)
-service_in_files = org.freedesktop.atspi.Registry.service.in
-service_DATA     = $(service_in_files:.service.in=.service)
-
-$(service_DATA): $(service_in_files) Makefile
-       @sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
-
-DISTCLEANFILES = org.freedesktop.atspi.Registry.service
-EXTRA_DIST = org.freedesktop.atspi.Registry.service.in

diff --git a/registryd/Makefile.am b/registryd/Makefile.am
index 0a0aa05..cb63f8a 100644 (file)
--- a/registryd/Makefile.am
+++ b/registryd/Makefile.am
@@ -49,6 +49,14 @@ default_session_DATA = $(default_session_in_files:.desktop.in=.desktop)
 CLEANFILES =                   \
        $(default_session_DATA) \
        $(default_session_in_files)
+EXTRA_DIST = at-spi-registryd.desktop.in.in
 
-DISTCLEANFILES =               \
-       $(default_session_in_in_files)
+servicedir       = $(DBUS_SERVICES_DIR)
+service_in_files = org.freedesktop.atspi.Registry.service.in
+service_DATA     = $(service_in_files:.service.in=.service)
+
+$(service_DATA): $(service_in_files) Makefile
+       @sed -e "s|\@LIBEXECDIR\@|$(libexecdir)|" $< > $@
+
+DISTCLEANFILES = org.freedesktop.atspi.Registry.service
+EXTRA_DIST = org.freedesktop.atspi.Registry.service.in

diff --git a/dbind/org.freedesktop.atspi.Registry.service.in b/registryd/org.freedesktop.atspi.Registry.service.in
similarity index 100%
rename from dbind/org.freedesktop.atspi.Registry.service.in
rename to registryd/org.freedesktop.atspi.Registry.service.in