[pkg-java] r5166 - trunk/javahelp2/debian

[varun-guest at alioth.debian.org]

Author: varun-guest
Date: 2007-12-24 00:42:42 +0000 (Mon, 24 Dec 2007)
New Revision: 5166

Modified:
   trunk/javahelp2/debian/changelog
   trunk/javahelp2/debian/control
   trunk/javahelp2/debian/rules
Log:
* Remove libjdic-java from Build-Depends and revert old
  changes. (Closes: 457404)

Modified: trunk/javahelp2/debian/changelog
===================================================================
--- trunk/javahelp2/debian/changelog	2007-12-23 00:22:06 UTC (rev 5165)
+++ trunk/javahelp2/debian/changelog	2007-12-24 00:42:42 UTC (rev 5166)
@@ -1,3 +1,10 @@
+javahelp2 (2.0.05-3) unstable; urgency=low
+
+  * Remove libjdic-java from Build-Depends and revert old
+    changes. (Closes: 457404)
+
+ -- Varun Hiremath <varun at debian.org>  Mon, 24 Dec 2007 06:11:57 +0530
+
 javahelp2 (2.0.05-2) unstable; urgency=low
 
   * debian/control:

Modified: trunk/javahelp2/debian/control
===================================================================
--- trunk/javahelp2/debian/control	2007-12-23 00:22:06 UTC (rev 5165)
+++ trunk/javahelp2/debian/control	2007-12-24 00:42:42 UTC (rev 5166)
@@ -5,7 +5,7 @@
 Uploaders: Marek Slama <marek.slama at sun.com>, Varun Hiremath <varun at debian.org>
 Build-Depends: cdbs, debhelper (>= 5)
 Build-Depends-Indep: ant-optional, java-gcj-compat-dev,
- libtomcat5.5-java, libservlet2.4-java, libjdic-java, unzip
+ libtomcat5.5-java, libservlet2.4-java, unzip
 Standards-Version: 3.7.3
 Homepage: http://javahelp.dev.java.net
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/javahelp2

Modified: trunk/javahelp2/debian/rules
===================================================================
--- trunk/javahelp2/debian/rules	2007-12-23 00:22:06 UTC (rev 5165)
+++ trunk/javahelp2/debian/rules	2007-12-24 00:42:42 UTC (rev 5166)
@@ -25,7 +25,8 @@
 	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
-	ln -s -f /usr/share/java/jdic.jar $(DEB_SRCDIR)/javahelp_nbproject/lib/jdic.jar
+	#Remove class uncompilable without JDIC
+	rm -f $(DEB_SRCDIR)/jhMaster/JavaHelp/src/new/javax/help/plaf/basic/BasicNativeContentViewerUI.java
 	#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 \