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

Damien Raude-Morvan drazzib at alioth.debian.org
Tue Feb 22 21:24:57 UTC 2011 

Author: drazzib
Date: 2011-02-22 21:24:49 +0000 (Tue, 22 Feb 2011)
New Revision: 13344

Modified:
   trunk/jasperreports/debian/changelog
   trunk/jasperreports/debian/copyright
   trunk/jasperreports/debian/patches/06_configure_javaflow.diff
   trunk/jasperreports/debian/patches/07_exclude_barcode4j_and_barbecue.diff
   trunk/jasperreports/debian/patches/09_use_commons_codec.diff
   trunk/jasperreports/debian/patches/12_samples.diff
Log:
* 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/patches/09_use_commons_codec.diff: Refreshed.
* d/copyright: Use DEP-5 format.

Modified: trunk/jasperreports/debian/changelog
===================================================================
--- trunk/jasperreports/debian/changelog	2011-02-22 21:14:12 UTC (rev 13343)
+++ trunk/jasperreports/debian/changelog	2011-02-22 21:24:49 UTC (rev 13344)
@@ -1,3 +1,14 @@
+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/patches/09_use_commons_codec.diff: Refreshed.
+  * d/copyright: Use DEP-5 format.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 22 Feb 2011 22:17:30 +0100
+
 jasperreports (3.7.4+dfsg-1) unstable; urgency=low
 
   * New upstream release:

Modified: trunk/jasperreports/debian/copyright
===================================================================
--- trunk/jasperreports/debian/copyright	2011-02-22 21:14:12 UTC (rev 13343)
+++ trunk/jasperreports/debian/copyright	2011-02-22 21:24:49 UTC (rev 13344)
@@ -1,10 +1,43 @@
-This package was debianized by Damien Raude-Morvan <drazzib at debian.org> on
-Thu, 27 Aug 2008 20:59:38 +0200.
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
+Upstream-Name: JasperReports
+Upstream-Contact: http://jasperforge.org/index.php?q=project/jasperreports
+Source: http://sourceforge.net/projects/jasperreports/files/jasperreports/
+Comment:
+ The upstream tarball as been stripped to make a DFSG-compliant version.
+ Items removed from upstream :
+ - all packaged JAR
+ - generated Javadoc
+ - non-DFSG-compliant Base64 encoder/decoder under W3C license
+ Repacking can be done using debian/orig-tar.sh script.
+ Excluded files are listed in debian/orig-tar.exclude.
 
-It was downloaded from
-    http://sourceforge.net/projects/jasperreports/files/
 
-Upstreams Authors:
+Files: *
+Copyright: Copyright (C) 2001-2009 JasperSoft Corporation
+Copyright: Copyright (C) 2005 Works
+License: LGPL-3+
+ Unless you have purchased a commercial license agreement from Jaspersoft,
+ the following license terms apply:
+ .
+ This program is part of JasperReports.
+ .
+ JasperReports is free software: you can redistribute it and/or modify
+ it under the terms of the GNU Lesser General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ JasperReports is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU Lesser General Public License for more details.
+ .
+ You should have received a copy of the GNU Lesser General Public License
+ along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
+ .
+ The full text of the LGPL 3 license can be found in
+ `/usr/share/common-licenses/LGPL-3' on Debian systems.
+Comment:
+ Upstreams Authors:
     Teodor Danciu <teodord at users.sourceforge.net>
     Lucian Chirita <lucianc at users.sourceforge.net>
     Sanda Zaharia <shertage at users.sourceforge.net>
@@ -20,42 +53,8 @@
     John Bindel <jbindel at works.com>
     Michael McMahon <Michael.McMahon at activewire.net>
 
-Copyright:
-    Copyright (C) 2001-2009 JasperSoft Corporation
-    Copyright (C) 2005 Works
-
-License:
-
-  Unless you have purchased a commercial license agreement from Jaspersoft,
-  the following license terms apply:
-
-  This program is part of JasperReports.
-
-  JasperReports is free software: you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation, either version 3 of the License, or
-  (at your option) any later version.
-
-  JasperReports is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-  GNU Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with JasperReports. If not, see <http://www.gnu.org/licenses/>.
-
-The full text of the LGPL 3 license can be found in
-`/usr/share/common-licenses/LGPL-3' on Debian systems.
-
-Note:
-  The upstream tarball as been stripped to make a DFSG-compliant version.
-  Items removed from upstream :
-  - all packaged JAR
-  - generated Javadoc
-  - non-DFSG-compliant Base64 encoder/decoder under W3C license
-  Repacking can be done using debian/orig-tar.sh script.
-  Excluded files are listed in debian/orig-tar.exclude.
-
-The Debian packaging is
-Copyright 2008-2009 Damien Raude-Morvan <drazzib at debian.org>
-and is licensed under the LGPL 2.1, see `/usr/share/common-licenses/LGPL-2.1'.
+Files: *
+Copyright: Copyright 2008-2011 Damien Raude-Morvan <drazzib at debian.org>
+License: LGPL-3+
+ The full text of the LGPL 3 license can be found in
+ `/usr/share/common-licenses/LGPL-3' on Debian systems.
\ No newline at end of file

Modified: trunk/jasperreports/debian/patches/06_configure_javaflow.diff
===================================================================
--- trunk/jasperreports/debian/patches/06_configure_javaflow.diff	2011-02-22 21:14:12 UTC (rev 13343)
+++ trunk/jasperreports/debian/patches/06_configure_javaflow.diff	2011-02-22 21:24:49 UTC (rev 13344)
@@ -1,14 +1,17 @@
 Description: build.xml: configure <javaflow> ant task.
  Include missing elements from upstream classpath.
+ Replace dstdir parameter by destdir (Javaflow 20100908)
 Author: Damien Raude-Morvan <drazzib at debian.org>
 Forwarded: not-needed
-Last-Update: 2010-04-20
+Last-Update: 2010-09-17
 --- a/build.xml
 +++ b/build.xml
-@@ -82,12 +82,25 @@
+@@ -81,13 +81,26 @@
+ 			value="net.sf.jasperreports.engine.fill.JRContinuationSubreportRunnerFactory">
  		</replace>
  
- 		<javaflow srcdir="./build/javaflow" dstdir="./build/javaflow" mode="bcel">
+-		<javaflow srcdir="./build/javaflow" dstdir="./build/javaflow" mode="bcel">
++		<javaflow srcdir="./build/javaflow" destdir="./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"/>

Modified: trunk/jasperreports/debian/patches/07_exclude_barcode4j_and_barbecue.diff
===================================================================
--- trunk/jasperreports/debian/patches/07_exclude_barcode4j_and_barbecue.diff	2011-02-22 21:14:12 UTC (rev 13343)
+++ trunk/jasperreports/debian/patches/07_exclude_barcode4j_and_barbecue.diff	2011-02-22 21:24:49 UTC (rev 13344)
@@ -87,10 +87,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.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 @@
+@@ -108,8 +108,6 @@
  	public void configureDigester(Digester digester)
  	{
  		addListRules(digester);
@@ -99,7 +99,7 @@
  		addTableRules(digester);
  		addSpiderChartRules(digester);
  	}
-@@ -130,103 +128,6 @@
+@@ -131,107 +129,6 @@
  		digester.addSetNext(listContentsPattern, "setContents");
  	}
  
@@ -109,12 +109,16 @@
 -		digester.addObjectCreate(barcodePattern, StandardBarbecueComponent.class);
 -		digester.addSetProperties(barcodePattern,
 -				//properties to be ignored by this rule
--				new String[]{JRXmlConstants.ATTRIBUTE_evaluationTime}, 
+-				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, 
@@ -203,7 +207,7 @@
  	protected void addTableRules(Digester digester)
  	{
  		String tablePattern = "*/componentElement/table";
-@@ -318,18 +219,6 @@
+@@ -323,18 +220,6 @@
  			TableComponent table = (TableComponent) component;
  			writeTable(table, componentKey, reportWriter);
  		}
@@ -222,7 +226,7 @@
  		else if (component instanceof SpiderChartComponent)
  		{
  			SpiderChartComponent spiderChart = (SpiderChartComponent) component;
-@@ -362,39 +251,6 @@
+@@ -367,40 +252,6 @@
  		
  		writer.closeElement();
  	}
@@ -244,6 +248,7 @@
 -		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, 

Modified: trunk/jasperreports/debian/patches/09_use_commons_codec.diff
===================================================================
--- trunk/jasperreports/debian/patches/09_use_commons_codec.diff	2011-02-22 21:14:12 UTC (rev 13343)
+++ trunk/jasperreports/debian/patches/09_use_commons_codec.diff	2011-02-22 21:24:49 UTC (rev 13344)
@@ -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/jasperreports/debian/patches/12_samples.diff
===================================================================
--- trunk/jasperreports/debian/patches/12_samples.diff	2011-02-22 21:14:12 UTC (rev 13343)
+++ trunk/jasperreports/debian/patches/12_samples.diff	2011-02-22 21:24:49 UTC (rev 13344)
@@ -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