[pkg-java] r15325 - in trunk/jasperreports/debian: . patches

Damien Raude-Morvan drazzib at alioth.debian.org
Tue Nov 1 23:09:20 UTC 2011


Author: drazzib
Date: 2011-11-01 23:09:20 +0000 (Tue, 01 Nov 2011)
New Revision: 15325

Added:
   trunk/jasperreports/debian/patches/15_poi.diff
Modified:
   trunk/jasperreports/debian/changelog
   trunk/jasperreports/debian/control
   trunk/jasperreports/debian/patches/06_configure_javaflow.diff
   trunk/jasperreports/debian/patches/08_no_maxmemory_for_javadoc.diff
   trunk/jasperreports/debian/patches/09_use_commons_codec.diff
   trunk/jasperreports/debian/patches/10_disable_fonts.diff
   trunk/jasperreports/debian/patches/12_samples.diff
   trunk/jasperreports/debian/patches/14_velocity.diff
   trunk/jasperreports/debian/patches/series
   trunk/jasperreports/debian/rules
Log:
New upstream release.

Modified: trunk/jasperreports/debian/changelog
===================================================================
--- trunk/jasperreports/debian/changelog	2011-11-01 23:05:20 UTC (rev 15324)
+++ trunk/jasperreports/debian/changelog	2011-11-01 23:09:20 UTC (rev 15325)
@@ -1,3 +1,9 @@
+jasperreports (4.1.3+dfsg-1) unstable; urgency=low
+
+  * New upstream release.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 01 Nov 2011 23:32:32 +0100
+
 jasperreports (4.1.2+dfsg-1) unstable; urgency=low
 
   * New upstream release:

Modified: trunk/jasperreports/debian/control
===================================================================
--- trunk/jasperreports/debian/control	2011-11-01 23:05:20 UTC (rev 15324)
+++ trunk/jasperreports/debian/control	2011-11-01 23:09:20 UTC (rev 15325)
@@ -12,7 +12,8 @@
   libjexcelapi-java, libapache-poi-java (>= 3.2), libitext-java,
   libbatik-java (>= 1.7), libjfreechart-java, libhibernate3-java,
   glassfish-javaee, maven-repo-helper, libmondrian-java, libolap4j-java,
-  libantlr-java, librhino-java, velocity, libcastor-core-java, libcastor-xml-java
+  libantlr-java, librhino-java, velocity, libcastor-core-java, libcastor-xml-java,
+  libjackson-json-java
 Standards-Version: 3.9.2
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jasperreports/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jasperreports/
@@ -27,7 +28,8 @@
 Recommends: libjexcelapi-java, libapache-poi-java (>= 3.2), libitext-java,
   libbatik-java (>= 1.7), libjfreechart-java, libhibernate3-java, libcastor-core-java, libcastor-xml-java
 Suggests: bsh, libasm2-java, groovy, libmondrian-java, libolap4j-java,
-  libspring-core-java, libspring-beans-java, libantlr-java, velocity
+  libspring-core-java, libspring-beans-java, libantlr-java, velocity,
+  libjackson-json-java
 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

Modified: trunk/jasperreports/debian/patches/06_configure_javaflow.diff
===================================================================
--- trunk/jasperreports/debian/patches/06_configure_javaflow.diff	2011-11-01 23:05:20 UTC (rev 15324)
+++ trunk/jasperreports/debian/patches/06_configure_javaflow.diff	2011-11-01 23:09:20 UTC (rev 15325)
@@ -7,7 +7,7 @@
 ===================================================================
 --- a/build.xml
 +++ b/build.xml
-@@ -75,12 +75,25 @@
+@@ -76,12 +76,25 @@
  		</replace>
  
  		<javaflow srcdir="./build/javaflow" dstdir="./build/javaflow" mode="bcel">

Modified: trunk/jasperreports/debian/patches/08_no_maxmemory_for_javadoc.diff
===================================================================
--- trunk/jasperreports/debian/patches/08_no_maxmemory_for_javadoc.diff	2011-11-01 23:05:20 UTC (rev 15324)
+++ trunk/jasperreports/debian/patches/08_no_maxmemory_for_javadoc.diff	2011-11-01 23:09:20 UTC (rev 15325)
@@ -6,7 +6,7 @@
 ===================================================================
 --- a/build.xml
 +++ b/build.xml
-@@ -349,7 +349,6 @@
+@@ -352,7 +352,6 @@
  				use="true"
  				windowtitle="JasperReports ${version} API"
  				excludepackagenames="org.w3c.tools.codec"

Modified: trunk/jasperreports/debian/patches/09_use_commons_codec.diff
===================================================================
--- trunk/jasperreports/debian/patches/09_use_commons_codec.diff	2011-11-01 23:05:20 UTC (rev 15324)
+++ trunk/jasperreports/debian/patches/09_use_commons_codec.diff	2011-11-01 23:09:20 UTC (rev 15325)
@@ -7,16 +7,16 @@
 ===================================================================
 --- a/src/net/sf/jasperreports/engine/export/JRXmlExporter.java
 +++ b/src/net/sf/jasperreports/engine/export/JRXmlExporter.java
-@@ -89,7 +89,7 @@
- import net.sf.jasperreports.engine.util.JRXmlWriteHelper;
- import net.sf.jasperreports.engine.xml.JRXmlConstants;
+@@ -93,7 +93,7 @@
  
+ import org.apache.commons.logging.Log;
+ import org.apache.commons.logging.LogFactory;
 -import org.w3c.tools.codec.Base64Encoder;
 +import org.apache.commons.codec.binary.Base64;
  
  
  /**
-@@ -807,13 +807,8 @@
+@@ -825,13 +825,8 @@
  			{
  				try
  				{
@@ -47,7 +47,7 @@
  
  
  /**
-@@ -459,12 +457,8 @@
+@@ -469,12 +467,8 @@
  		{
  			try
  			{
@@ -62,7 +62,7 @@
  				ObjectInputStream objectIn = new ObjectInputStream(bytesIn);
  				return objectIn.readObject();
  			}
-@@ -476,10 +470,6 @@
+@@ -486,10 +480,6 @@
  			{
  				throw new JRRuntimeException(e);
  			}
@@ -73,7 +73,7 @@
  		}
  
  		public String serialize(Object value)
-@@ -490,14 +480,9 @@
+@@ -500,14 +490,9 @@
  				ObjectOutputStream objectOut = new ObjectOutputStream(bytesOut);
  				objectOut.writeObject(value);
  				objectOut.close();

Modified: trunk/jasperreports/debian/patches/10_disable_fonts.diff
===================================================================
--- trunk/jasperreports/debian/patches/10_disable_fonts.diff	2011-11-01 23:05:20 UTC (rev 15324)
+++ trunk/jasperreports/debian/patches/10_disable_fonts.diff	2011-11-01 23:09:20 UTC (rev 15325)
@@ -6,7 +6,7 @@
 ===================================================================
 --- a/build.xml
 +++ b/build.xml
-@@ -45,7 +45,7 @@
+@@ -46,7 +46,7 @@
  		</antlr>
  	</target>
  

Modified: trunk/jasperreports/debian/patches/12_samples.diff
===================================================================
--- trunk/jasperreports/debian/patches/12_samples.diff	2011-11-01 23:05:20 UTC (rev 15324)
+++ trunk/jasperreports/debian/patches/12_samples.diff	2011-11-01 23:09:20 UTC (rev 15325)
@@ -6,7 +6,7 @@
 ===================================================================
 --- a/build.xml
 +++ b/build.xml
-@@ -457,6 +457,6 @@
+@@ -460,6 +460,6 @@
  		</copy>
  	</target>
  	

Modified: trunk/jasperreports/debian/patches/14_velocity.diff
===================================================================
--- trunk/jasperreports/debian/patches/14_velocity.diff	2011-11-01 23:05:20 UTC (rev 15324)
+++ trunk/jasperreports/debian/patches/14_velocity.diff	2011-11-01 23:09:20 UTC (rev 15325)
@@ -2,54 +2,6 @@
 Author: Damien Raude-Morvan <drazzib at debian.org>
 Last-Update: 2011-09-21
 Forwarded: no
-Index: b/src/net/sf/jasperreports/components/BaseElementHtmlHandler.java
-===================================================================
---- a/src/net/sf/jasperreports/components/BaseElementHtmlHandler.java
-+++ b/src/net/sf/jasperreports/components/BaseElementHtmlHandler.java
-@@ -37,9 +37,13 @@
- 	
- 	static {
- 		velocityEngine = new VelocityEngine();
-+		try {
- 		velocityEngine.setProperty("file.resource.loader.class", "org.apache.velocity.runtime.resource.loader.ClasspathResourceLoader");
- 		velocityEngine.setProperty("file.resource.loader.cache", "true");
- 		velocityEngine.init();
-+		} catch (java.lang.Exception e) {
-+			e.printStackTrace();
-+		}
- 	}
- 	
- 	protected VelocityEngine getVelocityEngine() {
-Index: b/src/net/sf/jasperreports/components/sort/SortElementHtmlHandler.java
-===================================================================
---- a/src/net/sf/jasperreports/components/sort/SortElementHtmlHandler.java
-+++ b/src/net/sf/jasperreports/components/sort/SortElementHtmlHandler.java
-@@ -75,7 +75,12 @@
- 			String sortDatasetName = element.getPropertiesMap().getProperty(SortElement.PROPERTY_DATASET_RUN);
- 			String isFilterable = element.getPropertiesMap().getProperty(SortElement.PROPERTY_IS_FILTERABLE);
- 			
--			Template template = getVelocityEngine().getTemplate(SortElementHtmlHandler.SORT_ELEMENT_HTML_TEMPLATE);
-+			Template template = null;
-+			try {
-+                template = getVelocityEngine().getTemplate(SortElementHtmlHandler.SORT_ELEMENT_HTML_TEMPLATE);
-+			} catch (java.lang.Exception e) {
-+				e.printStackTrace();
-+			}
- 			
- 			String appContextPath = (String)reportContext.getParameterValue("net.sf.jasperreports.web.app.context.path");//FIXMEJIVE define constant
- 			
-@@ -129,7 +134,11 @@
- 			}
- 			
- 			StringWriter writer = new StringWriter(128);
-+			try {
- 			template.merge(velocityContext, writer);
-+			} catch (java.io.IOException e) {
-+				e.printStackTrace();
-+			}
- 			writer.flush();
- 			try {
- 				writer.close();
 Index: b/src/net/sf/jasperreports/web/util/VelocityUtil.java
 ===================================================================
 --- a/src/net/sf/jasperreports/web/util/VelocityUtil.java

Added: trunk/jasperreports/debian/patches/15_poi.diff
===================================================================
--- trunk/jasperreports/debian/patches/15_poi.diff	                        (rev 0)
+++ trunk/jasperreports/debian/patches/15_poi.diff	2011-11-01 23:09:20 UTC (rev 15325)
@@ -0,0 +1,17 @@
+Description: Disable some call to POI code (Debian has an old version).
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2011-11-02
+Forwarded: not-needed
+Index: b/src/net/sf/jasperreports/engine/export/JRXlsExporter.java
+===================================================================
+--- a/src/net/sf/jasperreports/engine/export/JRXlsExporter.java
++++ b/src/net/sf/jasperreports/engine/export/JRXlsExporter.java
+@@ -1799,7 +1799,7 @@
+ 	@Override
+ 	protected void setAutoFilter(String autoFilterRange)
+ 	{
+-		sheet.setAutoFilter(CellRangeAddress.valueOf(autoFilterRange));
++		//sheet.setAutoFilter(CellRangeAddress.valueOf(autoFilterRange));
+ 	}
+ 
+ 

Modified: trunk/jasperreports/debian/patches/series
===================================================================
--- trunk/jasperreports/debian/patches/series	2011-11-01 23:05:20 UTC (rev 15324)
+++ trunk/jasperreports/debian/patches/series	2011-11-01 23:09:20 UTC (rev 15325)
@@ -8,3 +8,4 @@
 12_samples.diff
 13_disable_ooxml_support.diff
 14_velocity.diff
+15_poi.diff

Modified: trunk/jasperreports/debian/rules
===================================================================
--- trunk/jasperreports/debian/rules	2011-11-01 23:05:20 UTC (rev 15324)
+++ trunk/jasperreports/debian/rules	2011-11-01 23:09:20 UTC (rev 15325)
@@ -13,7 +13,8 @@
             eclipse-ecj xalan2 jaxen xml-apis-ext \
             jxl poi itext velocity castor-core castor-xml \
             batik-all jfreechart hibernate3 \
-            glassfish-javaee mondrian olap4j antlr js
+            glassfish-javaee mondrian olap4j antlr js \
+            jackson-mapper jackson-core
 
 DEB_ANT_BUILD_TARGET := jar docs
 DEB_ANT_CLEAN_TARGET := clean




More information about the pkg-java-commits mailing list