This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository jcharts.
commit ccbe815c5c9242421db7ed4f4d5f0296220ee9f9
Author: Onkar Shinde <onkarshi...@ubuntu.com>
Date: Sat May 7 16:51:29 2011 +0000
Fixed review comments
---
debian/changelog | 7 +++---
debian/control | 5 +++--
debian/libjcharts-java.lintian-overrides | 2 ++
debian/patches/01_remove_old_functionality.diff | 29 ++++++++++++++++++-------
debian/rules | 3 ++-
5 files changed, 32 insertions(+), 14 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ad130ac..38a3acd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,17 +4,18 @@ jcharts (0.7.5-2) unstable; urgency=low
- 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 <onkarshi...@ubuntu.com> Fri, 06 May 2011 10:27:01 +0530
diff --git a/debian/control b/debian/control
index d4875b9..deed734 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Java Maintainers
<pkg-java-maintainers@lists.alioth.debian.org>
Uploaders: Onkar Shinde <onkarshi...@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 @@ Description: java based charts library
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
diff --git a/debian/libjcharts-java.lintian-overrides
b/debian/libjcharts-java.lintian-overrides
new file mode 100644
index 0000000..a9b98aa
--- /dev/null
+++ b/debian/libjcharts-java.lintian-overrides
@@ -0,0 +1,2 @@
+# The library uses AWT APIs so a dependency on JRE is needed.
+libjcharts-java binary: needless-dependency-on-jre
diff --git a/debian/patches/01_remove_old_functionality.diff
b/debian/patches/01_remove_old_functionality.diff
index aca6c90..788849d 100644
--- a/debian/patches/01_remove_old_functionality.diff
+++ b/debian/patches/01_remove_old_functionality.diff
@@ -2,8 +2,8 @@ Description: Do not build JPEGEncoder13.java which uses Sun
proprietary APIs
and is superceeded by JPEGEncoder.java. Patched other source files
accordingly.
Forwarded: not-needed
Author: Onkar Shinde <onshi...@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 @@ Author: Onkar Shinde <onshi...@ubuntu.com>
</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 @@ Author: Onkar Shinde <onshi...@ubuntu.com>
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 @@ Author: Onkar Shinde <onshi...@ubuntu.com>
</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 @@ Author: Onkar Shinde <onshi...@ubuntu.com>
* @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 ) )
diff --git a/debian/rules b/debian/rules
index defa851..cc55cb6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -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 @@ DEB_ANT_BUILD_TARGET := jar javadocs
clean::
rm -rf build/garbage
+ rm -rf build/javadocs
rm -f build/jCharts-$(DEB_UPSTREAM_VERSION).jar
install/libjcharts-java::
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/jcharts.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
