[libnanoxml2-java] 05/09: Imported Debian patch 2.2.3.dfsg-4

[Andreas Tille]

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

tille pushed a commit to branch master
in repository libnanoxml2-java.

commit 183129c1c017a18443bcfb0bee11545c635f93b5
Author: Sveinung Kvilhaugsvik <sveinung84 at users.sourceforge.net>
Date:   Wed Mar 17 02:01:04 2010 +0100

    Imported Debian patch 2.2.3.dfsg-4
---
 debian/changelog | 6 ++++++
 debian/rules     | 6 +-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f9cadb0..f08133d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+libnanoxml2-java (2.2.3.dfsg-4) unstable; urgency=low
+
+  * Removed no longer needed work around for 567899 (Closes: #573697)
+
+ -- Sveinung Kvilhaugsvik <sveinung84 at users.sourceforge.net>  Wed, 17 Mar 2010 02:01:04 +0100
+
 libnanoxml2-java (2.2.3.dfsg-3) unstable; urgency=low
 
   * Depend on headless since full jre not needed
diff --git a/debian/rules b/debian/rules
index c926e04..2683c53 100755
--- a/debian/rules
+++ b/debian/rules
@@ -41,9 +41,7 @@ build-stamp:
 	rm *.jar
 	prename 's/bar/jar/' *.bar
 
-	cp /usr/share/doc/default-jdk-doc/api/package-list.gz .
-	gunzip package-list.gz
-	${JAVA_HOME}/bin/javadoc -author -linkoffline /usr/share/doc/default-jdk-doc/api . -quiet \
+	${JAVA_HOME}/bin/javadoc -author -link /usr/share/doc/default-jdk-doc/api -quiet \
 	-sourcepath Sources/Java/:Sources/Lite/:Sources/SAX/ -source 1.4 \
 	nanoxml net.n3.nanoxml net.n3.nanoxml.sax -d api
 	if [ $(filter nocheck, $(DEB_BUILD_OPTIONS)) ]; \
@@ -63,8 +61,6 @@ clean:
 	rm -rf Test/*/*.class
 	rm -rf debian/orig.tmp || echo "No failed source fetch"
 
-	rm -r package-list package-list.gz || echo "package-list not copied"
-
 	dh_clean 
 
 install:

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