* qt/Makfile.am:

	* qt/src/Makefile.am: Fix the EXTRA_DIST after the
	reorganisation. Thanks to Timo Hoenig for pointing this out.

diff --git a/ChangeLog b/ChangeLog
index e24d66e..b1284e9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,9 +1,15 @@
-2005-05-06  Robert McQueen  <robot101@debian.org>
+2006-06-07  Thiago Macieira <thiago.macieira@trolltech.com>
+
+       * qt/Makfile.am:
+       * qt/src/Makefile.am: Fix the EXTRA_DIST after the
+       reorganisation. Thanks to Timo Hoenig for pointing this out.
+
+2006-06-06  Robert McQueen  <robot101@debian.org>
 
        * glib/dbus-gtype-specialized.c: Fix obvious leak of GArray in every
          call to dbus_g_type_get_struct.
 
-2005-05-06  Robert McQueen  <robot101@debian.org>
+2006-06-06  Robert McQueen  <robot101@debian.org>
 
        * glib/dbus-gvalue-utils.c: Fix the failing test where static string
          pointers were put into a GPtrArray-based specialised collection, and
@@ -14,7 +20,7 @@
          this abstraction are the bindings themselves, I don't think this is
          too bad, but others should watch their choice of take vs set_static.
 
-2005-05-06  Robert McQueen  <robot101@debian.org>
+2006-06-06  Robert McQueen  <robot101@debian.org>
 
        * glib/dbus-gvalue-utils.c: Spotted a warning about the return value
          of g_slist_prepend not being used. Fixed copying of slist-based
@@ -22,7 +28,7 @@
          all broken. Went on to fix iterating and appending too. Good thing
          nobody uses this code yet.
 
-2005-05-06  Robert McQueen  <robot101@debian.org>
+2006-06-06  Robert McQueen  <robot101@debian.org>
 
        * glib/dbus-gvalue-utils.c: Remove duplicated code by having all of
          the iterators use gvalue_take_ptrarray_value (the GValues themselves

diff --git a/qt/Makefile.am b/qt/Makefile.am
index e09fd1e..835059b 100644 (file)
--- a/qt/Makefile.am
+++ b/qt/Makefile.am
@@ -5,3 +5,5 @@ QT_SUBDIRS = src tools examples
 endif
 
 SUBDIRS = $(QT_SUBDIRS)
+
+EXTRA_DIST = qt-dbus.qdocconf

diff --git a/qt/src/Makefile.am b/qt/src/Makefile.am
index 41e3c5e..99b1788 100644 (file)
--- a/qt/src/Makefile.am
+++ b/qt/src/Makefile.am
@@ -64,7 +64,5 @@ libdbus_qt4_1_la_LIBADD= $(DBUS_QT_LIBS) $(top_builddir)/dbus/libdbus-1.la
 libdbus_qt4_1_la_LDFLAGS= -version-info 1:0 -no-undefined
 libdbus_qt4_1_la_CPPFLAGS= -DQDBUS_MAKEDLL
 
-EXTRA_DIST = qt-dbus.qdocconf
-
 %.moc: %.h
        $(QT_MOC) $< > $@