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

Emmanuel Bourg ebourg-guest at alioth.debian.org
Thu Jul 11 13:41:12 UTC 2013 

Author: ebourg-guest
Date: 2013-07-11 13:41:11 +0000 (Thu, 11 Jul 2013)
New Revision: 17014

Removed:
   trunk/jasperreports/debian/patches/13_disable_ooxml_support.diff
   trunk/jasperreports/debian/patches/15_poi.diff
Modified:
   trunk/jasperreports/debian/changelog
   trunk/jasperreports/debian/control
   trunk/jasperreports/debian/patches/series
   trunk/jasperreports/debian/rules
Log:
Enabled OOXML support



Modified: trunk/jasperreports/debian/changelog
===================================================================
--- trunk/jasperreports/debian/changelog	2013-07-11 13:19:55 UTC (rev 17013)
+++ trunk/jasperreports/debian/changelog	2013-07-11 13:41:11 UTC (rev 17014)
@@ -1,7 +1,8 @@
-jasperreports (4.1.3+dfsg-2) UNRELEASED; urgency=low
+jasperreports (4.1.3+dfsg-2) unstable; urgency=low
 
   * Team upload.
   * Added a patch to compile with ecj 3.8 (addresses part of #713169)
+  * Enabled OOXML support
   * debian/control
     - Updated Standards-Version to 3.9.4 (no changes)
     - Use canonical URLs for the Vcs-* fields
@@ -9,7 +10,7 @@
     - Updated the format URI
     - Removed the duplicate Copyright field
 
- -- Emmanuel Bourg <ebourg at apache.org>  Thu, 11 Jul 2013 15:01:59 +0200
+ -- Emmanuel Bourg <ebourg at apache.org>  Thu, 11 Jul 2013 15:39:50 +0200
 
 jasperreports (4.1.3+dfsg-1) unstable; urgency=low
 

Modified: trunk/jasperreports/debian/control
===================================================================
--- trunk/jasperreports/debian/control	2013-07-11 13:19:55 UTC (rev 17013)
+++ trunk/jasperreports/debian/control	2013-07-11 13:41:11 UTC (rev 17014)
@@ -9,7 +9,7 @@
   libcommons-digester-java, libcommons-collections3-java, libcommons-logging-java,
   libcommons-beanutils-java, libcommons-codec-java, libcommons-javaflow-java,
   libecj-java, libxalan2-java, libjaxen-java, libxml-commons-external-java,
-  libjexcelapi-java, libapache-poi-java (>= 3.2), libitext-java,
+  libjexcelapi-java, libapache-poi-java (>= 3.9), 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,
@@ -25,7 +25,7 @@
   libcommons-digester-java, libcommons-collections3-java, libcommons-logging-java,
   libcommons-beanutils-java, libcommons-codec-java, libecj-java, libxalan2-java,
   libjcommon-java
-Recommends: libjexcelapi-java, libapache-poi-java (>= 3.2), libitext-java,
+Recommends: libjexcelapi-java, libapache-poi-java (>= 3.9), 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,

Deleted: trunk/jasperreports/debian/patches/13_disable_ooxml_support.diff
===================================================================
--- trunk/jasperreports/debian/patches/13_disable_ooxml_support.diff	2013-07-11 13:19:55 UTC (rev 17013)
+++ trunk/jasperreports/debian/patches/13_disable_ooxml_support.diff	2013-07-11 13:41:11 UTC (rev 17014)
@@ -1,65 +0,0 @@
-Description: Apache POI's Debian package doesn't yet provide support for
- OOXML formats, so disable JR support for it.
-Author: Damien Raude-Morvan <drazzib at debian.org>
-Last-Update: 2011-09-21
-Forwarded: not-needed
-Index: b/build.xml
-===================================================================
---- a/build.xml
-+++ b/build.xml
-@@ -9,6 +9,10 @@
- 		<javac destdir="./build/classes" debug="true" optimize="false" deprecation="false" target="1.5" source="1.5" encoding="ISO-8859-1">
-            <exclude name="**/barcode4j/*.java"/>
-            <exclude name="**/barbecue/*.java"/>
-+           <exclude name="**/JRXlsxDataSource.java"/>
-+           <exclude name="**/XlsxDataAdapterService.java"/>
-+           <exclude name="**/JRXlsxQueryExecuter.java"/>
-+           <exclude name="**/JRXlsxQueryExecuterFactory"/>
- 			<classpath>
- 				<pathelement location="./build/classes"/>
- 				<fileset dir="./lib">
-Index: b/src/net/sf/jasperreports/data/DefaultDataAdapterServiceFactory.java
-===================================================================
---- a/src/net/sf/jasperreports/data/DefaultDataAdapterServiceFactory.java
-+++ b/src/net/sf/jasperreports/data/DefaultDataAdapterServiceFactory.java
-@@ -41,8 +41,6 @@
- import net.sf.jasperreports.data.qe.QueryExecuterDataAdapterService;
- import net.sf.jasperreports.data.xls.XlsDataAdapter;
- import net.sf.jasperreports.data.xls.XlsDataAdapterService;
--import net.sf.jasperreports.data.xlsx.XlsxDataAdapter;
--import net.sf.jasperreports.data.xlsx.XlsxDataAdapterService;
- import net.sf.jasperreports.data.xml.RemoteXmlDataAdapter;
- import net.sf.jasperreports.data.xml.RemoteXmlDataAdapterService;
- import net.sf.jasperreports.data.xml.XmlDataAdapter;
-@@ -112,10 +110,6 @@
- 		{
- 			dataAdapterService = new XlsDataAdapterService((XlsDataAdapter)dataAdapter);
- 		}
--		else if (dataAdapter instanceof XlsxDataAdapter)
--		{
--			dataAdapterService = new XlsxDataAdapterService((XlsxDataAdapter)dataAdapter);
--		}
- 		else if (dataAdapter instanceof RemoteXmlDataAdapter)
- 		{
- 			dataAdapterService = new RemoteXmlDataAdapterService((RemoteXmlDataAdapter)dataAdapter);
-Index: b/src/net/sf/jasperreports/engine/data/JRXlsxDataSource.java
-===================================================================
---- a/src/net/sf/jasperreports/engine/data/JRXlsxDataSource.java
-+++ b/src/net/sf/jasperreports/engine/data/JRXlsxDataSource.java
-@@ -47,7 +47,6 @@
- import org.apache.poi.ss.usermodel.Row;
- import org.apache.poi.ss.usermodel.Sheet;
- import org.apache.poi.ss.usermodel.Workbook;
--import org.apache.poi.xssf.usermodel.XSSFWorkbook;
- 
- 
- /**
-@@ -95,7 +94,7 @@
- 		try
- 		{
- 			this.inputStream = is;
--			this.workbook = new XSSFWorkbook(is);
-+			this.workbook = null; //new XSSFWorkbook(is);
- 			this.closeWorkbook = true;
- 			this.closeInputStream = false;
- 		}

Deleted: trunk/jasperreports/debian/patches/15_poi.diff
===================================================================
--- trunk/jasperreports/debian/patches/15_poi.diff	2013-07-11 13:19:55 UTC (rev 17013)
+++ trunk/jasperreports/debian/patches/15_poi.diff	2013-07-11 13:41:11 UTC (rev 17014)
@@ -1,17 +0,0 @@
-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	2013-07-11 13:19:55 UTC (rev 17013)
+++ trunk/jasperreports/debian/patches/series	2013-07-11 13:41:11 UTC (rev 17014)
@@ -6,7 +6,5 @@
 09_use_commons_codec.diff
 10_disable_fonts.diff
 12_samples.diff
-13_disable_ooxml_support.diff
 14_velocity.diff
-15_poi.diff
 16_eclipse_compiler_updater.diff

Modified: trunk/jasperreports/debian/rules
===================================================================
--- trunk/jasperreports/debian/rules	2013-07-11 13:19:55 UTC (rev 17013)
+++ trunk/jasperreports/debian/rules	2013-07-11 13:41:11 UTC (rev 17014)
@@ -11,7 +11,7 @@
             commons-digester commons-collections3 commons-logging \
             commons-beanutils commons-codec commons-javaflow \
             eclipse-ecj xalan2 jaxen xml-apis-ext \
-            jxl poi itext velocity castor-core castor-xml \
+            jxl poi poi-ooxml itext velocity castor-core castor-xml \
             batik-all jfreechart hibernate3 \
             glassfish-javaee mondrian olap4j antlr js \
             jackson-mapper jackson-core

More information about the pkg-java-commits mailing list