[apache-log4j1.2] 34/40: No longer attempt to install the javadoc jar (Closes: #879251)

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository apache-log4j1.2.

commit 6d062cdeaff21171a573eb0527f50d73db448d9a
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Sun Oct 22 00:25:57 2017 +0200

    No longer attempt to install the javadoc jar (Closes: #879251)
---
 debian/changelog             | 1 +
 debian/liblog4j1.2-java.poms | 1 -
 debian/rules                 | 4 +---
 3 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0add48f..e7939fa 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,6 @@
 apache-log4j1.2 (1.2.17-8) UNRELEASED; urgency=medium
 
+  * No longer attempt to install the javadoc jar (Closes: #879251)
   * Moved the package to Git
   * Standards-Version updated to 4.1.1
   * Switch to debhelper level 10
diff --git a/debian/liblog4j1.2-java.poms b/debian/liblog4j1.2-java.poms
index c25b4ec..3a830bc 100644
--- a/debian/liblog4j1.2-java.poms
+++ b/debian/liblog4j1.2-java.poms
@@ -1,2 +1 @@
 pom.xml --has-package-version --java-lib --usj-name=log4j-1.2 --artifact=dist/lib/log4j-*.jar
-dist/lib/log4j.javadoc.pom --has-package-version --artifact=dist/lib/log4j.javadoc.jar --classifier=javadoc --ignore-pom --package=liblog4j-1.2-java-doc
diff --git a/debian/rules b/debian/rules
index af01837..4336d44 100755
--- a/debian/rules
+++ b/debian/rules
@@ -14,7 +14,7 @@ DEB_ANT_ARGS := -Dversion=$(VERSION)
 clean::
 	-$(RM) -r docs
 	-rm -rf debian/tmp
-	rm -Rf debian/liblog4j-1.2-java-doc/*
+	rm -Rf debian/liblog4j1.2-java-doc/*
 	rm -Rf debian/log4j-${VERSION}.bar
 	mh_clean
 
@@ -26,8 +26,6 @@ common-build-indep::
 		--output log4j.jar dist/lib/log4j-$(VERSION).jar
 	rm debian/.log4j-versioned.bnd dist/lib/log4j-$(VERSION).jar
 	mv log4j.jar dist/lib/log4j-$(VERSION).jar
-	cp pom.xml dist/lib/log4j.javadoc.pom
-	jar cvf dist/lib/log4j.javadoc.jar -C docs/api/ .
 
 install/liblog4j1.2-java::
 	$(RM) dist/lib/log4j-*-sources.jar

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