[pkg-java] r13661 - in trunk/jcharts/debian: . patches

Onkar Shinde onkarshinde-guest at alioth.debian.org
Sat May 7 16:51:30 UTC 2011 

Author: onkarshinde-guest
Date: 2011-05-07 16:51:29 +0000 (Sat, 07 May 2011)
New Revision: 13661

Added:
   trunk/jcharts/debian/libjcharts-java.lintian-overrides
Modified:
   trunk/jcharts/debian/changelog
   trunk/jcharts/debian/control
   trunk/jcharts/debian/patches/01_remove_old_functionality.diff
   trunk/jcharts/debian/rules
Log:
Fixed review comments

Modified: trunk/jcharts/debian/changelog
===================================================================
--- trunk/jcharts/debian/changelog	2011-05-06 08:12:54 UTC (rev 13660)
+++ trunk/jcharts/debian/changelog	2011-05-07 16:51:29 UTC (rev 13661)
@@ -4,17 +4,18 @@
     - Patch to exclude files that use Sun proprietary APIs and related changes.
       (Closes: #594270)
   * debian/control
-    - No need to use only OpenJDK or Sun JDK/JRE now. Updated (build-)deps
+    - No need to use only OpenJDK or Sun JDK/JRE now. Updated depedencies
       accordingly.
     - Build against libservlet2.5-java instead of libservlet2.4-java.
     - Add libjcharts-java-doc package containing API documentation.
     - Update standards version to 3.9.2. No change needed.
   * debian/rules
-    - Change JAVA_HOME to 'default-jdk' home.
     - Use servlet-api-2.5 instead of servlet-api in build classpath.
-    - Build javadocs as well.
+    - Build javadocs as well. Update clean rule to delete javadocs directory.
   * debian/libjcharts-java-doc.install
     - Install API documentation at appropriate place.
+  * debian/libjcharts-java.lintian-overrides
+    - The library needs to depend on jre. So add override for lintian warning.
   * Convert package to source format 3.0.
 
  -- Onkar Shinde <onkarshinde at ubuntu.com>  Fri, 06 May 2011 10:27:01 +0530

Modified: trunk/jcharts/debian/control
===================================================================
--- trunk/jcharts/debian/control	2011-05-06 08:12:54 UTC (rev 13660)
+++ trunk/jcharts/debian/control	2011-05-07 16:51:29 UTC (rev 13661)
@@ -4,7 +4,7 @@
 Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
 Uploaders: Onkar Shinde <onkarshinde at ubuntu.com>
 Build-Depends: debhelper (>=5), cdbs, ant, ant-optional
-Build-Depends-Indep: default-jdk, default-jdk-doc, libbatik-java, libservlet2.5-java, libservlet2.5-java-doc
+Build-Depends-Indep: openjdk-6-jdk, default-jdk-doc, libbatik-java, libservlet2.5-java, libservlet2.5-java-doc
 Standards-Version: 3.9.2
 Homepage: http://jcharts.sourceforge.net/
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jcharts
@@ -24,7 +24,8 @@
 Package: libjcharts-java-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}, default-jdk-doc, libservlet2.5-java-doc
+Depends: ${misc:Depends}
+Recommends: default-jdk-doc, libservlet2.5-java-doc
 Suggests: libjcharts-java (= ${binary:Version})
 Description: java based charts library (API docs)
  jCharts is a 100% Java based charting utility that outputs a variety of

Added: trunk/jcharts/debian/libjcharts-java.lintian-overrides
===================================================================
--- trunk/jcharts/debian/libjcharts-java.lintian-overrides	                        (rev 0)
+++ trunk/jcharts/debian/libjcharts-java.lintian-overrides	2011-05-07 16:51:29 UTC (rev 13661)
@@ -0,0 +1,2 @@
+# The library uses AWT APIs so a dependency on JRE is needed.
+libjcharts-java binary: needless-dependency-on-jre

Modified: trunk/jcharts/debian/patches/01_remove_old_functionality.diff
===================================================================
--- trunk/jcharts/debian/patches/01_remove_old_functionality.diff	2011-05-06 08:12:54 UTC (rev 13660)
+++ trunk/jcharts/debian/patches/01_remove_old_functionality.diff	2011-05-07 16:51:29 UTC (rev 13661)
@@ -2,8 +2,8 @@
  and is superceeded by JPEGEncoder.java. Patched other source files accordingly.
 Forwarded: not-needed
 Author: Onkar Shinde <onshinde at ubuntu.com>
---- a/build/build.xml	2011-05-06 10:54:07.000000000 +0530
-+++ b/build/build.xml	2011-05-06 10:58:30.000000000 +0530
+--- a/build/build.xml	2011-05-07 20:46:55.000000000 +0530
++++ b/build/build.xml	2011-05-07 20:48:21.000000000 +0530
 @@ -47,7 +47,9 @@
  
  	<!--===============================================================================-->
@@ -15,7 +15,20 @@
  	</target>
  
  
-@@ -92,8 +94,8 @@
+@@ -83,7 +85,11 @@
+ 	<!--===============================================================================-->
+ 	<target name="jar" depends="compile">
+ 		<delete file="${jar.jCharts}" />
+-		<jar jarfile="${jar.jCharts}" basedir="${dir.build}" />
++		<jar jarfile="${jar.jCharts}" basedir="${dir.build}">
++			<manifest>
++				<attribute name="Class-Path" value="batik.jar servlet-api-2.5.jar" />
++			</manifest>
++		</jar>
+ 		<delete dir="${dir.build}" />
+ 	</target>
+ 
+@@ -92,8 +98,8 @@
  	<target name="javadocs">
  		<delete dir="${dir.javadocs}" />
  		<mkdir dir="${dir.javadocs}" />
@@ -26,7 +39,7 @@
  					destdir="${dir.javadocs}"
  					packagenames="org.jCharts.*"
  					excludepackagenames="javax.*"
-@@ -102,6 +104,11 @@
+@@ -102,6 +108,11 @@
  					version="true"
  					windowtitle="${project.name}-${project.version} API"
  					doctitle="${project.name}-${project.version}">
@@ -38,8 +51,8 @@
  		</javadoc>
  	</target>
  
---- a/src/org/jCharts/encoders/ServletEncoderHelper.java	2011-05-06 10:54:07.000000000 +0530
-+++ b/src/org/jCharts/encoders/ServletEncoderHelper.java	2011-05-06 10:54:14.000000000 +0530
+--- a/src/org/jCharts/encoders/ServletEncoderHelper.java	2011-05-07 20:46:55.000000000 +0530
++++ b/src/org/jCharts/encoders/ServletEncoderHelper.java	2011-05-07 20:47:08.000000000 +0530
 @@ -81,30 +81,6 @@
  	 * Convenience method to call from a Servlet or JSP.  This method will set the appropriate
  	 *  mime type and then export the chart as the response.
@@ -71,8 +84,8 @@
  	 * @param chart
  	 * @param quality float value from 0.0f(worst image quality) - 1.0f(best image quality)
  	 * @param httpServletResponse
---- a/src/org/jCharts/test/ChartTestDriver.java	2011-05-06 10:54:07.000000000 +0530
-+++ b/src/org/jCharts/test/ChartTestDriver.java	2011-05-06 10:54:14.000000000 +0530
+--- a/src/org/jCharts/test/ChartTestDriver.java	2011-05-07 20:46:55.000000000 +0530
++++ b/src/org/jCharts/test/ChartTestDriver.java	2011-05-07 20:47:08.000000000 +0530
 @@ -182,7 +182,7 @@
  			}
  			else if( EXTENSION.equals( JPEG_LEGACY ) )

Modified: trunk/jcharts/debian/rules
===================================================================
--- trunk/jcharts/debian/rules	2011-05-06 08:12:54 UTC (rev 13660)
+++ trunk/jcharts/debian/rules	2011-05-07 16:51:29 UTC (rev 13661)
@@ -3,7 +3,7 @@
 include /usr/share/cdbs/1/rules/debhelper.mk
 include /usr/share/cdbs/1/class/ant.mk
 
-JAVA_HOME		:= /usr/lib/jvm/default-java
+JAVA_HOME		:= /usr/lib/jvm/java-6-openjdk
 DEB_ANT_BUILDFILE 	:= build/build.xml
 DEB_JARS		:= batik servlet-api-2.5
 ANT_ARGS		:= -Dbatik.classpath=/usr/share/java/batik.jar -Dant.build.javac.source=1.4
@@ -11,6 +11,7 @@
 
 clean::
 	rm -rf build/garbage
+	rm -rf build/javadocs
 	rm -f build/jCharts-$(DEB_UPSTREAM_VERSION).jar
 
 install/libjcharts-java::

More information about the pkg-java-commits mailing list