Author: drazzib Date: 2011-03-15 19:24:56 +0000 (Tue, 15 Mar 2011) New Revision: 13428
Added: tags/jasperreports/4.0.1+dfsg-1/ tags/jasperreports/4.0.1+dfsg-1/debian/changelog tags/jasperreports/4.0.1+dfsg-1/debian/patches/06_configure_javaflow.diff tags/jasperreports/4.0.1+dfsg-1/debian/patches/07_exclude_barcode4j_and_barbecue.diff tags/jasperreports/4.0.1+dfsg-1/debian/patches/08_no_maxmemory_for_javadoc.diff tags/jasperreports/4.0.1+dfsg-1/debian/patches/10_disable_fonts.diff tags/jasperreports/4.0.1+dfsg-1/debian/patches/12_samples.diff Removed: tags/jasperreports/4.0.1+dfsg-1/debian/changelog tags/jasperreports/4.0.1+dfsg-1/debian/patches/06_configure_javaflow.diff tags/jasperreports/4.0.1+dfsg-1/debian/patches/07_exclude_barcode4j_and_barbecue.diff tags/jasperreports/4.0.1+dfsg-1/debian/patches/08_no_maxmemory_for_javadoc.diff tags/jasperreports/4.0.1+dfsg-1/debian/patches/10_disable_fonts.diff tags/jasperreports/4.0.1+dfsg-1/debian/patches/12_samples.diff Log: [svn-buildpackage] Tagging jasperreports 4.0.1+dfsg-1 Deleted: tags/jasperreports/4.0.1+dfsg-1/debian/changelog =================================================================== --- trunk/jasperreports/debian/changelog 2011-03-14 03:38:00 UTC (rev 13422) +++ tags/jasperreports/4.0.1+dfsg-1/debian/changelog 2011-03-15 19:24:56 UTC (rev 13428) @@ -1,104 +0,0 @@ -jasperreports (4.0.0+dfsg-1) unstable; urgency=low - - * New upstream release: - - d/patches/09_use_commons_codec.diff: Refreshed. - - d/patches/07_exclude_barcode4j_and_barbecue.diff: Refreshed. - - d/patches/12_samples.diff: Refreshed. - * d/copyright: Use DEP-5 format. - - -- Damien Raude-Morvan <[email protected]> Tue, 22 Feb 2011 22:29:56 +0100 - -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 <[email protected]> Tue, 27 Jul 2010 15:32:56 +0200 - -jasperreports (3.7.3+dfsg-1) unstable; urgency=low - - * New upstream release: - - Refresh all patches - * Bump Standards-Version to 3.9.0 (no changes needed) - - -- Damien Raude-Morvan <[email protected]> Thu, 08 Jul 2010 02:23:43 +0200 - -jasperreports (3.7.2+dfsg-1) unstable; urgency=low - - [ Torsten Werner ] - * Change maintainers into Maintainers. - - [ Damien Raude-Morvan ] - * New upstream release: - - Drop d/patches/01_exclude_jpa.diff - - Drop d/patches/03_use_pngencoder_from_jcommon.diff - - Refresh others patches - * Switch to 3.0 (quilt) source format: - - d/source/format: Set 3.0 (quilt) - - d/rules: Remove /usr/share/cdbs/1/rules/patchsys-quilt.mk - - d/control: Remove B-D on quilt - - d/README.source: Removed - * Replace d/patches/11_pom.diff by some d/maven.ignoreRules - - -- Damien Raude-Morvan <[email protected]> Tue, 20 Apr 2010 23:50:28 +0200 - -jasperreports (3.7.1+dfsg-2) unstable; urgency=low - - * Fix FTBFS: (Closes: #571398) - - debian/control: Build-Depends on rhino - (since OpenJDK now only Recommends it) - - debian/rules: add js.jar to classpath - - -- Damien Raude-Morvan <[email protected]> Fri, 26 Feb 2010 00:13:25 +0100 - -jasperreports (3.7.1+dfsg-1) unstable; urgency=low - - * New upstream release - - Remove debian/patches/12_itext.diff (merged upstream) - - Refresh others patches - * Enable OLAP components: - - Update debian/patches/01_exclude_olap_and_jpa.diff - - debian/control: Build-Depends on libmondrian-java, libolap4j-java, - libantlr-java - - debian/rules: add those libs into DEB_JARS - * Bump Standards-Version to 3.8.4 (no changes needed) - - -- Damien Raude-Morvan <[email protected]> Sat, 06 Feb 2010 22:03:56 +0100 - -jasperreports (3.7.0+dfsg-1) unstable; urgency=low - - * New upstream release - - new patch 12_itext.diff to fix utf32 compatibility - * Depends on libcommons-collection3-java - * Fix debian/maven.rules to transform more dependencies - - -- Damien Raude-Morvan <[email protected]> Sat, 12 Dec 2009 14:13:19 +0100 - -jasperreports (3.6.1+dfsg-1) unstable; urgency=low - - * New upstream release - * debian/patches/11_pom.diff: remove uneeded dependencies removed from - Debian package - * debian/patches/10_disable_fonts.diff: don't build "font" package - * Build-Depends on libcommons-collections3-java instead of - libcommons-collections-java - - -- Damien Raude-Morvan <[email protected]> Mon, 16 Nov 2009 22:38:49 +0100 - -jasperreports (3.6.0+dfsg-1) unstable; urgency=low - - * New upstream release. - * Refresh all debian/patches - * debian/copyright: - - Change upstream license to LGPLv3 - * Update my email address - - -- Damien Raude-Morvan <[email protected]> Thu, 24 Sep 2009 21:17:25 +0200 - -jasperreports (3.5.3+dfsg-1) unstable; urgency=low - - * Initial release. (Closes: #281346) - - -- Damien Raude-Morvan <[email protected]> Tue, 25 Aug 2009 23:12:16 +0200 Copied: tags/jasperreports/4.0.1+dfsg-1/debian/changelog (from rev 13427, trunk/jasperreports/debian/changelog) =================================================================== --- tags/jasperreports/4.0.1+dfsg-1/debian/changelog (rev 0) +++ tags/jasperreports/4.0.1+dfsg-1/debian/changelog 2011-03-15 19:24:56 UTC (rev 13428) @@ -0,0 +1,110 @@ +jasperreports (4.0.1+dfsg-1) unstable; urgency=low + + * New upstream release: Refreshed all patches. + + -- Damien Raude-Morvan <[email protected]> Tue, 15 Mar 2011 19:58:44 +0100 + +jasperreports (4.0.0+dfsg-1) unstable; urgency=low + + * New upstream release: + - d/patches/09_use_commons_codec.diff: Refreshed. + - d/patches/07_exclude_barcode4j_and_barbecue.diff: Refreshed. + - d/patches/12_samples.diff: Refreshed. + * d/copyright: Use DEP-5 format. + + -- Damien Raude-Morvan <[email protected]> Tue, 22 Feb 2011 22:29:56 +0100 + +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 <[email protected]> Tue, 27 Jul 2010 15:32:56 +0200 + +jasperreports (3.7.3+dfsg-1) unstable; urgency=low + + * New upstream release: + - Refresh all patches + * Bump Standards-Version to 3.9.0 (no changes needed) + + -- Damien Raude-Morvan <[email protected]> Thu, 08 Jul 2010 02:23:43 +0200 + +jasperreports (3.7.2+dfsg-1) unstable; urgency=low + + [ Torsten Werner ] + * Change maintainers into Maintainers. + + [ Damien Raude-Morvan ] + * New upstream release: + - Drop d/patches/01_exclude_jpa.diff + - Drop d/patches/03_use_pngencoder_from_jcommon.diff + - Refresh others patches + * Switch to 3.0 (quilt) source format: + - d/source/format: Set 3.0 (quilt) + - d/rules: Remove /usr/share/cdbs/1/rules/patchsys-quilt.mk + - d/control: Remove B-D on quilt + - d/README.source: Removed + * Replace d/patches/11_pom.diff by some d/maven.ignoreRules + + -- Damien Raude-Morvan <[email protected]> Tue, 20 Apr 2010 23:50:28 +0200 + +jasperreports (3.7.1+dfsg-2) unstable; urgency=low + + * Fix FTBFS: (Closes: #571398) + - debian/control: Build-Depends on rhino + (since OpenJDK now only Recommends it) + - debian/rules: add js.jar to classpath + + -- Damien Raude-Morvan <[email protected]> Fri, 26 Feb 2010 00:13:25 +0100 + +jasperreports (3.7.1+dfsg-1) unstable; urgency=low + + * New upstream release + - Remove debian/patches/12_itext.diff (merged upstream) + - Refresh others patches + * Enable OLAP components: + - Update debian/patches/01_exclude_olap_and_jpa.diff + - debian/control: Build-Depends on libmondrian-java, libolap4j-java, + libantlr-java + - debian/rules: add those libs into DEB_JARS + * Bump Standards-Version to 3.8.4 (no changes needed) + + -- Damien Raude-Morvan <[email protected]> Sat, 06 Feb 2010 22:03:56 +0100 + +jasperreports (3.7.0+dfsg-1) unstable; urgency=low + + * New upstream release + - new patch 12_itext.diff to fix utf32 compatibility + * Depends on libcommons-collection3-java + * Fix debian/maven.rules to transform more dependencies + + -- Damien Raude-Morvan <[email protected]> Sat, 12 Dec 2009 14:13:19 +0100 + +jasperreports (3.6.1+dfsg-1) unstable; urgency=low + + * New upstream release + * debian/patches/11_pom.diff: remove uneeded dependencies removed from + Debian package + * debian/patches/10_disable_fonts.diff: don't build "font" package + * Build-Depends on libcommons-collections3-java instead of + libcommons-collections-java + + -- Damien Raude-Morvan <[email protected]> Mon, 16 Nov 2009 22:38:49 +0100 + +jasperreports (3.6.0+dfsg-1) unstable; urgency=low + + * New upstream release. + * Refresh all debian/patches + * debian/copyright: + - Change upstream license to LGPLv3 + * Update my email address + + -- Damien Raude-Morvan <[email protected]> Thu, 24 Sep 2009 21:17:25 +0200 + +jasperreports (3.5.3+dfsg-1) unstable; urgency=low + + * Initial release. (Closes: #281346) + + -- Damien Raude-Morvan <[email protected]> Tue, 25 Aug 2009 23:12:16 +0200 Deleted: tags/jasperreports/4.0.1+dfsg-1/debian/patches/06_configure_javaflow.diff =================================================================== --- trunk/jasperreports/debian/patches/06_configure_javaflow.diff 2011-03-14 03:38:00 UTC (rev 13422) +++ tags/jasperreports/4.0.1+dfsg-1/debian/patches/06_configure_javaflow.diff 2011-03-15 19:24:56 UTC (rev 13428) @@ -1,33 +0,0 @@ -Description: build.xml: configure <javaflow> ant task. - Include missing elements from upstream classpath. -Author: Damien Raude-Morvan <[email protected]> -Forwarded: not-needed -Last-Update: 2010-04-20 ---- a/build.xml -+++ b/build.xml -@@ -82,12 +82,25 @@ - </replace> - - <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"/> -+ <include name="net/sf/jasperreports/engine/fill/DatasetExpressionEvaluator.class"/> - </javaflow> - - <mkdir dir="./dist"/> Copied: tags/jasperreports/4.0.1+dfsg-1/debian/patches/06_configure_javaflow.diff (from rev 13427, trunk/jasperreports/debian/patches/06_configure_javaflow.diff) =================================================================== --- tags/jasperreports/4.0.1+dfsg-1/debian/patches/06_configure_javaflow.diff (rev 0) +++ tags/jasperreports/4.0.1+dfsg-1/debian/patches/06_configure_javaflow.diff 2011-03-15 19:24:56 UTC (rev 13428) @@ -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 +Last-Update: 2010-04-20 +--- a/build.xml ++++ b/build.xml +@@ -71,12 +71,25 @@ + </replace> + + <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"/> ++ <include name="net/sf/jasperreports/engine/fill/DatasetExpressionEvaluator.class"/> + </javaflow> + + <mkdir dir="./dist"/> Deleted: tags/jasperreports/4.0.1+dfsg-1/debian/patches/07_exclude_barcode4j_and_barbecue.diff =================================================================== --- trunk/jasperreports/debian/patches/07_exclude_barcode4j_and_barbecue.diff 2011-03-14 03:38:00 UTC (rev 13422) +++ tags/jasperreports/4.0.1+dfsg-1/debian/patches/07_exclude_barcode4j_and_barbecue.diff 2011-03-15 19:24:56 UTC (rev 13428) @@ -1,280 +0,0 @@ -Description: - - build.xml: exclude Barcode4J and Barbecue modules of JasperReports. - - Disable Barcode4J and Barbecue classes in - src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java - and src/net/sf/jasperreports/components/ComponentsXmlHandler.java -Fowarded: no -Author: Damien Raude-Morvan <[email protected]> -Last-Update: 2010-04-20 ---- a/src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java -+++ b/src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java -@@ -27,12 +27,6 @@ - import java.util.HashMap; - import java.util.List; - --import net.sf.jasperreports.components.barbecue.BarbecueCompiler; --import net.sf.jasperreports.components.barbecue.BarbecueDesignConverter; --import net.sf.jasperreports.components.barbecue.BarbecueFillFactory; --import net.sf.jasperreports.components.barcode4j.BarcodeCompiler; --import net.sf.jasperreports.components.barcode4j.BarcodeDesignConverter; --import net.sf.jasperreports.components.barcode4j.BarcodeFillFactory; - import net.sf.jasperreports.components.list.FillListFactory; - import net.sf.jasperreports.components.list.ListComponent; - import net.sf.jasperreports.components.list.ListComponentCompiler; -@@ -111,23 +105,6 @@ - tableManager.setComponentFillFactory(new FillTableFactory()); - componentManagers.put(TABLE_COMPONENT_NAME, tableManager); - -- DefaultComponentManager barbecueManager = new DefaultComponentManager(); -- barbecueManager.setDesignConverter(new BarbecueDesignConverter()); -- barbecueManager.setComponentCompiler(new BarbecueCompiler()); -- barbecueManager.setComponentXmlWriter(xmlHandler); -- barbecueManager.setComponentFillFactory(new BarbecueFillFactory()); -- componentManagers.put(BARBECUE_COMPONENT_NAME, barbecueManager); -- -- DefaultComponentManager barcode4jManager = new DefaultComponentManager(); -- barcode4jManager.setDesignConverter(new BarcodeDesignConverter()); -- barcode4jManager.setComponentCompiler(new BarcodeCompiler()); -- barcode4jManager.setComponentXmlWriter(xmlHandler); -- barcode4jManager.setComponentFillFactory(new BarcodeFillFactory()); -- for (int i = 0; i < BARCODE4J_COMPONENT_NAMES.length; i++) -- { -- componentManagers.put(BARCODE4J_COMPONENT_NAMES[i], barcode4jManager); -- } -- - 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 -@@ -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; --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.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.charts.ChartSettings; - import net.sf.jasperreports.components.charts.ChartSettingsXmlFactory; - import net.sf.jasperreports.components.list.DesignListContents; -@@ -108,8 +108,6 @@ - public void configureDigester(Digester digester) - { - addListRules(digester); -- addBarbecueRules(digester); -- addBarcode4jRules(digester); - addTableRules(digester); - addSpiderChartRules(digester); - } -@@ -131,107 +129,6 @@ - digester.addSetNext(listContentsPattern, "setContents"); - } - -- protected void addBarbecueRules(Digester digester) -- { -- String barcodePattern = "*/componentElement/barbecue"; -- digester.addObjectCreate(barcodePattern, StandardBarbecueComponent.class); -- digester.addSetProperties(barcodePattern, -- //properties to be ignored by this rule -- new String[]{JRXmlConstants.ATTRIBUTE_evaluationTime, StandardBarbecueComponent.PROPERTY_ROTATION}, -- new String[0]); -- digester.addRule(barcodePattern, -- new XmlConstantPropertyRule( -- JRXmlConstants.ATTRIBUTE_evaluationTime, "evaluationTimeValue", -- EvaluationTimeEnum.values())); -- digester.addRule(barcodePattern, -- new XmlConstantPropertyRule( -- StandardBarbecueComponent.PROPERTY_ROTATION, -- RotationEnum.values())); -- -- String barcodeExpressionPattern = barcodePattern + "/codeExpression"; -- digester.addFactoryCreate(barcodeExpressionPattern, -- JRExpressionFactory.StringExpressionFactory.class.getName()); -- digester.addCallMethod(barcodeExpressionPattern, "setText", 0); -- digester.addSetNext(barcodeExpressionPattern, "setCodeExpression", -- JRExpression.class.getName()); -- -- String applicationIdentifierExpressionPattern = barcodePattern -- + "/applicationIdentifierExpression"; -- digester.addFactoryCreate(applicationIdentifierExpressionPattern, -- JRExpressionFactory.StringExpressionFactory.class.getName()); -- digester.addCallMethod(applicationIdentifierExpressionPattern, "setText", 0); -- digester.addSetNext(applicationIdentifierExpressionPattern, -- "setApplicationIdentifierExpression", -- JRExpression.class.getName()); -- } -- -- protected void addBarcode4jRules(Digester digester) -- { -- addBaseBarcode4jRules(digester, -- "*/componentElement/Codabar", -- CodabarComponent.class); -- addBaseBarcode4jRules(digester, -- "*/componentElement/Code128", -- Code128Component.class); -- addBaseBarcode4jRules(digester, -- "*/componentElement/EAN128", -- EAN128Component.class); -- addBaseBarcode4jRules(digester, -- "*/componentElement/DataMatrix", -- DataMatrixComponent.class); -- addBaseBarcode4jRules(digester, -- "*/componentElement/RoyalMailCustomer", -- RoyalMailCustomerComponent.class); -- addBaseBarcode4jRules(digester, -- "*/componentElement/USPSIntelligentMail", -- USPSIntelligentMailComponent.class); -- addBaseBarcode4jRules(digester, -- "*/componentElement/Code39", Code39Component.class); -- addBaseBarcode4jRules(digester, -- "*/componentElement/Interleaved2Of5", Interleaved2Of5Component.class); -- addBaseBarcode4jRules(digester, -- "*/componentElement/UPCA", UPCAComponent.class); -- addBaseBarcode4jRules(digester, -- "*/componentElement/UPCE", UPCEComponent.class); -- addBaseBarcode4jRules(digester, -- "*/componentElement/EAN13", EAN13Component.class); -- addBaseBarcode4jRules(digester, -- "*/componentElement/EAN8", EAN8Component.class); -- addBaseBarcode4jRules(digester, -- "*/componentElement/POSTNET", POSTNETComponent.class); -- addBaseBarcode4jRules(digester, -- "*/componentElement/PDF417", PDF417Component.class); -- } -- -- protected void addBaseBarcode4jRules(Digester digester, -- String barcodePattern, Class barcodeComponentClass) -- { -- digester.addObjectCreate(barcodePattern, barcodeComponentClass); -- digester.addSetProperties(barcodePattern, -- //properties to be ignored by this rule -- new String[]{JRXmlConstants.ATTRIBUTE_evaluationTime}, -- new String[0]); -- //rule to set evaluation time -- digester.addRule(barcodePattern, -- new XmlConstantPropertyRule( -- JRXmlConstants.ATTRIBUTE_evaluationTime, "evaluationTimeValue", -- EvaluationTimeEnum.values())); -- -- String codeExpressionPattern = barcodePattern + "/codeExpression"; -- digester.addFactoryCreate(codeExpressionPattern, -- JRExpressionFactory.StringExpressionFactory.class.getName()); -- digester.addCallMethod(codeExpressionPattern, "setText", 0); -- digester.addSetNext(codeExpressionPattern, "setCodeExpression", -- JRExpression.class.getName()); -- -- String patternExpressionPattern = barcodePattern + "/patternExpression"; -- digester.addFactoryCreate(patternExpressionPattern, -- JRExpressionFactory.StringExpressionFactory.class.getName()); -- digester.addCallMethod(patternExpressionPattern, "setText", 0); -- digester.addSetNext(patternExpressionPattern, "setPatternExpression", -- JRExpression.class.getName()); -- } -- - protected void addTableRules(Digester digester) - { - String tablePattern = "*/componentElement/table"; -@@ -323,18 +220,6 @@ - TableComponent table = (TableComponent) component; - writeTable(table, componentKey, reportWriter); - } -- else if (component instanceof BarbecueComponent) -- { -- BarbecueComponent barcode = (BarbecueComponent) component; -- writeBarbecue(barcode, componentKey, reportWriter); -- } -- else if (component instanceof BarcodeComponent) -- { -- BarcodeComponent barcode = (BarcodeComponent) component; -- BarcodeXmlWriter barcodeWriter = new BarcodeXmlWriter( -- reportWriter, barcode, componentKey); -- barcodeWriter.writeBarcode(); -- } - else if (component instanceof SpiderChartComponent) - { - SpiderChartComponent spiderChart = (SpiderChartComponent) component; -@@ -367,40 +252,6 @@ - - writer.closeElement(); - } -- -- protected void writeBarbecue(BarbecueComponent barcode, ComponentKey componentKey, -- JRXmlWriter reportWriter) throws IOException -- { -- JRXmlWriteHelper writer = reportWriter.getXmlWriteHelper(); -- -- XmlNamespace namespace = new XmlNamespace( -- ComponentsExtensionsRegistryFactory.NAMESPACE, -- componentKey.getNamespacePrefix(), -- ComponentsExtensionsRegistryFactory.XSD_LOCATION); -- -- writer.startElement("barbecue", namespace); -- -- writer.addAttribute("type", barcode.getType()); -- writer.addAttribute("drawText", barcode.isDrawText()); -- writer.addAttribute("checksumRequired", barcode.isChecksumRequired()); -- writer.addAttribute("barWidth", barcode.getBarWidth()); -- writer.addAttribute("barHeight", barcode.getBarHeight()); -- writer.addAttribute("rotation", barcode.getOwnRotation()); -- if (barcode.getEvaluationTimeValue() != EvaluationTimeEnum.NOW) -- { -- writer.addAttribute(JRXmlConstants.ATTRIBUTE_evaluationTime, -- barcode.getEvaluationTimeValue()); -- } -- writer.addAttribute(JRXmlConstants.ATTRIBUTE_evaluationGroup, -- barcode.getEvaluationGroup()); -- -- writer.writeExpression("codeExpression", -- barcode.getCodeExpression(), false); -- writer.writeExpression("applicationIdentifierExpression", -- barcode.getApplicationIdentifierExpression(), false); -- -- writer.closeElement(); -- } - - protected void writeTable(TableComponent table, ComponentKey componentKey, - final JRXmlWriter reportWriter) throws IOException ---- a/build.xml -+++ b/build.xml -@@ -7,6 +7,8 @@ - <target name="compile" description="Compiles the java source files of the library."> - <mkdir dir="./build/classes"/> - <javac destdir="./build/classes" debug="true" optimize="false" deprecation="true" target="1.5" source="1.5" encoding="ISO-8859-1"> -+ <exclude name="**/barcode4j/*.java"/> -+ <exclude name="**/barbecue/*.java"/> - <classpath> - <pathelement location="./build/classes"/> - <fileset dir="./lib"> Copied: tags/jasperreports/4.0.1+dfsg-1/debian/patches/07_exclude_barcode4j_and_barbecue.diff (from rev 13427, trunk/jasperreports/debian/patches/07_exclude_barcode4j_and_barbecue.diff) =================================================================== --- tags/jasperreports/4.0.1+dfsg-1/debian/patches/07_exclude_barcode4j_and_barbecue.diff (rev 0) +++ tags/jasperreports/4.0.1+dfsg-1/debian/patches/07_exclude_barcode4j_and_barbecue.diff 2011-03-15 19:24:56 UTC (rev 13428) @@ -0,0 +1,280 @@ +Description: + - build.xml: exclude Barcode4J and Barbecue modules of JasperReports. + - Disable Barcode4J and Barbecue classes in + src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java + and src/net/sf/jasperreports/components/ComponentsXmlHandler.java +Fowarded: no +Author: Damien Raude-Morvan <[email protected]> +Last-Update: 2010-04-20 +--- a/src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java ++++ b/src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java +@@ -27,12 +27,6 @@ + import java.util.HashMap; + import java.util.List; + +-import net.sf.jasperreports.components.barbecue.BarbecueCompiler; +-import net.sf.jasperreports.components.barbecue.BarbecueDesignConverter; +-import net.sf.jasperreports.components.barbecue.BarbecueFillFactory; +-import net.sf.jasperreports.components.barcode4j.BarcodeCompiler; +-import net.sf.jasperreports.components.barcode4j.BarcodeDesignConverter; +-import net.sf.jasperreports.components.barcode4j.BarcodeFillFactory; + import net.sf.jasperreports.components.list.FillListFactory; + import net.sf.jasperreports.components.list.ListComponent; + import net.sf.jasperreports.components.list.ListComponentCompiler; +@@ -113,23 +107,6 @@ + tableManager.setComponentFillFactory(new FillTableFactory()); + componentManagers.put(TABLE_COMPONENT_NAME, tableManager); + +- DefaultComponentManager barbecueManager = new DefaultComponentManager(); +- barbecueManager.setDesignConverter(new BarbecueDesignConverter()); +- barbecueManager.setComponentCompiler(new BarbecueCompiler()); +- barbecueManager.setComponentXmlWriter(xmlHandler); +- barbecueManager.setComponentFillFactory(new BarbecueFillFactory()); +- componentManagers.put(BARBECUE_COMPONENT_NAME, barbecueManager); +- +- DefaultComponentManager barcode4jManager = new DefaultComponentManager(); +- barcode4jManager.setDesignConverter(new BarcodeDesignConverter()); +- barcode4jManager.setComponentCompiler(new BarcodeCompiler()); +- barcode4jManager.setComponentXmlWriter(xmlHandler); +- barcode4jManager.setComponentFillFactory(new BarcodeFillFactory()); +- for (int i = 0; i < BARCODE4J_COMPONENT_NAMES.length; i++) +- { +- componentManagers.put(BARCODE4J_COMPONENT_NAMES[i], barcode4jManager); +- } +- + 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 +@@ -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; +-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.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.charts.ChartSettings; + import net.sf.jasperreports.components.charts.ChartSettingsXmlFactory; + import net.sf.jasperreports.components.list.DesignListContents; +@@ -108,8 +108,6 @@ + public void configureDigester(Digester digester) + { + addListRules(digester); +- addBarbecueRules(digester); +- addBarcode4jRules(digester); + addTableRules(digester); + addSpiderChartRules(digester); + } +@@ -131,107 +129,6 @@ + digester.addSetNext(listContentsPattern, "setContents"); + } + +- protected void addBarbecueRules(Digester digester) +- { +- String barcodePattern = "*/componentElement/barbecue"; +- digester.addObjectCreate(barcodePattern, StandardBarbecueComponent.class); +- digester.addSetProperties(barcodePattern, +- //properties to be ignored by this rule +- new String[]{JRXmlConstants.ATTRIBUTE_evaluationTime, StandardBarbecueComponent.PROPERTY_ROTATION}, +- new String[0]); +- digester.addRule(barcodePattern, +- new XmlConstantPropertyRule( +- JRXmlConstants.ATTRIBUTE_evaluationTime, "evaluationTimeValue", +- EvaluationTimeEnum.values())); +- digester.addRule(barcodePattern, +- new XmlConstantPropertyRule( +- StandardBarbecueComponent.PROPERTY_ROTATION, +- RotationEnum.values())); +- +- String barcodeExpressionPattern = barcodePattern + "/codeExpression"; +- digester.addFactoryCreate(barcodeExpressionPattern, +- JRExpressionFactory.StringExpressionFactory.class.getName()); +- digester.addCallMethod(barcodeExpressionPattern, "setText", 0); +- digester.addSetNext(barcodeExpressionPattern, "setCodeExpression", +- JRExpression.class.getName()); +- +- String applicationIdentifierExpressionPattern = barcodePattern +- + "/applicationIdentifierExpression"; +- digester.addFactoryCreate(applicationIdentifierExpressionPattern, +- JRExpressionFactory.StringExpressionFactory.class.getName()); +- digester.addCallMethod(applicationIdentifierExpressionPattern, "setText", 0); +- digester.addSetNext(applicationIdentifierExpressionPattern, +- "setApplicationIdentifierExpression", +- JRExpression.class.getName()); +- } +- +- protected void addBarcode4jRules(Digester digester) +- { +- addBaseBarcode4jRules(digester, +- "*/componentElement/Codabar", +- CodabarComponent.class); +- addBaseBarcode4jRules(digester, +- "*/componentElement/Code128", +- Code128Component.class); +- addBaseBarcode4jRules(digester, +- "*/componentElement/EAN128", +- EAN128Component.class); +- addBaseBarcode4jRules(digester, +- "*/componentElement/DataMatrix", +- DataMatrixComponent.class); +- addBaseBarcode4jRules(digester, +- "*/componentElement/RoyalMailCustomer", +- RoyalMailCustomerComponent.class); +- addBaseBarcode4jRules(digester, +- "*/componentElement/USPSIntelligentMail", +- USPSIntelligentMailComponent.class); +- addBaseBarcode4jRules(digester, +- "*/componentElement/Code39", Code39Component.class); +- addBaseBarcode4jRules(digester, +- "*/componentElement/Interleaved2Of5", Interleaved2Of5Component.class); +- addBaseBarcode4jRules(digester, +- "*/componentElement/UPCA", UPCAComponent.class); +- addBaseBarcode4jRules(digester, +- "*/componentElement/UPCE", UPCEComponent.class); +- addBaseBarcode4jRules(digester, +- "*/componentElement/EAN13", EAN13Component.class); +- addBaseBarcode4jRules(digester, +- "*/componentElement/EAN8", EAN8Component.class); +- addBaseBarcode4jRules(digester, +- "*/componentElement/POSTNET", POSTNETComponent.class); +- addBaseBarcode4jRules(digester, +- "*/componentElement/PDF417", PDF417Component.class); +- } +- +- protected void addBaseBarcode4jRules(Digester digester, +- String barcodePattern, Class barcodeComponentClass) +- { +- digester.addObjectCreate(barcodePattern, barcodeComponentClass); +- digester.addSetProperties(barcodePattern, +- //properties to be ignored by this rule +- new String[]{JRXmlConstants.ATTRIBUTE_evaluationTime}, +- new String[0]); +- //rule to set evaluation time +- digester.addRule(barcodePattern, +- new XmlConstantPropertyRule( +- JRXmlConstants.ATTRIBUTE_evaluationTime, "evaluationTimeValue", +- EvaluationTimeEnum.values())); +- +- String codeExpressionPattern = barcodePattern + "/codeExpression"; +- digester.addFactoryCreate(codeExpressionPattern, +- JRExpressionFactory.StringExpressionFactory.class.getName()); +- digester.addCallMethod(codeExpressionPattern, "setText", 0); +- digester.addSetNext(codeExpressionPattern, "setCodeExpression", +- JRExpression.class.getName()); +- +- String patternExpressionPattern = barcodePattern + "/patternExpression"; +- digester.addFactoryCreate(patternExpressionPattern, +- JRExpressionFactory.StringExpressionFactory.class.getName()); +- digester.addCallMethod(patternExpressionPattern, "setText", 0); +- digester.addSetNext(patternExpressionPattern, "setPatternExpression", +- JRExpression.class.getName()); +- } +- + protected void addTableRules(Digester digester) + { + String tablePattern = "*/componentElement/table"; +@@ -323,18 +220,6 @@ + TableComponent table = (TableComponent) component; + writeTable(table, componentKey, reportWriter); + } +- else if (component instanceof BarbecueComponent) +- { +- BarbecueComponent barcode = (BarbecueComponent) component; +- writeBarbecue(barcode, componentKey, reportWriter); +- } +- else if (component instanceof BarcodeComponent) +- { +- BarcodeComponent barcode = (BarcodeComponent) component; +- BarcodeXmlWriter barcodeWriter = new BarcodeXmlWriter( +- reportWriter, barcode, componentKey); +- barcodeWriter.writeBarcode(); +- } + else if (component instanceof SpiderChartComponent) + { + SpiderChartComponent spiderChart = (SpiderChartComponent) component; +@@ -367,40 +252,6 @@ + + writer.closeElement(); + } +- +- protected void writeBarbecue(BarbecueComponent barcode, ComponentKey componentKey, +- JRXmlWriter reportWriter) throws IOException +- { +- JRXmlWriteHelper writer = reportWriter.getXmlWriteHelper(); +- +- XmlNamespace namespace = new XmlNamespace( +- ComponentsExtensionsRegistryFactory.NAMESPACE, +- componentKey.getNamespacePrefix(), +- ComponentsExtensionsRegistryFactory.XSD_LOCATION); +- +- writer.startElement("barbecue", namespace); +- +- writer.addAttribute("type", barcode.getType()); +- writer.addAttribute("drawText", barcode.isDrawText()); +- writer.addAttribute("checksumRequired", barcode.isChecksumRequired()); +- writer.addAttribute("barWidth", barcode.getBarWidth()); +- writer.addAttribute("barHeight", barcode.getBarHeight()); +- writer.addAttribute("rotation", barcode.getOwnRotation()); +- if (barcode.getEvaluationTimeValue() != EvaluationTimeEnum.NOW) +- { +- writer.addAttribute(JRXmlConstants.ATTRIBUTE_evaluationTime, +- barcode.getEvaluationTimeValue()); +- } +- writer.addAttribute(JRXmlConstants.ATTRIBUTE_evaluationGroup, +- barcode.getEvaluationGroup()); +- +- writer.writeExpression("codeExpression", +- barcode.getCodeExpression(), false); +- writer.writeExpression("applicationIdentifierExpression", +- barcode.getApplicationIdentifierExpression(), false); +- +- writer.closeElement(); +- } + + protected void writeTable(TableComponent table, ComponentKey componentKey, + final JRXmlWriter reportWriter) throws IOException +--- a/build.xml ++++ b/build.xml +@@ -7,6 +7,8 @@ + <target name="compile" description="Compiles the java source files of the library."> + <mkdir dir="./build/classes"/> + <javac destdir="./build/classes" debug="true" optimize="false" deprecation="true" target="1.5" source="1.5" encoding="ISO-8859-1"> ++ <exclude name="**/barcode4j/*.java"/> ++ <exclude name="**/barbecue/*.java"/> + <classpath> + <pathelement location="./build/classes"/> + <fileset dir="./lib"> Deleted: tags/jasperreports/4.0.1+dfsg-1/debian/patches/08_no_maxmemory_for_javadoc.diff =================================================================== --- trunk/jasperreports/debian/patches/08_no_maxmemory_for_javadoc.diff 2011-03-14 03:38:00 UTC (rev 13422) +++ tags/jasperreports/4.0.1+dfsg-1/debian/patches/08_no_maxmemory_for_javadoc.diff 2011-03-15 19:24:56 UTC (rev 13428) @@ -1,14 +0,0 @@ -Description: build.xml: Don't pass Xmx128m to <javadoc> task. -Fowarded: no -Author: Damien Raude-Morvan <[email protected]> -Last-Update: 2010-04-20 ---- a/build.xml -+++ b/build.xml -@@ -417,7 +417,6 @@ - use="true" - windowtitle="JasperReports ${version} API" - excludepackagenames="org.w3c.tools.codec" -- maxmemory="128m" - encoding="ISO-8859-1"> - <doctitle> - <![CDATA[ Copied: tags/jasperreports/4.0.1+dfsg-1/debian/patches/08_no_maxmemory_for_javadoc.diff (from rev 13427, trunk/jasperreports/debian/patches/08_no_maxmemory_for_javadoc.diff) =================================================================== --- tags/jasperreports/4.0.1+dfsg-1/debian/patches/08_no_maxmemory_for_javadoc.diff (rev 0) +++ tags/jasperreports/4.0.1+dfsg-1/debian/patches/08_no_maxmemory_for_javadoc.diff 2011-03-15 19:24:56 UTC (rev 13428) @@ -0,0 +1,14 @@ +Description: build.xml: Don't pass Xmx128m to <javadoc> task. +Fowarded: no +Author: Damien Raude-Morvan <[email protected]> +Last-Update: 2010-04-20 +--- a/build.xml ++++ b/build.xml +@@ -332,7 +332,6 @@ + use="true" + windowtitle="JasperReports ${version} API" + excludepackagenames="org.w3c.tools.codec" +- maxmemory="128m" + encoding="ISO-8859-1"> + <doctitle> + <![CDATA[ Deleted: tags/jasperreports/4.0.1+dfsg-1/debian/patches/10_disable_fonts.diff =================================================================== --- trunk/jasperreports/debian/patches/10_disable_fonts.diff 2011-03-14 03:38:00 UTC (rev 13422) +++ tags/jasperreports/4.0.1+dfsg-1/debian/patches/10_disable_fonts.diff 2011-03-15 19:24:56 UTC (rev 13428) @@ -1,15 +0,0 @@ -Description: build.xml: don't build -font.jar (not included in our orig source tarball) -Fowarded: no -Author: Damien Raude-Morvan <[email protected]> -Last-Update: 2010-04-20 ---- a/build.xml -+++ b/build.xml -@@ -41,7 +41,7 @@ - </antlr> - </target> - -- <target name="jar" depends="compile, javaflow, applet, fonts" description="Builds the JasperReports JAR files."> -+ <target name="jar" depends="compile, javaflow, applet" description="Builds the JasperReports JAR files."> - <mkdir dir="./dist"/> - <jar jarfile="./dist/jasperreports-${version}.jar"> - <manifest> Copied: tags/jasperreports/4.0.1+dfsg-1/debian/patches/10_disable_fonts.diff (from rev 13427, trunk/jasperreports/debian/patches/10_disable_fonts.diff) =================================================================== --- tags/jasperreports/4.0.1+dfsg-1/debian/patches/10_disable_fonts.diff (rev 0) +++ tags/jasperreports/4.0.1+dfsg-1/debian/patches/10_disable_fonts.diff 2011-03-15 19:24:56 UTC (rev 13428) @@ -0,0 +1,15 @@ +Description: build.xml: don't build -font.jar (not included in our orig source tarball) +Fowarded: no +Author: Damien Raude-Morvan <[email protected]> +Last-Update: 2010-04-20 +--- a/build.xml ++++ b/build.xml +@@ -41,7 +41,7 @@ + </antlr> + </target> + +- <target name="jar" depends="compile, javaflow, applet, fonts" description="Builds the JasperReports JAR files."> ++ <target name="jar" depends="compile, javaflow, applet" description="Builds the JasperReports JAR files."> + <mkdir dir="./dist"/> + <jar jarfile="./dist/jasperreports-${version}.jar" manifest="src/META-INF/MANIFEST.MF"> + <fileset dir="./build/classes"/> Deleted: tags/jasperreports/4.0.1+dfsg-1/debian/patches/12_samples.diff =================================================================== --- trunk/jasperreports/debian/patches/12_samples.diff 2011-03-14 03:38:00 UTC (rev 13422) +++ tags/jasperreports/4.0.1+dfsg-1/debian/patches/12_samples.diff 2011-03-15 19:24:56 UTC (rev 13428) @@ -1,14 +0,0 @@ -Description: Disable build of sampleref -Author: Damien Raude-Morvan <[email protected]> -Last-Update: 2010-04-20 -Forwarded: no ---- a/build.xml -+++ b/build.xml -@@ -462,6 +462,6 @@ - </copy> - </target> - -- <target name="docs" depends="javadoc, schemaref, configref, sampleref" description="Generates all documentation."/> -+ <target name="docs" depends="javadoc, schemaref, configref" description="Generates all documentation."/> - - </project> Copied: tags/jasperreports/4.0.1+dfsg-1/debian/patches/12_samples.diff (from rev 13427, trunk/jasperreports/debian/patches/12_samples.diff) =================================================================== --- tags/jasperreports/4.0.1+dfsg-1/debian/patches/12_samples.diff (rev 0) +++ tags/jasperreports/4.0.1+dfsg-1/debian/patches/12_samples.diff 2011-03-15 19:24:56 UTC (rev 13428) @@ -0,0 +1,14 @@ +Description: Disable build of sampleref +Author: Damien Raude-Morvan <[email protected]> +Last-Update: 2010-04-20 +Forwarded: no +--- a/build.xml ++++ b/build.xml +@@ -440,6 +440,6 @@ + </copy> + </target> + +- <target name="docs" depends="javadoc, schemaref, configref, sampleref" description="Generates all documentation."/> ++ <target name="docs" depends="javadoc, schemaref, configref" description="Generates all documentation."/> + + </project> _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits

