diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-10-12 11:41:16 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2007-10-12 11:41:16 +0100 |
| commit | 5983c179fe33ff4fca6b37e5d295072430d7149d (patch) | |
| tree | 8202fd010de120fc9ca0152f57a99df95a10efe3 | |
| parent | 3396e2b94368f4bbe2663c8e13e7a34a139279a8 (diff) | |
| parent | 2beb7890280ae3b553e59ab8355b65ec203e4776 (diff) | |
| download | dbus-python-5983c179fe33ff4fca6b37e5d295072430d7149d.tar.gz | |
Merge branch 'master' into purity
Conflicts:
NEWS
| -rw-r--r-- | Makefile.am | 11 | ||||
| -rw-r--r-- | NEWS | 16 | ||||
| -rw-r--r-- | configure.ac | 1 |
3 files changed, 22 insertions, 6 deletions
diff --git a/Makefile.am b/Makefile.am index ba45ee4..45fa47b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -5,16 +5,14 @@ ACLOCAL_AMFLAGS = -I m4 # the api, doc, include subdirs don't need their own Makefile.am # the dbus subdir is handled with non-recursive make because of #12741 -SUBDIRS = _dbus_bindings _dbus_glib_bindings examples m4 test tools . +SUBDIRS = _dbus_bindings _dbus_glib_bindings examples m4 test tools CLEANFILES = EXTRA_DIST = \ dbus-python.pc.in \ AUTHORS \ COPYING \ - ChangeLog \ - COPYING.GPL-2 \ - COPYING.AFL-2.1 + ChangeLog # miss out the gconf examples for now - they don't work # === dbus package === @@ -108,6 +106,11 @@ all: api/index.html clean-local: rm -rf api +_dbus_bindings/_dbus_bindings.la: + $(MAKE) -C _dbus_bindings +_dbus_glib_bindings/_dbus_glib_bindings.la: + $(MAKE) -C _dbus_glib_bindings + APIDOC_PYTHONPATH = $(abs_top_srcdir):$(abs_top_builddir)/_dbus_bindings/.libs:$(abs_top_builddir)/_dbus_glib_bindings/.libs api api/index.html: $(nobase_python_PYTHON) \ @@ -14,7 +14,21 @@ Roadmap: * Implement message serialization and deserialization in pure Python (may need to be conditional on having dbus >= 1.1) -D-Bus Python Bindings 0.82.3 (unreleased) +D-Bus Python Bindings 0.82.4 (unreleased) +========================================= + +Fixes: + +* Using non-recursive make for dbus/ directory should fix builds in some + environments (fd.o #12741) + +Licensing: + +* Everything is now under the same MIT/X11 license used for Collabora code in + the previous release +* Added copyright headers to some files that were still missing them + +D-Bus Python Bindings 0.82.3 (2007-09-27) ========================================= Fixes: diff --git a/configure.ac b/configure.ac index ab1c691..79e21e2 100644 --- a/configure.ac +++ b/configure.ac @@ -177,7 +177,6 @@ AC_CONFIG_FILES( Makefile _dbus_bindings/Makefile _dbus_glib_bindings/Makefile - dbus/Makefile dbus-python.pc dbus/_version.py examples/Makefile |