Merge branch 'master' of git+ssh://git.freedesktop.org/git/dbus/dbus-java

Conflicts:

	changelog

4 files changed, 24 insertions, 10 deletions

diff --git a/INSTALL b/INSTALL
index 50bab41..d59f76f 100644
--- a/INSTALL
+++ b/INSTALL
@@ -31,7 +31,7 @@ directories can be achieved using the BINDIR etc variables. For more detail
 read the Makefile.
 
 Documentation for the bindings can be built with `make doc' and installed with
-`make install-doc', with the same provisos for installation paths.
+`make install-doc install-man', with the same provisos for installation paths.
 
 Using the Bindings
 ------------------
diff --git a/Makefile b/Makefile
index 4699d60..cef930d 100644
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,9 @@ LIBPREFIX?=$(PREFIX)/lib/jni
 BINPREFIX?=$(PREFIX)/bin
 DOCPREFIX?=$(PREFIX)/share/doc/libdbus-java
 MANPREFIX?=$(PREFIX)/share/man/man1
+RUNPREFIX?=$(PREFIX)
+RUNJARPREFIX?=$(RUNPREFIX)/share/java
+RUNLIBPREFIX?=$(RUNPREFIX)/lib/jni
 
 VERSION = 1.12
 RELEASEVERSION = 1.11
@@ -192,20 +195,27 @@ install: dbus-java-viewer-$(VERSION).jar libdbus-java-$(VERSION).jar libdbus-jav
 	install -d $(LIBPREFIX)
 	install libdbus-java.so $(LIBPREFIX)
 	install -d $(BINPREFIX)
-	sed 's,\%JARPATH\%,$(JARPREFIX),;s,\%LIBPATH\%,$(LIBPREFIX),' < bin/DBusViewer > $(BINPREFIX)/DBusViewer
+	sed 's,\%JARPATH\%,$(RUNJARPREFIX),;s,\%LIBPATH\%,$(RUNLIBPREFIX),' < bin/DBusViewer > $(BINPREFIX)/DBusViewer
 	chmod +x $(BINPREFIX)/DBusViewer
-	sed 's,\%JARPATH\%,$(JARPREFIX),;s,\%LIBPATH\%,$(LIBPREFIX),' < bin/CreateInterface > $(BINPREFIX)/CreateInterface
+	sed 's,\%JARPATH\%,$(RUNJARPREFIX),;s,\%LIBPATH\%,$(RUNLIBPREFIX),' < bin/CreateInterface > $(BINPREFIX)/CreateInterface
 	chmod +x $(BINPREFIX)/CreateInterface
-	sed 's,\%JARPATH\%,$(JARPREFIX),;s,\%LIBPATH\%,$(LIBPREFIX),' < bin/ListDBus > $(BINPREFIX)/ListDBus
+	sed 's,\%JARPATH\%,$(RUNJARPREFIX),;s,\%LIBPATH\%,$(RUNLIBPREFIX),' < bin/ListDBus > $(BINPREFIX)/ListDBus
 	chmod +x $(BINPREFIX)/ListDBus
 
-install-doc: doc CreateInterface.1 ListDBus.1 DBusViewer.1 changelog AUTHORS COPYING README INSTALL
+install-man: CreateInterface.1 ListDBus.1 DBusViewer.1 changelog AUTHORS COPYING README INSTALL
 	install -d $(DOCPREFIX)
 	install -m 644 changelog $(DOCPREFIX)
 	install -m 644 COPYING $(DOCPREFIX)
 	install -m 644 AUTHORS $(DOCPREFIX)
 	install -m 644 README $(DOCPREFIX)
 	install -m 644 INSTALL $(DOCPREFIX)
+	install -d $(MANPREFIX)
+	install -m 644 CreateInterface.1 $(MANPREFIX)/CreateInterface.1
+	install -m 644 ListDBus.1 $(MANPREFIX)/ListDBus.1
+	install -m 644 DBusViewer.1 $(MANPREFIX)/DBusViewer.1
+
+install-doc: doc 
+	install -d $(DOCPREFIX)
 	install -m 644 doc/dbus-java.dvi $(DOCPREFIX)
 	install -m 644 doc/dbus-java.ps $(DOCPREFIX)
 	install -m 644 doc/dbus-java.pdf $(DOCPREFIX)
@@ -215,10 +225,6 @@ install-doc: doc CreateInterface.1 ListDBus.1 DBusViewer.1 changelog AUTHORS COP
 	install -m 644 doc/dbus-java/*.png $(DOCPREFIX)/dbus-java
 	install -d $(DOCPREFIX)/api
 	cp -a doc/api/* $(DOCPREFIX)/api
-	install -d $(MANPREFIX)
-	install -m 644 CreateInterface.1 $(MANPREFIX)/CreateInterface.1
-	install -m 644 ListDBus.1 $(MANPREFIX)/ListDBus.1
-	install -m 644 DBusViewer.1 $(MANPREFIX)/DBusViewer.1
 
 dist: .dist
 .dist: bin dbus-java.c dbus-java.tex Makefile org tmp-session.conf CreateInterface.sgml ListDBus.sgml DBusViewer.sgml changelog AUTHORS COPYING README INSTALL
diff --git a/TODO b/TODO
index 60a07ee..322cdab 100644
--- a/TODO
+++ b/TODO
@@ -1,5 +1,12 @@
  * support Enums as UInt32s
  * use native java backend
+ * allow 'virtual' object handlers, so that all object paths under a certain hierarchy are handled by the same object
+ * fix dbus-viewer to recurse on paths
+ * extend dbus-viewer to make calls
+ * check that this is true:
+   objects should not return ObjectUnknown if the path has an existant
+   child node, but should if not (for introspection) It should return
+   UnknownInterface or Method
  * make it work with free VM/Compilers:
    make CFLAGS="`pkg-config --cflags dbus-1` -I/opt/java-generics/include" CLASSPATH=/opt/java-generics/share/classpath/glibj.zip:. LD_LIBRARY_PATH=/opt/java-generics/lib/classpath/ JAVAC="ecj -1.5" JAVA_HOME=/opt/java-generics/ JCFLAGS="-cp classes -bootclasspath /opt/java-generics/share/classpath/glibj.zip" JAVA=jamvm  check
    after installing eclipse eclipse-ecj jamvm and compiling classpath-generics with prefix=/opt/java-generics
diff --git a/changelog b/changelog
index 926e4d3..7813f73 100644
--- a/changelog
+++ b/changelog
@@ -4,7 +4,8 @@ Version 1.12:
 
 Version 1.11:
 
-	* fix bugs for debian packaging, split install targets
+	* fix script replacement directories to be different to install directories
+	* split install-doc and install-man to allow easy split -doc package
 
 Version 1.10: