diff options
| author | Matthew Johnson <mjj29@qadesh.matthew.ath.cx> | 2009-02-20 21:54:14 +0000 |
|---|---|---|
| committer | Matthew Johnson <mjj29@qadesh.matthew.ath.cx> | 2009-02-20 21:54:14 +0000 |
| commit | 3201f076de801ba502c63ded3a55972d65ea0aa0 (patch) | |
| tree | b256da96abdce348b5929ad219d29c29d5bf0312 | |
| parent | 9e874b4b45556e2f4e8d1992dc81060a3f582230 (diff) | |
patches from Omair Majid <omajid@redhat.com>
| -rw-r--r-- | DBusCall.sgml | 10 | ||||
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | changelog | 4 |
3 files changed, 12 insertions, 5 deletions
diff --git a/DBusCall.sgml b/DBusCall.sgml index 0b0456d..9efd4f0 100644 --- a/DBusCall.sgml +++ b/DBusCall.sgml @@ -61,7 +61,13 @@ manpage.1: manpage.sgml </refnamediv> <refsynopsisdiv> <cmdsynopsis> - <command>&dhpackage;</command> <replaceable>dest</replaceable> <replaceable>path</replaceable> <replaceable>interface</replaceable> <replaceable>method</replaceable> <option><replaceable>sig</replaceable> <replaceable>args</replaceable></option> + <command>&dhpackage;</command> + <arg><replaceable>dest</replaceable></arg> + <arg><replaceable>path</replaceable></arg> + <arg><replaceable>interface</replaceable></arg> + <arg><replaceable>method</replaceable></arg> + <arg><option><replaceable>sig</replaceable></option></arg> + <arg><option><replaceable>args</replaceable></option></arg> </cmdsynopsis> </refsynopsisdiv> <refsect1> @@ -83,8 +89,6 @@ manpage.1: manpage.sgml options is included below. </para> - <variablelist> - </variablelist> </refsect1> <refsect1> <title>AUTHOR</title> @@ -15,6 +15,7 @@ JAVADOC?=javadoc JAR?=jar MAKE?=make MSGFMT?=msgfmt +DOCBOOKTOMAN?=docbook-to-man # Program parameters CPFLAG?=-classpath @@ -137,7 +138,7 @@ doc/api/index.html: $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java .doc $(JAVADOC) -quiet -author -link http://java.sun.com/j2se/1.5.0/docs/api/ -classpath $(JAVAUNIXJARDIR)/unix.jar:$(JAVAUNIXJARDIR)/hexdump.jar:$(JAVAUNIXJARDIR)/debug-$(DEBUG).jar -d doc/api $(SRCDIR)/*.java $(SRCDIR)/dbus/*.java $(SRCDIR)/dbus/types/*.java $(SRCDIR)/dbus/exceptions/*.java %.1: %.sgml - docbook-to-man $< > $@ + $(DOCBOOKTOMAN) $< > $@ bin/%: %.sh .bin sed 's,\%JARPATH\%,$(JARPREFIX),;s,\%JAVAUNIXJARPATH\%,$(JAVAUNIXJARDIR),;s,\%JAVAUNIXLIBPATH\%,$(JAVAUNIXLIBDIR),;s,\%VERSION\%,$(VERSION),;s,\%DEBUG\%,$(DEBUG),;s,\%JAVA\%,$(JAVA),' < $< > $@ @@ -4,13 +4,15 @@ Version 2.6: * Add DBusConnection.PeerSet for tracking peer lifetimes * Fix bug where DBusDaemon never sends NameOwnerChanged/NameLost signals + * Patches from Omair Majid <omajid -at- redhat -dot- com> to fix + DBusCall manpage and allow alternative docbook-to-man implementations. Version 2.5.1: * Fix for possible NPex in DBusDaemon * Add hexdump.jar to Class-Path for libdbus-java.jar * Add GetAll to properties interface (Patch from - Sveinung Kvilhaugsvik <sveinung84@users.sourceforge.net>) + Sveinung Kvilhaugsvik <sveinung84 -at- users -dot- sourceforge -dot- net>) * Make signals with renamed interfaces and member names work if they are explicitly listened for (Partially fixes: #18257). Also make the error reporting better when it doesn't work. |