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

[Damien Raude-Morvan]

Author: drazzib
Date: 2010-07-27 13:40:08 +0000 (Tue, 27 Jul 2010)
New Revision: 12822

Modified:
   trunk/jasperreports/debian/changelog
   trunk/jasperreports/debian/control
   trunk/jasperreports/debian/patches/07_exclude_barcode4j_and_barbecue.diff
Log:
* New upstream release:
  - Refresh 07_exclude_barcode4j_and_barbecue.diff patch
* Bump Standards-Version to 3.9.1: no changes needed.
* Drop Depends on JRE: not requested anymore by new Java Policy.

Modified: trunk/jasperreports/debian/changelog
===================================================================
--- trunk/jasperreports/debian/changelog	2010-07-27 12:21:53 UTC (rev 12821)
+++ trunk/jasperreports/debian/changelog	2010-07-27 13:40:08 UTC (rev 12822)
@@ -1,3 +1,12 @@
+jasperreports (3.7.4+dfsg-1) unstable; urgency=low
+
+  * New upstream release:
+    - Refresh 07_exclude_barcode4j_and_barbecue.diff patch
+  * Bump Standards-Version to 3.9.1: no changes needed.
+  * Drop Depends on JRE: not requested anymore by new Java Policy.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 27 Jul 2010 15:32:56 +0200
+
 jasperreports (3.7.3+dfsg-1) unstable; urgency=low
 
   * New upstream release:

Modified: trunk/jasperreports/debian/control
===================================================================
--- trunk/jasperreports/debian/control	2010-07-27 12:21:53 UTC (rev 12821)
+++ trunk/jasperreports/debian/control	2010-07-27 13:40:08 UTC (rev 12822)
@@ -13,14 +13,14 @@
   libbatik-java (>= 1.7), libjfreechart-java, libhibernate3-java,
   glassfish-javaee, maven-repo-helper, libmondrian-java, libolap4j-java,
   libantlr-java, rhino
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
 Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jasperreports/
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jasperreports/
 Homepage: http://jasperforge.org/jasperreports
 
 Package: libjasperreports-java
 Architecture: all
-Depends: ${misc:Depends}, default-jre-headless | java5-runtime-headless,
+Depends: ${misc:Depends},
   libcommons-digester-java, libcommons-collections3-java, libcommons-logging-java,
   libcommons-beanutils-java, libcommons-codec-java, libecj-java, libxalan2-java,
   libjcommon-java

Modified: trunk/jasperreports/debian/patches/07_exclude_barcode4j_and_barbecue.diff
===================================================================
--- trunk/jasperreports/debian/patches/07_exclude_barcode4j_and_barbecue.diff	2010-07-27 12:21:53 UTC (rev 12821)
+++ trunk/jasperreports/debian/patches/07_exclude_barcode4j_and_barbecue.diff	2010-07-27 13:40:08 UTC (rev 12822)
@@ -21,7 +21,7 @@
  import net.sf.jasperreports.components.list.FillListFactory;
  import net.sf.jasperreports.components.list.ListComponent;
  import net.sf.jasperreports.components.list.ListComponentCompiler;
-@@ -107,23 +101,6 @@
+@@ -111,23 +105,6 @@
  		tableManager.setComponentFillFactory(new FillTableFactory());
  		componentManagers.put(TABLE_COMPONENT_NAME, tableManager);
  		
@@ -42,15 +42,15 @@
 -			componentManagers.put(BARCODE4J_COMPONENT_NAMES[i], barcode4jManager);
 -		}
 -		
- 		bundle.setComponentManagers(componentManagers);
- 		
- 		REGISTRY = new ExtensionsRegistry()
+ 		DefaultComponentManager spiderChartManager = new DefaultComponentManager();
+ 		spiderChartManager.setDesignConverter(new SpiderChartDesignConverter());
+ 		spiderChartManager.setComponentCompiler(new SpiderChartCompiler());
 --- a/src/net/sf/jasperreports/components/ComponentsXmlHandler.java
 +++ b/src/net/sf/jasperreports/components/ComponentsXmlHandler.java
-@@ -26,24 +26,6 @@
- import java.io.IOException;
- import java.util.List;
+@@ -28,24 +28,24 @@
  
+ import net.sf.jasperreports.charts.design.JRDesignCategorySeries;
+ import net.sf.jasperreports.charts.xml.JRCategorySeriesFactory;
 -import net.sf.jasperreports.components.barbecue.BarbecueComponent;
 -import net.sf.jasperreports.components.barbecue.StandardBarbecueComponent;
 -import net.sf.jasperreports.components.barcode4j.BarcodeComponent;
@@ -69,19 +69,37 @@
 -import net.sf.jasperreports.components.barcode4j.UPCAComponent;
 -import net.sf.jasperreports.components.barcode4j.UPCEComponent;
 -import net.sf.jasperreports.components.barcode4j.USPSIntelligentMailComponent;
++//import net.sf.jasperreports.components.barbecue.BarbecueComponent;
++//import net.sf.jasperreports.components.barbecue.StandardBarbecueComponent;
++//import net.sf.jasperreports.components.barcode4j.BarcodeComponent;
++//import net.sf.jasperreports.components.barcode4j.BarcodeXmlWriter;
++//import net.sf.jasperreports.components.barcode4j.CodabarComponent;
++//import net.sf.jasperreports.components.barcode4j.Code128Component;
++//import net.sf.jasperreports.components.barcode4j.Code39Component;
++//import net.sf.jasperreports.components.barcode4j.DataMatrixComponent;
++//import net.sf.jasperreports.components.barcode4j.EAN128Component;
++//import net.sf.jasperreports.components.barcode4j.EAN13Component;
++//import net.sf.jasperreports.components.barcode4j.EAN8Component;
++//import net.sf.jasperreports.components.barcode4j.Interleaved2Of5Component;
++//import net.sf.jasperreports.components.barcode4j.PDF417Component;
++//import net.sf.jasperreports.components.barcode4j.POSTNETComponent;
++//import net.sf.jasperreports.components.barcode4j.RoyalMailCustomerComponent;
++//import net.sf.jasperreports.components.barcode4j.UPCAComponent;
++//import net.sf.jasperreports.components.barcode4j.UPCEComponent;
++//import net.sf.jasperreports.components.barcode4j.USPSIntelligentMailComponent;
  import net.sf.jasperreports.components.list.DesignListContents;
  import net.sf.jasperreports.components.list.ListComponent;
  import net.sf.jasperreports.components.list.ListContents;
-@@ -92,8 +74,6 @@
+@@ -107,8 +107,6 @@
  	public void configureDigester(Digester digester)
  	{
  		addListRules(digester);
 -		addBarbecueRules(digester);
 -		addBarcode4jRules(digester);
  		addTableRules(digester);
+ 		addSpiderChartRules(digester);
  	}
- 
-@@ -114,103 +94,6 @@
+@@ -130,103 +128,6 @@
  		digester.addSetNext(listContentsPattern, "setContents");
  	}
  
@@ -185,7 +203,7 @@
  	protected void addTableRules(Digester digester)
  	{
  		String tablePattern = "*/componentElement/table";
-@@ -302,18 +185,6 @@
+@@ -318,18 +219,6 @@
  			TableComponent table = (TableComponent) component;
  			writeTable(table, componentKey, reportWriter);
  		}
@@ -201,10 +219,10 @@
 -					reportWriter, barcode, componentKey);
 -			barcodeWriter.writeBarcode();
 -		}
- 	}
- 
- 	protected void writeList(ListComponent list, ComponentKey componentKey,
-@@ -340,39 +211,6 @@
+ 		else if (component instanceof SpiderChartComponent)
+ 		{
+ 			SpiderChartComponent spiderChart = (SpiderChartComponent) component;
+@@ -362,39 +251,6 @@
  		
  		writer.closeElement();
  	}