Author: drazzib-guest Date: 2009-08-09 15:38:49 +0000 (Sun, 09 Aug 2009) New Revision: 9853
Added: trunk/jasperreports/debian/ trunk/jasperreports/debian/README.source trunk/jasperreports/debian/TODO trunk/jasperreports/debian/changelog trunk/jasperreports/debian/compat trunk/jasperreports/debian/control trunk/jasperreports/debian/copyright trunk/jasperreports/debian/libjasperreports-java-doc.doc-base trunk/jasperreports/debian/patches/ trunk/jasperreports/debian/patches/01_dont_build_olap_and_jpa.diff trunk/jasperreports/debian/patches/02_use_debian_asm.diff trunk/jasperreports/debian/patches/03_use_pngencoder_from_jcommon.diff trunk/jasperreports/debian/patches/04_remove_setusenewgroovy.diff trunk/jasperreports/debian/patches/05_use_itext_2.diff trunk/jasperreports/debian/patches/06_configure_javaflow.diff trunk/jasperreports/debian/patches/series trunk/jasperreports/debian/rules trunk/jasperreports/debian/watch Log: [svn-inject] Applying Debian modifications to trunk Property changes on: trunk/jasperreports/debian ___________________________________________________________________ Added: mergeWithUpstream + 1 Added: trunk/jasperreports/debian/README.source =================================================================== --- trunk/jasperreports/debian/README.source (rev 0) +++ trunk/jasperreports/debian/README.source 2009-08-09 15:38:49 UTC (rev 9853) @@ -0,0 +1,9 @@ +Patch System +============ + +This package uses quilt to manage all modifications to the upstream +source. Changes are stored in the source package as diffs in +debian/patches and applied during the build. + +See /usr/share/doc/quilt/README.source for a detailed explanation. + Added: trunk/jasperreports/debian/TODO =================================================================== --- trunk/jasperreports/debian/TODO (rev 0) +++ trunk/jasperreports/debian/TODO 2009-08-09 15:38:49 UTC (rev 9853) @@ -0,0 +1,4 @@ +- Need mondarian package (not in debian yet) + Package olap module of JasperReports +- Check if PNGEncoder patch work fine +- Check if Batik patch work fine Added: trunk/jasperreports/debian/changelog =================================================================== --- trunk/jasperreports/debian/changelog (rev 0) +++ trunk/jasperreports/debian/changelog 2009-08-09 15:38:49 UTC (rev 9853) @@ -0,0 +1,5 @@ +jasperreports (2.0.5-1) UNRELEASED; urgency=low + + * Initial release. (Closes: #281346) + + -- Damien Raude-Morvan <[email protected]> Thu, 16 Jul 2009 14:13:17 +0200 Added: trunk/jasperreports/debian/compat =================================================================== --- trunk/jasperreports/debian/compat (rev 0) +++ trunk/jasperreports/debian/compat 2009-08-09 15:38:49 UTC (rev 9853) @@ -0,0 +1 @@ +5 Added: trunk/jasperreports/debian/control =================================================================== --- trunk/jasperreports/debian/control (rev 0) +++ trunk/jasperreports/debian/control 2009-08-09 15:38:49 UTC (rev 9853) @@ -0,0 +1,38 @@ +Source: jasperreports +Section: java +Priority: optional +Maintainer: Damien Raude-Morvan <[email protected]> +Build-Depends: cdbs, quilt, debhelper (>= 5), openjdk-6-jdk, ant +Build-Depends-Indep: ant-optional, antlr, libasm2-java, bsh, + libjfreechart-java, libjcommon-java, + libcommons-digester-java, libcommons-collections-java, libcommons-logging-java, + libcommons-beanutils-java, libjexcelapi-java, groovy, libjarjar-java, + libhibernate3-java, libjakarta-poi-java, libitext-java, glassfish-javaee, + libbatik-java (>= 1.7), libxml-commons-external-java, libjaxen-java, libxalan2-java, + libecj-java, libcommons-javaflow-java +Standards-Version: 3.8.2 +Vcs-Svn: http://svn.drazzib.com/debian-pkg/jasperreports/trunk +Vcs-Browser: http://svn.drazzib.com/wsvn/Debian-Pkg/jasperreports/trunk +Homepage: http://jasperforge.org/plugins/project/project_home.php?group_id=102 + +Package: libjasperreports-java +Architecture: all +Depends: ${misc:Depends}, openjdk-6-jre-headless | java5-runtime-headless +Description: Java reporting generator library + JasperReports is a Java reporting generator library. XML report templates + are used to generate ready to print documents using data from customizable data + sources, including JDBC. The output can be delivered to the screen, + printer, or stored in PDF, HTML, XLS, CSV, and XML format. + +Package: libjasperreports-java-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Suggests: libjasperreports-java +Description: Java reporting generator library - documentation + JasperReports is a Java reporting generator library. XML report templates + are used to generate ready to print documents using data from customizable data + sources, including JDBC. The output can be delivered to the screen, + printer, or stored in PDF, HTML, XLS, CSV, and XML format. + . + This package contains Javadoc API for JasperReports. Added: trunk/jasperreports/debian/copyright =================================================================== --- trunk/jasperreports/debian/copyright (rev 0) +++ trunk/jasperreports/debian/copyright 2009-08-09 15:38:49 UTC (rev 9853) @@ -0,0 +1,32 @@ +This package was debianized by Damien Raude-Morvan <[email protected]> on +Thu, 27 Aug 2008 20:59:38 +0200. + +It was downloaded from http://jasperforge.org/plugins/esp_frs/?group_id=102 + +Upstream Author: + JasperSoft Corporation. + +Copyright: + Copyright (C) 2001-2006 JasperSoft Corporation + +License: + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA. + +The full text of the LGPL 2.1 license can be found in +`/usr/share/common-licenses/LGPL-2.1' on Debian systems. + +The Debian packaging is Copyright 2008, Damien Raude-Morvan <[email protected]> and +is licensed under the LGPL 2.1, see `/usr/share/common-licenses/LGPL-2.1'. Added: trunk/jasperreports/debian/libjasperreports-java-doc.doc-base =================================================================== --- trunk/jasperreports/debian/libjasperreports-java-doc.doc-base (rev 0) +++ trunk/jasperreports/debian/libjasperreports-java-doc.doc-base 2009-08-09 15:38:49 UTC (rev 9853) @@ -0,0 +1,9 @@ +Document: libjasperreports-java-doc +Title: API Javadoc for JasperReports +Author: JasperReports developers +Abstract: This is the API Javadoc provided by the JasperReports library. +Section: Programming + +Format: HTML +Index: /usr/share/doc/libjasperreports-java-doc/api/index.html +Files: /usr/share/doc/libjasperreports-java-doc/api/* Added: trunk/jasperreports/debian/patches/01_dont_build_olap_and_jpa.diff =================================================================== --- trunk/jasperreports/debian/patches/01_dont_build_olap_and_jpa.diff (rev 0) +++ trunk/jasperreports/debian/patches/01_dont_build_olap_and_jpa.diff 2009-08-09 15:38:49 UTC (rev 9853) @@ -0,0 +1,18 @@ +Description: build.xml: exclude OLAP and JPA modules of JasperReports. +Fowarded: no +Origin: vendor +Author: Damien Raude-Morvan <[email protected]> +Last-Update: 2009-07-16 +--- a/build.xml ++++ b/build.xml +@@ -13,8 +13,8 @@ + </or> + </condition> + <javac destdir="./build/classes" debug="true" optimize="false" deprecation="true" target="1.4" source="1.4"> +- <exclude name="**/olap/**/*.java" unless="using.jdk.1.5"/> +- <exclude name="**/JRJpa*.java" unless="using.jdk.1.5"/> ++ <exclude name="**/olap/**/*.java"/> ++ <exclude name="**/JRJpa*.java"/> + <classpath> + <pathelement location="./build/classes"/> + <fileset dir="./lib"> Added: trunk/jasperreports/debian/patches/02_use_debian_asm.diff =================================================================== --- trunk/jasperreports/debian/patches/02_use_debian_asm.diff (rev 0) +++ trunk/jasperreports/debian/patches/02_use_debian_asm.diff 2009-08-09 15:38:49 UTC (rev 9853) @@ -0,0 +1,25 @@ +Description: Use Debian provided ASM2 instead of the upstream one in their groovy jar. +Fowarded: no +Origin: vendor +Author: Damien Raude-Morvan <[email protected]> +Last-Update: 2009-07-16 +--- a/src/net/sf/jasperreports/compilers/JRGroovyCompiler.java ++++ b/src/net/sf/jasperreports/compilers/JRGroovyCompiler.java +@@ -32,8 +32,8 @@ + */ + package net.sf.jasperreports.compilers; + +-import groovyjarjarasm.asm.ClassVisitor; +-import groovyjarjarasm.asm.ClassWriter; ++import org.objectweb.asm.ClassVisitor; ++import org.objectweb.asm.ClassWriter; + + import java.io.ByteArrayInputStream; + import java.io.File; +@@ -172,4 +172,4 @@ + } + + +-} +\ No newline at end of file ++} Added: trunk/jasperreports/debian/patches/03_use_pngencoder_from_jcommon.diff =================================================================== --- trunk/jasperreports/debian/patches/03_use_pngencoder_from_jcommon.diff (rev 0) +++ trunk/jasperreports/debian/patches/03_use_pngencoder_from_jcommon.diff 2009-08-09 15:38:49 UTC (rev 9853) @@ -0,0 +1,63 @@ +Description: + - Use ImageIO included JDK 1.4 for converting BI to PNG bytes array + - Strip try { } catch code as IOException is not throw anymore by JDK 1.4 +Fowarded: no +Origin: vendor +Author: Damien Raude-Morvan <[email protected]> +Last-Update: 2009-07-16 +--- a/src/net/sf/jasperreports/engine/util/JRDefaultImageEncoder.java ++++ b/src/net/sf/jasperreports/engine/util/JRDefaultImageEncoder.java +@@ -31,10 +31,11 @@ + import java.io.ByteArrayOutputStream; + import java.io.IOException; + ++import javax.imageio.ImageIO; ++ + import net.sf.jasperreports.engine.JRException; + import net.sf.jasperreports.engine.JRRenderable; + +-import com.keypoint.PngEncoderB; + import com.sun.image.codec.jpeg.JPEGCodec; + import com.sun.image.codec.jpeg.JPEGEncodeParam; + import com.sun.image.codec.jpeg.JPEGImageEncoder; +@@ -59,25 +60,26 @@ + { + case JRRenderable.IMAGE_TYPE_PNG : + { +- bytes = new PngEncoderB(bi).pngEncode(); ++ ByteArrayOutputStream baos = new ByteArrayOutputStream(); ++ ++ try { ++ ImageIO.write(bi, "png", baos); ++ } catch (IOException e) { ++ throw new JRException(e); ++ } ++ ++ bytes = baos.toByteArray(); + break; + } + case JRRenderable.IMAGE_TYPE_JPEG : + { + ByteArrayOutputStream baos = new ByteArrayOutputStream(); +- +- try +- { +- JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(baos); +- JPEGEncodeParam param = encoder.getDefaultJPEGEncodeParam(bi); +- param.setQuality(1f, true);//1f = JPG_QUALITY +- encoder.encode(bi, param); +- } +- catch (IOException e) +- { +- throw new JRException(e); +- } +- ++ ++ JPEGImageEncoder encoder = JPEGCodec.createJPEGEncoder(baos); ++ JPEGEncodeParam param = encoder.getDefaultJPEGEncodeParam(bi); ++ param.setQuality(1f, true);//1f = JPG_QUALITY ++ encoder.encode(bi, param); ++ + bytes = baos.toByteArray(); + break; + } Added: trunk/jasperreports/debian/patches/04_remove_setusenewgroovy.diff =================================================================== --- trunk/jasperreports/debian/patches/04_remove_setusenewgroovy.diff (rev 0) +++ trunk/jasperreports/debian/patches/04_remove_setusenewgroovy.diff 2009-08-09 15:38:49 UTC (rev 9853) @@ -0,0 +1,18 @@ +Description: setUseNewGroovy(boolean) doesn't exist anymore in Groovy 1.5 included + in Debian. +Fowarded: yes +Bug: http://jasperforge.org/tracker/index.php?func=detail&aid=2620&group_id=102&atid=612 +Origin: upstream, http://jasperforge.org/svn/repos/jasperreports/trunk/jasperreports/src/net/sf/jasperreports/compilers/JRGroovyCompiler.java +Author: Damien Raude-Morvan <[email protected]> +Last-Update: 2009-07-16 +--- a/src/net/sf/jasperreports/compilers/JRGroovyCompiler.java ++++ b/src/net/sf/jasperreports/compilers/JRGroovyCompiler.java +@@ -73,7 +73,7 @@ + protected String compileUnits(JRCompilationUnit[] units, String classpath, File tempDirFile) throws JRException + { + CompilerConfiguration config = new CompilerConfiguration(); +- config.setUseNewGroovy(true); ++ //config.setUseNewGroovy(true); + //config.setClasspath(classpath); + CompilationUnit unit = new CompilationUnit(config); + Added: trunk/jasperreports/debian/patches/05_use_itext_2.diff =================================================================== --- trunk/jasperreports/debian/patches/05_use_itext_2.diff (rev 0) +++ trunk/jasperreports/debian/patches/05_use_itext_2.diff 2009-08-09 15:38:49 UTC (rev 9853) @@ -0,0 +1,52 @@ +Description: Update JRPdfExporter to the new iText 2 API (methods renamed). +Forwarded: no +Origin: vendor +Author: Damien Raude-Morvan <[email protected]> +Last-Update: 2009-07-16 +--- a/src/net/sf/jasperreports/engine/export/JRPdfExporter.java ++++ b/src/net/sf/jasperreports/engine/export/JRPdfExporter.java +@@ -1279,8 +1279,8 @@ + + image.scaleToFit(availableImageWidth, availableImageHeight); + +- xoffset = (int)(xalignFactor * (availableImageWidth - image.plainWidth())); +- yoffset = (int)(yalignFactor * (availableImageHeight - image.plainHeight())); ++ xoffset = (int)(xalignFactor * (availableImageWidth - image.getPlainWidth())); ++ yoffset = (int)(yalignFactor * (availableImageHeight - image.getPlainHeight())); + + xoffset = (xoffset < 0 ? 0 : xoffset); + yoffset = (yoffset < 0 ? 0 : yoffset); +@@ -1293,8 +1293,8 @@ + { + chunk = new Chunk(image, 0, 0); + +- scaledWidth = image.scaledWidth(); +- scaledHeight = image.scaledHeight(); ++ scaledWidth = image.getScaledWidth(); ++ scaledHeight = image.getScaledHeight(); + } + } + else +@@ -1655,11 +1655,11 @@ + { + if (TextAttribute.SUPERSCRIPT_SUPER.equals(script)) + { +- chunk.setTextRise(font.leading(1f)/2); ++ chunk.setTextRise(font.getCalculatedLeading(1f)/2); + } + else if (script != null && TextAttribute.SUPERSCRIPT_SUB.equals(script)) + { +- chunk.setTextRise(-font.leading(1f)/2); ++ chunk.setTextRise(-font.getCalculatedLeading(1f)/2); + } + } + +@@ -1711,7 +1711,7 @@ + ); + + // check if FontFactory didn't find the font +- if (font.getBaseFont() == null && font.family() == Font.UNDEFINED) ++ if (font.getBaseFont() == null && font.getFamily() == Font.UNDEFINED) + { + font = null; + } Added: trunk/jasperreports/debian/patches/06_configure_javaflow.diff =================================================================== --- trunk/jasperreports/debian/patches/06_configure_javaflow.diff (rev 0) +++ trunk/jasperreports/debian/patches/06_configure_javaflow.diff 2009-08-09 15:38:49 UTC (rev 9853) @@ -0,0 +1,33 @@ +Description: build.xml: configure javaflow ant task (include missing elements from + upstream classpath). +Author: Damien Raude-Morvan <[email protected]> +Forwarded: not-needed +Origin: vendor +Last-Update: 2009-07-16 +--- a/build.xml ++++ b/build.xml +@@ -80,12 +80,24 @@ + </copy> + + <javaflow srcdir="./build/javaflow" dstdir="./build/javaflow" mode="bcel"> ++ <include name="net/sf/jasperreports/engine/JRStyle.class"/> ++ <include name="net/sf/jasperreports/engine/JRTemplateReference.class"/> ++ <include name="net/sf/jasperreports/engine/JRStyleSetter.class"/> ++ <include name="net/sf/jasperreports/engine/JRVirtualizer.class"/> ++ <include name="net/sf/jasperreports/engine/base/JRBasePrintPage.class"/> ++ <include name="net/sf/jasperreports/engine/base/JRVirtualPrintPage.class"/> ++ <include name="net/sf/jasperreports/engine/util/FormatFactory.class"/> + <include name="net/sf/jasperreports/engine/fill/JRBaseFiller.class"/> + <include name="net/sf/jasperreports/engine/fill/JRVerticalFiller.class"/> + <include name="net/sf/jasperreports/engine/fill/JRHorizontalFiller.class"/> + <include name="net/sf/jasperreports/engine/fill/JRFillSubreport.class"/> + <include name="net/sf/jasperreports/engine/fill/JRSubreportRunnable.class"/> + <include name="net/sf/jasperreports/engine/fill/JRContinuationSubreportRunner.class"/> ++ <include name="net/sf/jasperreports/engine/fill/JRFillBand.class"/> ++ <include name="net/sf/jasperreports/engine/fill/JRFillGroup.class"/> ++ <include name="net/sf/jasperreports/engine/fill/JRBaseFiller.class"/> ++ <include name="net/sf/jasperreports/engine/fill/JRFillReportTemplate.class"/> ++ <include name="net/sf/jasperreports/engine/fill/JREvaluationTime.class"/> + </javaflow> + + <mkdir dir="./dist"/> Added: trunk/jasperreports/debian/patches/series =================================================================== --- trunk/jasperreports/debian/patches/series (rev 0) +++ trunk/jasperreports/debian/patches/series 2009-08-09 15:38:49 UTC (rev 9853) @@ -0,0 +1,6 @@ +01_dont_build_olap_and_jpa.diff +02_use_debian_asm.diff +03_use_pngencoder_from_jcommon.diff +04_remove_setusenewgroovy.diff +05_use_itext_2.diff +06_configure_javaflow.diff Added: trunk/jasperreports/debian/rules =================================================================== --- trunk/jasperreports/debian/rules (rev 0) +++ trunk/jasperreports/debian/rules 2009-08-09 15:38:49 UTC (rev 9853) @@ -0,0 +1,45 @@ +#!/usr/bin/make -f + +include /usr/share/cdbs/1/rules/debhelper.mk +include /usr/share/cdbs/1/rules/patchsys-quilt.mk +include /usr/share/cdbs/1/class/ant.mk + +JAVA_HOME := /usr/lib/jvm/java-6-openjdk +ANT_HOME := /usr/share/ant + +DEB_JARS := ant-trax antlr asm2 bsh jfreechart jcommon \ + commons-digester commons-javaflow \ + commons-collections commons-logging commons-beanutils \ + jxl groovy jarjar hibernate3 jakarta-poi itext \ + glassfish-javaee batik-all xml-apis-ext jaxen xalan2 \ + eclipse-ecj + +DEB_ANT_BUILD_TARGET := jar docs +DEB_ANT_CLEAN_TARGET := clean + +API_DOCS := dist/javadoc/* +REF_DOCS := dist/quick.reference-*.html + +binary-post-install/libjasperreports-java:: + dh_install -plibjasperreports-java dist/jasperreports-$(DEB_UPSTREAM_VERSION).jar usr/share/java + dh_install -plibjasperreports-java dist/jasperreports-$(DEB_UPSTREAM_VERSION)-applet.jar usr/share/java + dh_install -plibjasperreports-java dist/jasperreports-$(DEB_UPSTREAM_VERSION)-javaflow.jar usr/share/java + dh_link -plibjasperreports-java usr/share/java/jasperreports-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jasperreports.jar + dh_link -plibjasperreports-java usr/share/java/jasperreports-$(DEB_UPSTREAM_VERSION)-applet.jar usr/share/java/jasperreports-applet.jar + dh_link -plibjasperreports-java usr/share/java/jasperreports-$(DEB_UPSTREAM_VERSION)-javaflow.jar usr/share/java/jasperreports-javaflow.jar + +binary-post-install/libjasperreports-java-doc:: + dh_install -plibjasperreports-java-doc $(API_DOCS) usr/share/doc/libjasperreports-java-doc/api + dh_install -plibjasperreports-java-doc $(REF_DOCS) usr/share/doc/libjasperreports-java-doc/ + +# Rename content directory to velocity-tools-X.Y in orig.tar.gz +get-orig-source: + uscan --force-download --rename + mkdir orig_tmp + (cd orig_tmp && \ + tar -xzf ../../${DEB_SOURCE_PACKAGE}_$(DEB_UPSTREAM_VERSION).orig.tar.gz && \ + find ${DEB_SOURCE_PACKAGE}-$(DEB_UPSTREAM_VERSION) -name "*.jar" -delete && \ + rm -rf ${DEB_SOURCE_PACKAGE}-$(DEB_UPSTREAM_VERSION)/build && \ + rm -rf ${DEB_SOURCE_PACKAGE}-$(DEB_UPSTREAM_VERSION)/dist && \ + tar -czf ../../${DEB_SOURCE_PACKAGE}_$(DEB_UPSTREAM_VERSION).orig.tar.gz ${DEB_SOURCE_PACKAGE}-$(DEB_UPSTREAM_VERSION)) + rm -rf orig_tmp Property changes on: trunk/jasperreports/debian/rules ___________________________________________________________________ Added: svn:executable + * Added: trunk/jasperreports/debian/watch =================================================================== --- trunk/jasperreports/debian/watch (rev 0) +++ trunk/jasperreports/debian/watch 2009-08-09 15:38:49 UTC (rev 9853) @@ -0,0 +1,2 @@ +version=3 +http://sf.net/jasperreports/jasperreports-(2.+)-project\.tar\.gz debian uupdate _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
