Bug#447469: Patch to fix this bug

[Varun Hiremath]

tags 447469 +pending
thanks

Hi,

Please find attahced patch to fix this bug. 
Also, libjdic-java is now available in Debian.

Regards
Varun

-- 
Varun Hiremath
Undergraduate Student,
Aerospace Engineering Department,
Indian Institute of Technology Madras,
Chennai, India
---------------------------------------
Homepage : http://varun.travisbsd.org
-------------- next part --------------
diff -urN javahelp2-2.0.05.orig/debian/changelog javahelp2-2.0.05/debian/changelog
--- javahelp2-2.0.05.orig/debian/changelog	2007-11-30 21:26:26.000000000 +0530
+++ javahelp2-2.0.05/debian/changelog	2007-11-30 21:33:10.000000000 +0530
@@ -1,3 +1,14 @@
+javahelp2 (2.0.05-2) unstable; urgency=low
+
+  * debian/control:
+    + Build-Depend on ant-options instead of ant (Closes: #447469)
+    + Add libjdic-java to Build-Depends-Indep
+    + Add Homepage, Vcs-{Svn, Browser} headers
+  * debian/rules:
+    + Create symlink for jdic.jar
+
+ -- Varun Hiremath <varunhiremath at gmail.com>  Fri, 30 Nov 2007 21:30:13 +0530
+
 javahelp2 (2.0.05-1) unstable; urgency=low
 
   * Initial version (Closes: #432773).
diff -urN javahelp2-2.0.05.orig/debian/compat javahelp2-2.0.05/debian/compat
--- javahelp2-2.0.05.orig/debian/compat	2007-11-30 21:26:26.000000000 +0530
+++ javahelp2-2.0.05/debian/compat	2007-11-30 21:33:10.000000000 +0530
@@ -1 +1 @@
-4
+5
diff -urN javahelp2-2.0.05.orig/debian/control javahelp2-2.0.05/debian/control
--- javahelp2-2.0.05.orig/debian/control	2007-11-30 21:26:26.000000000 +0530
+++ javahelp2-2.0.05/debian/control	2007-11-30 21:33:10.000000000 +0530
@@ -3,9 +3,13 @@
 Priority: optional
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Marek Slama <marek.slama at sun.com>
-Build-Depends: cdbs (>= 0.4.8), debhelper (>= 4.2.0)
-Build-Depends-Indep: ant, java-gcj-compat-dev, libtomcat5.5-java, libservlet2.4-java, unzip
+Build-Depends: cdbs, debhelper (>= 5)
+Build-Depends-Indep: ant-optional, java-gcj-compat-dev,
+ libtomcat5.5-java, libservlet2.4-java, libjdic-java, unzip
 Standards-Version: 3.7.2
+Homepage: http://javahelp.dev.java.net
+Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/javahelp2
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/javahelp2
 
 Package: javahelp2
 Architecture: all
@@ -23,9 +27,7 @@
  entirely in the Java programming language. The JavaHelp system reference
  implementation, based on the Java Foundation Classes (JFC, also known
  as Swing), provides a standard interface that enables both application
- developers and authors to add online help to their applications.
- .
-  Homepage: http://javahelp.dev.java.net
+ developers and authors to add online help to their applications.  
 
 Package: javahelp2-doc
 Architecture: all
@@ -44,5 +46,3 @@
  developers and authors to add online help to their applications.
  .
  This package contains Javadoc API documentation.
- .
-  Homepage: http://javahelp.dev.java.net
diff -urN javahelp2-2.0.05.orig/debian/rules javahelp2-2.0.05/debian/rules
--- javahelp2-2.0.05.orig/debian/rules	2007-11-30 21:26:26.000000000 +0530
+++ javahelp2-2.0.05/debian/rules	2007-11-30 21:33:10.000000000 +0530
@@ -25,8 +25,7 @@
 	mkdir -p $(DEB_SRCDIR)/javahelp_nbproject/lib
 	ln -s -f /usr/share/java/servlet-api.jar $(DEB_SRCDIR)/javahelp_nbproject/lib/servlet-api.jar
 	ln -s -f /usr/share/java/jsp-api.jar $(DEB_SRCDIR)/javahelp_nbproject/lib/jsp-api.jar
-	#Remove class uncompilable without JDIC
-	rm -f $(DEB_SRCDIR)/jhMaster/JavaHelp/src/new/javax/help/plaf/basic/BasicNativeContentViewerUI.java
+	ln -s -f /usr/share/java/jdic.jar $(DEB_SRCDIR)/javahelp_nbproject/lib/jdic.jar
 	#Build javahelp target 'release' is for jars, target 'javadoc' is for javadoc
 	ant -f $(DEB_SRCDIR)/javahelp_nbproject/build.xml -Djdic-jar-present=true -Djdic-zip-present=true \
 	-Ddist.javadoc.dir=dist/lib/api \