[pkg-java] r17114 - in trunk/jasperreports3.7/debian: . patches
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Mon Aug 5 20:13:49 UTC 2013
Author: ebourg-guest
Date: 2013-08-05 20:13:49 +0000 (Mon, 05 Aug 2013)
New Revision: 17114
Modified:
trunk/jasperreports3.7/debian/changelog
trunk/jasperreports3.7/debian/orig-tar.exclude
trunk/jasperreports3.7/debian/patches/07_exclude_barcode4j_and_barbecue.diff
trunk/jasperreports3.7/debian/patches/08_no_maxmemory_for_javadoc.diff
trunk/jasperreports3.7/debian/patches/09_use_commons_codec.diff
trunk/jasperreports3.7/debian/patches/12_samples.diff
Log:
New upstream release (3.7.6)
Refreshed the patches
Removed the Eclipse project files from the upstream tarball
Modified: trunk/jasperreports3.7/debian/changelog
===================================================================
--- trunk/jasperreports3.7/debian/changelog 2013-08-05 16:02:29 UTC (rev 17113)
+++ trunk/jasperreports3.7/debian/changelog 2013-08-05 20:13:49 UTC (rev 17114)
@@ -1,3 +1,12 @@
+jasperreports3.7 (3.7.6+dfsg-1) UNRELEASED; urgency=low
+
+ * Team upload.
+ * New upstream release.
+ * Refreshed the patches
+ * Removed the Eclipse project files from the upstream tarball
+
+ -- Emmanuel Bourg <ebourg at apache.org> Mon, 05 Aug 2013 19:07:19 +0200
+
jasperreports3.7 (3.7.4+dfsg-3) unstable; urgency=low
* Team upload.
Modified: trunk/jasperreports3.7/debian/orig-tar.exclude
===================================================================
--- trunk/jasperreports3.7/debian/orig-tar.exclude 2013-08-05 16:02:29 UTC (rev 17113)
+++ trunk/jasperreports3.7/debian/orig-tar.exclude 2013-08-05 20:13:49 UTC (rev 17114)
@@ -3,3 +3,5 @@
dist/*
demo/*
src/org/w3c/tools/codec/Base64*
+.classpath
+.project
Modified: trunk/jasperreports3.7/debian/patches/07_exclude_barcode4j_and_barbecue.diff
===================================================================
--- trunk/jasperreports3.7/debian/patches/07_exclude_barcode4j_and_barbecue.diff 2013-08-05 16:02:29 UTC (rev 17113)
+++ trunk/jasperreports3.7/debian/patches/07_exclude_barcode4j_and_barbecue.diff 2013-08-05 20:13:49 UTC (rev 17114)
@@ -47,7 +47,7 @@
spiderChartManager.setComponentCompiler(new SpiderChartCompiler());
--- a/src/net/sf/jasperreports/components/ComponentsXmlHandler.java
+++ b/src/net/sf/jasperreports/components/ComponentsXmlHandler.java
-@@ -28,24 +28,24 @@
+@@ -28,24 +28,6 @@
import net.sf.jasperreports.charts.design.JRDesignCategorySeries;
import net.sf.jasperreports.charts.xml.JRCategorySeriesFactory;
@@ -69,28 +69,10 @@
-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;
- import net.sf.jasperreports.components.list.ListComponent;
- import net.sf.jasperreports.components.list.ListContents;
-@@ -107,8 +107,6 @@
+@@ -107,8 +89,6 @@
public void configureDigester(Digester digester)
{
addListRules(digester);
@@ -99,7 +81,7 @@
addTableRules(digester);
addSpiderChartRules(digester);
}
-@@ -130,103 +128,6 @@
+@@ -130,103 +110,6 @@
digester.addSetNext(listContentsPattern, "setContents");
}
@@ -203,7 +185,7 @@
protected void addTableRules(Digester digester)
{
String tablePattern = "*/componentElement/table";
-@@ -318,18 +219,6 @@
+@@ -318,18 +201,6 @@
TableComponent table = (TableComponent) component;
writeTable(table, componentKey, reportWriter);
}
@@ -222,7 +204,7 @@
else if (component instanceof SpiderChartComponent)
{
SpiderChartComponent spiderChart = (SpiderChartComponent) component;
-@@ -362,39 +251,6 @@
+@@ -362,39 +233,6 @@
writer.closeElement();
}
Modified: trunk/jasperreports3.7/debian/patches/08_no_maxmemory_for_javadoc.diff
===================================================================
--- trunk/jasperreports3.7/debian/patches/08_no_maxmemory_for_javadoc.diff 2013-08-05 16:02:29 UTC (rev 17113)
+++ trunk/jasperreports3.7/debian/patches/08_no_maxmemory_for_javadoc.diff 2013-08-05 20:13:49 UTC (rev 17114)
@@ -4,7 +4,7 @@
Last-Update: 2010-04-20
--- a/build.xml
+++ b/build.xml
-@@ -417,7 +417,6 @@
+@@ -354,7 +354,6 @@
use="true"
windowtitle="JasperReports ${version} API"
excludepackagenames="org.w3c.tools.codec"
Modified: trunk/jasperreports3.7/debian/patches/09_use_commons_codec.diff
===================================================================
--- trunk/jasperreports3.7/debian/patches/09_use_commons_codec.diff 2013-08-05 16:02:29 UTC (rev 17113)
+++ trunk/jasperreports3.7/debian/patches/09_use_commons_codec.diff 2013-08-05 20:13:49 UTC (rev 17114)
@@ -89,29 +89,28 @@
{
--- a/src/net/sf/jasperreports/engine/xml/JRPrintImageSourceObject.java
+++ b/src/net/sf/jasperreports/engine/xml/JRPrintImageSourceObject.java
-@@ -30,8 +30,7 @@
- import net.sf.jasperreports.engine.JRImageRenderer;
- import net.sf.jasperreports.engine.JRPrintImage;
-
--import org.w3c.tools.codec.Base64Decoder;
--
-+import org.apache.commons.codec.binary.Base64;
-
- /**
- * @author Teodor Danciu (teodord at users.sourceforge.net)
-@@ -79,13 +78,8 @@
- {
- try
- {
-- ByteArrayInputStream bais = new ByteArrayInputStream(imageSource.getBytes("UTF-8"));//FIXMENOW other encodings ?
-- ByteArrayOutputStream baos = new ByteArrayOutputStream();
--
-- Base64Decoder decoder = new Base64Decoder(bais, baos);
-- decoder.process();
--
-- printImage.setRenderer(JRImageRenderer.getInstance(baos.toByteArray()));//, JRImage.ON_ERROR_TYPE_ERROR));
-+ byte[] decodedBytes = Base64.decodeBase64(imageSource.getBytes("UTF-8")); //FIXMENOW other encodings ?
-+ printImage.setRenderer(JRImageRenderer.getInstance(decodedBytes));//, JRImage.ON_ERROR_TYPE_ERROR));
- }
- catch (Exception e)
- {
+@@ -30,7 +30,7 @@
+ import net.sf.jasperreports.engine.JRImageRenderer;
+ import net.sf.jasperreports.engine.JRPrintImage;
+
+-import org.w3c.tools.codec.Base64Decoder;
++import org.apache.commons.codec.binary.Base64;
+
+
+ /**
+@@ -79,13 +79,8 @@
+ {
+ try
+ {
+- ByteArrayInputStream bais = new ByteArrayInputStream(imageSource.getBytes("UTF-8"));//FIXMENOW other encodings ?
+- ByteArrayOutputStream baos = new ByteArrayOutputStream();
+-
+- Base64Decoder decoder = new Base64Decoder(bais, baos);
+- decoder.process();
+-
+- printImage.setRenderer(JRImageRenderer.getInstance(baos.toByteArray()));//, JRImage.ON_ERROR_TYPE_ERROR));
++ byte[] decodedBytes = Base64.decodeBase64(imageSource.getBytes("UTF-8")); //FIXMENOW other encodings ?
++ printImage.setRenderer(JRImageRenderer.getInstance(decodedBytes));//, JRImage.ON_ERROR_TYPE_ERROR));
+ }
+ catch (Exception e)
+ {
Modified: trunk/jasperreports3.7/debian/patches/12_samples.diff
===================================================================
--- trunk/jasperreports3.7/debian/patches/12_samples.diff 2013-08-05 16:02:29 UTC (rev 17113)
+++ trunk/jasperreports3.7/debian/patches/12_samples.diff 2013-08-05 20:13:49 UTC (rev 17114)
@@ -4,7 +4,7 @@
Forwarded: no
--- a/build.xml
+++ b/build.xml
-@@ -525,6 +525,6 @@
+@@ -462,6 +462,6 @@
</copy>
</target>
More information about the pkg-java-commits
mailing list