[pkg-java] r10369 - in trunk/jasperreports/debian: . patches
Damien Raude-Morvan
drazzib-guest at alioth.debian.org
Mon Sep 14 21:01:36 UTC 2009
Author: drazzib-guest
Date: 2009-09-14 21:01:35 +0000 (Mon, 14 Sep 2009)
New Revision: 10369
Modified:
trunk/jasperreports/debian/changelog
trunk/jasperreports/debian/copyright
trunk/jasperreports/debian/patches/01_exclude_olap_and_jpa.diff
trunk/jasperreports/debian/patches/02_use_debian_asm.diff
trunk/jasperreports/debian/patches/03_use_pngencoder_from_jcommon.diff
trunk/jasperreports/debian/patches/06_configure_javaflow.diff
trunk/jasperreports/debian/patches/07_exclude_barcode4j_and_barbecue.diff
trunk/jasperreports/debian/patches/08_no_maxmemory_for_javadoc.diff
trunk/jasperreports/debian/patches/09_use_commons_codec.diff
Log:
[jasperreports]
jasperreports (3.6.0+dfsg-1) UNRELEASED; urgency=low
* New upstream release.
* Refresh all debian/patches
* debian/copyright: Change upstream license to LGPLv3
-- Damien Raude-Morvan <drazzib at drazzib.com> Mon, 14 Sep 2009 22:55:20 +0200
Modified: trunk/jasperreports/debian/changelog
===================================================================
--- trunk/jasperreports/debian/changelog 2009-09-14 20:52:44 UTC (rev 10368)
+++ trunk/jasperreports/debian/changelog 2009-09-14 21:01:35 UTC (rev 10369)
@@ -1,3 +1,11 @@
+jasperreports (3.6.0+dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * Refresh all debian/patches
+ * debian/copyright: Change upstream license to LGPLv3
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com> Mon, 14 Sep 2009 22:55:20 +0200
+
jasperreports (3.5.3+dfsg-1) unstable; urgency=low
* Initial release. (Closes: #281346)
Modified: trunk/jasperreports/debian/copyright
===================================================================
--- trunk/jasperreports/debian/copyright 2009-09-14 20:52:44 UTC (rev 10368)
+++ trunk/jasperreports/debian/copyright 2009-09-14 21:01:35 UTC (rev 10369)
@@ -26,23 +26,27 @@
License:
- This library 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 2.1 of the License, or (at your option) any later version.
+ Unless you have purchased a commercial license agreement from Jaspersoft,
+ the following license terms apply:
- This library 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.
+ This program is part of JasperReports.
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA.
+ 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.
-The full text of the LGPL 2.1 license can be found in
-`/usr/share/common-licenses/LGPL-2.1' on Debian systems.
+ 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 :
Modified: trunk/jasperreports/debian/patches/01_exclude_olap_and_jpa.diff
===================================================================
--- trunk/jasperreports/debian/patches/01_exclude_olap_and_jpa.diff 2009-09-14 20:52:44 UTC (rev 10368)
+++ trunk/jasperreports/debian/patches/01_exclude_olap_and_jpa.diff 2009-09-14 21:01:35 UTC (rev 10369)
@@ -4,12 +4,14 @@
Last-Update: 2009-08-30
--- a/build.xml
+++ b/build.xml
-@@ -13,8 +13,8 @@
+@@ -13,9 +13,9 @@
</or>
</condition>
<javac destdir="./build/classes" debug="true" optimize="false" deprecation="true" target="1.4" source="1.4" encoding="ISO-8859-1">
+- <exclude name="**/net/sf/jasperreports/engine/util/Java15BigDecimalHandler.java" unless="using.jdk.1.5"/>
- <exclude name="**/olap/**/*.java" unless="using.jdk.1.5"/>
- <exclude name="**/JRJpa*.java" unless="using.jdk.1.5"/>
++ <exclude name="**/net/sf/jasperreports/engine/util/Java15BigDecimalHandler.java"/>
+ <exclude name="**/olap/**/*.java"/>
+ <exclude name="**/JRJpa*.java"/>
<classpath>
Modified: trunk/jasperreports/debian/patches/02_use_debian_asm.diff
===================================================================
--- trunk/jasperreports/debian/patches/02_use_debian_asm.diff 2009-09-14 20:52:44 UTC (rev 10368)
+++ trunk/jasperreports/debian/patches/02_use_debian_asm.diff 2009-09-14 21:01:35 UTC (rev 10369)
@@ -5,7 +5,7 @@
Last-Update: 2009-07-16
--- a/src/net/sf/jasperreports/compilers/JRGroovyCompiler.java
+++ b/src/net/sf/jasperreports/compilers/JRGroovyCompiler.java
-@@ -32,8 +32,8 @@
+@@ -28,8 +28,8 @@
*/
package net.sf.jasperreports.compilers;
@@ -16,7 +16,7 @@
import java.io.ByteArrayInputStream;
import java.io.File;
-@@ -171,4 +171,4 @@
+@@ -167,4 +167,4 @@
}
Modified: trunk/jasperreports/debian/patches/03_use_pngencoder_from_jcommon.diff
===================================================================
--- trunk/jasperreports/debian/patches/03_use_pngencoder_from_jcommon.diff 2009-09-14 20:52:44 UTC (rev 10368)
+++ trunk/jasperreports/debian/patches/03_use_pngencoder_from_jcommon.diff 2009-09-14 21:01:35 UTC (rev 10369)
@@ -6,7 +6,7 @@
Last-Update: 2009-07-16
--- a/src/net/sf/jasperreports/engine/util/JRDefaultImageEncoder.java
+++ b/src/net/sf/jasperreports/engine/util/JRDefaultImageEncoder.java
-@@ -31,10 +31,11 @@
+@@ -27,10 +27,11 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
@@ -19,7 +19,7 @@
import com.sun.image.codec.jpeg.JPEGCodec;
import com.sun.image.codec.jpeg.JPEGEncodeParam;
import com.sun.image.codec.jpeg.JPEGImageEncoder;
-@@ -59,25 +60,26 @@
+@@ -55,25 +56,26 @@
{
case JRRenderable.IMAGE_TYPE_PNG :
{
Modified: trunk/jasperreports/debian/patches/06_configure_javaflow.diff
===================================================================
--- trunk/jasperreports/debian/patches/06_configure_javaflow.diff 2009-09-14 20:52:44 UTC (rev 10368)
+++ trunk/jasperreports/debian/patches/06_configure_javaflow.diff 2009-09-14 21:01:35 UTC (rev 10369)
@@ -5,7 +5,7 @@
Last-Update: 2009-07-16
--- a/build.xml
+++ b/build.xml
-@@ -88,12 +88,24 @@
+@@ -89,12 +89,24 @@
</replace>
<javaflow srcdir="./build/javaflow" dstdir="./build/javaflow" mode="bcel">
Modified: trunk/jasperreports/debian/patches/07_exclude_barcode4j_and_barbecue.diff
===================================================================
--- trunk/jasperreports/debian/patches/07_exclude_barcode4j_and_barbecue.diff 2009-09-14 20:52:44 UTC (rev 10368)
+++ trunk/jasperreports/debian/patches/07_exclude_barcode4j_and_barbecue.diff 2009-09-14 21:01:35 UTC (rev 10369)
@@ -8,7 +8,7 @@
Last-Update: 2009-08-30
--- a/src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java
+++ b/src/net/sf/jasperreports/components/ComponentsExtensionsRegistryFactory.java
-@@ -31,12 +31,6 @@
+@@ -27,12 +27,6 @@
import java.util.HashMap;
import java.util.List;
@@ -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;
-@@ -102,23 +96,6 @@
+@@ -98,23 +92,6 @@
listManager.setComponentFillFactory(new FillListFactory());
componentManagers.put(LIST_COMPONENT_NAME, listManager);
@@ -47,7 +47,7 @@
REGISTRY = new ExtensionsRegistry()
--- a/src/net/sf/jasperreports/components/ComponentsXmlHandler.java
+++ b/src/net/sf/jasperreports/components/ComponentsXmlHandler.java
-@@ -29,24 +29,6 @@
+@@ -25,24 +25,6 @@
import java.io.IOException;
@@ -72,7 +72,7 @@
import net.sf.jasperreports.components.list.DesignListContents;
import net.sf.jasperreports.components.list.ListComponent;
import net.sf.jasperreports.components.list.ListContents;
-@@ -78,8 +60,6 @@
+@@ -74,8 +56,6 @@
public void configureDigester(Digester digester)
{
addListRules(digester);
@@ -81,7 +81,7 @@
}
protected void addListRules(Digester digester)
-@@ -93,103 +73,6 @@
+@@ -89,103 +69,6 @@
digester.addSetNext(listContentsPattern, "setContents");
}
@@ -185,7 +185,7 @@
public void writeToXml(ComponentKey componentKey, Component component,
JRXmlWriter reportWriter) throws IOException
{
-@@ -198,18 +81,6 @@
+@@ -194,18 +77,6 @@
ListComponent list = (ListComponent) component;
writeList(list, componentKey, reportWriter);
}
@@ -204,7 +204,7 @@
}
protected void writeList(ListComponent list, ComponentKey componentKey,
-@@ -234,38 +105,4 @@
+@@ -230,38 +101,4 @@
writer.closeElement();
}
@@ -245,8 +245,8 @@
}
--- a/build.xml
+++ b/build.xml
-@@ -15,6 +15,8 @@
- <javac destdir="./build/classes" debug="true" optimize="false" deprecation="true" target="1.4" source="1.4" encoding="ISO-8859-1">
+@@ -16,6 +16,8 @@
+ <exclude name="**/net/sf/jasperreports/engine/util/Java15BigDecimalHandler.java" unless="using.jdk.1.5"/>
<exclude name="**/olap/**/*.java"/>
<exclude name="**/JRJpa*.java"/>
+ <exclude name="**/barcode4j/*.java"/>
Modified: trunk/jasperreports/debian/patches/08_no_maxmemory_for_javadoc.diff
===================================================================
--- trunk/jasperreports/debian/patches/08_no_maxmemory_for_javadoc.diff 2009-09-14 20:52:44 UTC (rev 10368)
+++ trunk/jasperreports/debian/patches/08_no_maxmemory_for_javadoc.diff 2009-09-14 21:01:35 UTC (rev 10369)
@@ -4,11 +4,11 @@
Last-Update: 2009-08-30
--- a/build.xml
+++ b/build.xml
-@@ -306,7 +306,6 @@
+@@ -309,7 +309,6 @@
use="true"
windowtitle="JasperReports API version ${version}"
excludepackagenames="org.w3c.tools.codec"
- maxmemory="128m"
encoding="ISO-8859-1">
<doctitle><![CDATA[<span style="font-family:verdana,arial,helvetica,sans-serif;font-size:16pt;font-style:normal;color:#000000;"><b><font color="#808080">Jasper</font><font color="#990000">Reports</font></b></span><br><span style="font-family:verdana,arial,helvetica,sans-serif;font-size:10pt;font-weight:bold;color:#000000;">version ${version}</span>]]></doctitle>
- <bottom><![CDATA[<span style="font-decoration:none;font-family:verdana,arial,helvetica,sans-serif;font-size:8pt;font-style:normal;color:#000000;">© 2001-2009 JasperSoft Corporation <a href="http://www.jaspersoft.com" target="_blank" style="color:#000000;">www.jaspersoft.com</a></span>]]></bottom>
+ <bottom><![CDATA[<span style="font-decoration:none;font-family:verdana,arial,helvetica,sans-serif;font-size:8pt;font-style:normal;color:#000000;">© 2001-2009 Jaspersoft Corporation <a href="http://www.jaspersoft.com" target="_blank" style="color:#000000;">www.jaspersoft.com</a></span>]]></bottom>
Modified: trunk/jasperreports/debian/patches/09_use_commons_codec.diff
===================================================================
--- trunk/jasperreports/debian/patches/09_use_commons_codec.diff 2009-09-14 20:52:44 UTC (rev 10368)
+++ trunk/jasperreports/debian/patches/09_use_commons_codec.diff 2009-09-14 21:01:35 UTC (rev 10369)
@@ -5,7 +5,7 @@
Last-Update: 2009-08-29
--- a/src/net/sf/jasperreports/engine/export/JRXmlExporter.java
+++ b/src/net/sf/jasperreports/engine/export/JRXmlExporter.java
-@@ -90,7 +90,7 @@
+@@ -86,7 +86,7 @@
import net.sf.jasperreports.engine.util.JRXmlWriteHelper;
import net.sf.jasperreports.engine.xml.JRXmlConstants;
@@ -14,7 +14,7 @@
/**
-@@ -818,13 +818,8 @@
+@@ -814,13 +814,8 @@
{
try
{
@@ -32,7 +32,7 @@
{
--- a/src/net/sf/jasperreports/engine/util/JRValueStringUtils.java
+++ b/src/net/sf/jasperreports/engine/util/JRValueStringUtils.java
-@@ -36,9 +36,7 @@
+@@ -32,9 +32,7 @@
import java.util.HashMap;
import java.util.Map;
@@ -43,7 +43,7 @@
import net.sf.jasperreports.engine.JRRuntimeException;
-@@ -463,12 +461,9 @@
+@@ -459,12 +457,9 @@
{
try
{
@@ -58,7 +58,7 @@
ObjectInputStream objectIn = new ObjectInputStream(bytesIn);
return objectIn.readObject();
}
-@@ -480,10 +475,6 @@
+@@ -476,10 +471,6 @@
{
throw new JRRuntimeException(e);
}
@@ -69,7 +69,7 @@
}
public String serialize(Object value)
-@@ -495,13 +486,8 @@
+@@ -491,13 +482,8 @@
objectOut.writeObject(value);
objectOut.close();
@@ -87,7 +87,7 @@
{
--- a/src/net/sf/jasperreports/engine/xml/JRPrintImageSourceObject.java
+++ b/src/net/sf/jasperreports/engine/xml/JRPrintImageSourceObject.java
-@@ -34,8 +34,7 @@
+@@ -30,8 +30,7 @@
import net.sf.jasperreports.engine.JRImageRenderer;
import net.sf.jasperreports.engine.JRPrintImage;
@@ -97,7 +97,7 @@
/**
* @author Teodor Danciu (teodord at users.sourceforge.net)
-@@ -83,13 +82,8 @@
+@@ -79,13 +78,8 @@
{
try
{
More information about the pkg-java-commits
mailing list