This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository jcharts.
commit 7158c987afdf55c64dc289bddef0cde0598e8779
Author: Onkar Shinde <onkarshi...@ubuntu.com>
Date: Fri May 6 05:35:33 2011 +0000
Prepared jcharts 0.7.5-2
---
debian/changelog | 21 +++++++
debian/control | 19 +++++-
debian/libjcharts-java-doc.install | 1 +
debian/patches/01_remove_old_functionality.diff | 84 +++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 9 ++-
debian/source/format | 1 +
7 files changed, 128 insertions(+), 8 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 24baf49..ad130ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,24 @@
+jcharts (0.7.5-2) unstable; urgency=low
+
+ * debian/patches/01_remove_old_functionality.diff
+ - 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
+ 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.
+ * debian/libjcharts-java-doc.install
+ - Install API documentation at appropriate place.
+ * Convert package to source format 3.0.
+
+ -- Onkar Shinde <onkarshi...@ubuntu.com> Fri, 06 May 2011 10:27:01 +0530
+
jcharts (0.7.5-1) unstable; urgency=low
* Merge from Ubuntu. (Closes: #522213)
diff --git a/debian/control b/debian/control
index dce4528..d4875b9 100644
--- a/debian/control
+++ b/debian/control
@@ -4,18 +4,31 @@ 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: openjdk-6-jdk, libbatik-java, libservlet2.4-java
-Standards-Version: 3.8.1
+Build-Depends-Indep: default-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
Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/jcharts
Package: libjcharts-java
Architecture: all
-Depends: openjdk-6-jre | sun-java5-jre | sun-java6-jre, libbatik-java,
${misc:Depends}
+Depends: default-jre | java2-runtime, libbatik-java, ${misc:Depends}
+Suggests: libjcharts-java-doc (= ${binary:Version})
Description: java based charts library
jCharts is a 100% Java based charting utility that outputs a variety of
charts. This package has been designed from the ground up by volunteers for
displaying charts via Servlets, JSP's, and Swing apps.
.
This package contains the library.
+
+Package: libjcharts-java-doc
+Architecture: all
+Section: doc
+Depends: ${misc:Depends}, 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
+ charts. This package has been designed from the ground up by volunteers for
+ displaying charts via Servlets, JSP's, and Swing apps.
+ .
+ This package contains the API documentation.
diff --git a/debian/libjcharts-java-doc.install
b/debian/libjcharts-java-doc.install
new file mode 100644
index 0000000..078942a
--- /dev/null
+++ b/debian/libjcharts-java-doc.install
@@ -0,0 +1 @@
+build/javadocs/* usr/share/doc/libjcharts-java/api/
diff --git a/debian/patches/01_remove_old_functionality.diff
b/debian/patches/01_remove_old_functionality.diff
new file mode 100644
index 0000000..aca6c90
--- /dev/null
+++ b/debian/patches/01_remove_old_functionality.diff
@@ -0,0 +1,84 @@
+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
+@@ -47,7 +47,9 @@
+
+
<!--===============================================================================-->
+ <target name="compile" depends="prepare">
+- <javac
classpath="${batik.classpath};${environment.J2EE_HOME}/lib/j2ee.jar"
srcdir="../${dir.src}" destdir="${dir.build}" />
++ <javac sourcepath=""
classpath="${batik.classpath};${environment.J2EE_HOME}/lib/j2ee.jar"
srcdir="../${dir.src}" destdir="${dir.build}">
++ <exclude name="**/encoders/JPEGEncoder13.java" />
++ </javac>
+ </target>
+
+
+@@ -92,8 +94,8 @@
+ <target name="javadocs">
+ <delete dir="${dir.javadocs}" />
+ <mkdir dir="${dir.javadocs}" />
+- <javadoc sourcepath="../${dir.src}"
+-
classpath="${batik.classpath};${environment.J2EE_HOME}/lib/j2ee.jar"
++ <javadoc sourcepath=""
++
classpath="${batik.classpath};/usr/share/java/servlet-api-2.5.jar"
+ destdir="${dir.javadocs}"
+ packagenames="org.jCharts.*"
+ excludepackagenames="javax.*"
+@@ -102,6 +104,11 @@
+ version="true"
+
windowtitle="${project.name}-${project.version} API"
+
doctitle="${project.name}-${project.version}">
++ <fileset dir="../${dir.src}">
++ <exclude name="**/JPEGEncoder13.java" />
++ </fileset>
++ <link offline="true"
packagelistLoc="/usr/share/doc/default-jdk-doc/api"
href="/usr/share/doc/default-jdk-doc/api/" />
++ <link offline="true"
packagelistLoc="/usr/share/doc/libservlet2.5-java/api"
href="/usr/share/doc/libservlet2.5-java/api/" />
+ </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
+@@ -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.
+ *
+- * We cannot overload encode(...) as it will create a compile time
dependency with the
+- * HttpServletResponse Class which will require the J2EE libraries.
+- *
+- * @param chart
+- * @param quality float value from 0.0f(worst image quality) -
1.0f(best image quality)
+- * @param httpServletResponse
+- * @throws ChartDataException
+- * @throws PropertyException
+- * @throws IOException
+- * @since 0.7
+-
******************************************************************************************/
+- public static final void encodeJPEG13( Chart chart,
+-
float quality,
+-
HttpServletResponse httpServletResponse )
throws ChartDataException, PropertyException, IOException
+- {
+- httpServletResponse.setContentType( JPEG_MIME_TYPE );
+- JPEGEncoder13.encode( chart, quality,
httpServletResponse.getOutputStream() );
+- }
+-
+-
+-
/******************************************************************************************
+- * 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.
+- *
+ * @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
+@@ -182,7 +182,7 @@
+ }
+ else if( EXTENSION.equals( JPEG_LEGACY ) )
+ {
+- JPEGEncoder13.encode( chart, 1.0f,
fileOutputStream );
++ JPEGEncoder.encode( chart, 1.0f,
fileOutputStream );
+ }
+ else
+ {
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..5bbb64b
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+01_remove_old_functionality.diff
diff --git a/debian/rules b/debian/rules
index 186e457..defa851 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,13 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/ant.mk
-JAVA_HOME_DIRS := /usr/lib/jvm/java-6-openjdk
+JAVA_HOME := /usr/lib/jvm/default-java
DEB_ANT_BUILDFILE := build/build.xml
-DEB_JARS := batik servlet-api
-ANT_OPTS := -Dant.build.javac.source=1.4
-DEB_ANT_BUILD_TARGET := jar
+DEB_JARS := batik servlet-api-2.5
+ANT_ARGS := -Dbatik.classpath=/usr/share/java/batik.jar
-Dant.build.javac.source=1.4
+DEB_ANT_BUILD_TARGET := jar javadocs
clean::
rm -rf build/garbage
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
--
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
