[dbus-java] 02/12: Drop libdbus-java-doc and disable javadoc.

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to annotated tag debian/2.8-7
in repository dbus-java.

commit ee1aa2f0deb67c4e7a76655801c3d4c815d17704
Author: Markus Koschany <apo at debian.org>
Date:   Wed Dec 20 22:22:25 2017 +0100

    Drop libdbus-java-doc and disable javadoc.
---
 debian/control                                           | 16 ----------------
 debian/libdbus-java-doc.install                          |  7 -------
 ...s-java-doc.doc-base.api => libdbus-java.doc-base.api} |  2 +-
 ...-doc.doc-base.manual => libdbus-java.doc-base.manual} |  2 +-
 debian/libdbus-java.install                              |  3 +++
 debian/rules                                             |  2 +-
 6 files changed, 6 insertions(+), 26 deletions(-)

diff --git a/debian/control b/debian/control
index 179d987..bba922b 100644
--- a/debian/control
+++ b/debian/control
@@ -59,19 +59,3 @@ Description: simple interprocess messaging system (Java Binaries)
  .
  See the dbus description for more information about D-Bus in general.
 
-Package: libdbus-java-doc
-Recommends:
- libdbus-java
-Depends:
- default-jdk-doc,
- ${misc:Depends}
-Architecture: all
-Section: doc
-Description: simple interprocess messaging system (Java interface documentation)
- D-Bus is a message bus, used for sending messages between applications.
- Conceptually, it fits somewhere in between raw sockets and CORBA in
- terms of complexity.
- .
- This package provides the documentation for the Java implementation of D-Bus.
- .
- See the dbus description for more information about D-Bus in general.
diff --git a/debian/libdbus-java-doc.install b/debian/libdbus-java-doc.install
deleted file mode 100644
index f64e5f5..0000000
--- a/debian/libdbus-java-doc.install
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/share/doc/libdbus-java/README usr/share/doc/libdbus-java-doc/
-usr/share/doc/libdbus-java/api
-usr/share/doc/libdbus-java/changelog usr/share/doc/libdbus-java-doc/
-usr/share/doc/libdbus-java/dbus-java
-usr/share/doc/libdbus-java/dbus-java.dvi
-usr/share/doc/libdbus-java/dbus-java.pdf
-usr/share/doc/libdbus-java/dbus-java.ps
diff --git a/debian/libdbus-java-doc.doc-base.api b/debian/libdbus-java.doc-base.api
similarity index 89%
rename from debian/libdbus-java-doc.doc-base.api
rename to debian/libdbus-java.doc-base.api
index 5119b7f..a954fe1 100644
--- a/debian/libdbus-java-doc.doc-base.api
+++ b/debian/libdbus-java.doc-base.api
@@ -1,4 +1,4 @@
-Document: libdbus-java-doc.api
+Document: libdbus-java.api
 Title: API JavaDoc for libdbus-java
 Author: Matthew Johnson
 Abstract: This the API JavaDoc provided by Matthew Johnson for libdbus-java
diff --git a/debian/libdbus-java-doc.doc-base.manual b/debian/libdbus-java.doc-base.manual
similarity index 93%
rename from debian/libdbus-java-doc.doc-base.manual
rename to debian/libdbus-java.doc-base.manual
index abc56e0..1b42eb9 100644
--- a/debian/libdbus-java-doc.doc-base.manual
+++ b/debian/libdbus-java.doc-base.manual
@@ -1,4 +1,4 @@
-Document: libdbus-java-doc.manual
+Document: libdbus-java.manual
 Title: Usage documentation for libdbus-java
 Author: Matthew Johnson
 Abstract: This manual describes what libdbus-java is
diff --git a/debian/libdbus-java.install b/debian/libdbus-java.install
index 8f1d44b..6d7673b 100644
--- a/debian/libdbus-java.install
+++ b/debian/libdbus-java.install
@@ -2,3 +2,6 @@ usr/share/doc/libdbus-java/README
 usr/share/doc/libdbus-java/changelog
 usr/share/java/dbus-2.*.jar
 usr/share/java/dbus.jar
+usr/share/doc/libdbus-java/dbus-java.dvi
+usr/share/doc/libdbus-java/dbus-java.pdf
+usr/share/doc/libdbus-java/dbus-java.ps
diff --git a/debian/rules b/debian/rules
index 3af80eb..6cf9795 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ override_dh_auto_build:
 		JAVAC=${JAVA_HOME}/bin/javac \
 		JAVA=${JAVA_HOME}/bin/java \
 		JAR=${JAVA_HOME}/bin/jar \
-		JAVADOC="${JAVA_HOME}/bin/javadoc -link /usr/share/doc/default-jdk-doc/api --ignore-source-errors" \
+		JAVADOC="${JAVA_HOME}/bin/javadoc -link /usr/share/doc/default-jdk-doc/api" \
 		all doc check
 	touch $@
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/dbus-java.git