This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository jasperreports.
commit 66cba71cbb9005fa8ad1526d2efaf8b487f2060a
Author: Emmanuel Bourg <ebo...@apache.org>
Date: Mon Dec 11 10:54:54 2017 +0100
Refreshed the patches
---
debian/changelog | 2 +-
debian/patches/build.patch | 26 ++++++++++++++--------
.../patches/exclude-barcode4j-and-barbecue.patch | 2 +-
debian/patches/no-commons-javaflow.patch | 8 ++++++-
4 files changed, 26 insertions(+), 12 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a05bb31..8d1ebb3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-jasperreports (6.3.0-1) UNRELEASED; urgency=medium
+jasperreports (6.3.1-1) UNRELEASED; urgency=medium
* Team upload.
* New upstream release
diff --git a/debian/patches/build.patch b/debian/patches/build.patch
index c8180c1..92a59fe 100644
--- a/debian/patches/build.patch
+++ b/debian/patches/build.patch
@@ -9,7 +9,7 @@ Forwarded: not-needed
<description>Helps build the JasperReports distribution
files.</description>
- <property name="version" value="6.3.0"/>
+ <property name="version" value="6.3.1"/>
<path id="project-classpath">
- <path refid="project-lib"/>
@@ -56,7 +56,15 @@ Forwarded: not-needed
<javac destdir="./build/classes" debug="true" optimize="false"
deprecation="true" target="1.7" source="1.7"
encoding="ISO-8859-1" includeantruntime="false"
excludes="**/package-info.java">
<classpath refid="project-classpath"/>
-@@ -66,7 +96,6 @@
+@@ -53,7 +83,6 @@
+ </target>
+ <target name="antlr.gen-json" description="Generates source files for
the JSON query language ANTLR grammar">
+ <mkdir dir="./build/antlr-generated-sources"/>
+- <ivy:cachepath pathid="project-lib" log="download-only"
conf="compile"/>
+ <antlr
target="src/net/sf/jasperreports/engine/json/parser/json_grammar.g">
+ <classpath refid="project-classpath"/>
+ </antlr>
+@@ -73,7 +102,6 @@
<target name="alljars" depends="jar, javaflow, fonts"
description="Builds all JasperReports JAR files."/>
<target name="javaflow" depends="compile" description="Builds the
JavaFlow instrumentated JAR file.">
@@ -64,7 +72,7 @@ Forwarded: not-needed
<taskdef name="javaflow"
classname="net.sf.jasperreports.ant.JavaflowRewriteTask">
<classpath refid="project-classpath"/>
</taskdef>
-@@ -136,7 +165,6 @@
+@@ -143,7 +171,6 @@
<delete>
<fileset dir="./dist/docs/api" includes="**/*.*" />
</delete>
@@ -72,7 +80,7 @@ Forwarded: not-needed
<condition property="javadoc-arg" value="-Xdoclint:none"
else="">
<or>
<matches pattern="1.8.*"
string="${java.version}"/>
-@@ -196,7 +224,6 @@
+@@ -203,7 +230,6 @@
</target>
<target name="schemaref" description="Generates the Schema Reference.">
@@ -80,7 +88,7 @@ Forwarded: not-needed
<xslt basedir="src/net/sf/jasperreports/engine/dtds"
in="src/net/sf/jasperreports/engine/dtds/jasperreport.xsd" destdir="dist/docs"
style="docs/schema.reference.xsl" out="./dist/docs/schema.reference.html">
<param name="sf.net" expression="${sf.net}"/>
<param name="version" expression="${version}"/>
-@@ -205,7 +232,6 @@
+@@ -212,7 +238,6 @@
</target>
<target name="partschemaref" description="Generates the Report Parts
Schema Reference.">
@@ -88,7 +96,7 @@ Forwarded: not-needed
<xslt basedir="src/net/sf/jasperreports/parts"
in="src/net/sf/jasperreports/parts/parts.xsd" destdir="dist/docs"
style="docs/parts.schema.reference.xsl"
out="./dist/docs/parts.schema.reference.html">
<param name="sf.net" expression="${sf.net}"/>
<param name="version" expression="${version}"/>
-@@ -214,7 +240,6 @@
+@@ -221,7 +246,6 @@
</target>
<target name="componentschemaref" description="Generates the Component
Schema Reference.">
@@ -96,7 +104,7 @@ Forwarded: not-needed
<xslt basedir="src/net/sf/jasperreports/components"
in="src/net/sf/jasperreports/components/components.xsd" destdir="dist/docs"
style="docs/components.schema.reference.xsl"
out="./dist/docs/components.schema.reference.html">
<param name="sf.net" expression="${sf.net}"/>
<param name="version" expression="${version}"/>
-@@ -223,7 +248,6 @@
+@@ -230,7 +254,6 @@
</target>
<target name="configref" description="Generates the Configuration
Reference.">
@@ -104,7 +112,7 @@ Forwarded: not-needed
<xslt basedir="docs" in="docs/config.reference.xml"
destdir="dist/docs" style="docs/config.reference.xsl"
out="./dist/docs/config.reference.html">
<param name="sf.net" expression="${sf.net}"/>
<param name="version" expression="${version}"/>
-@@ -232,7 +256,6 @@
+@@ -239,7 +262,6 @@
</target>
<target name="sampleref" depends="compile" description="Generates the
Sample Reference.">
@@ -112,7 +120,7 @@ Forwarded: not-needed
<xslt basedir="docs" in="docs/sample.reference.xml"
destdir="dist/docs" style="docs/sample.reference.xsl"
out="./dist/docs/sample.reference.html">
<param name="sf.net" expression="${sf.net}"/>
<param name="version" expression="${version}"/>
-@@ -270,6 +293,5 @@
+@@ -277,6 +299,5 @@
<target name="docs" depends="preparedocs, javadoc, schemaref,
partschemaref, componentschemaref, configref, sampleref" description="Generates
all documentation."/>
<target name="retrievelibs" description="Retrieve dependencies with
Apache Ivy">
diff --git a/debian/patches/exclude-barcode4j-and-barbecue.patch
b/debian/patches/exclude-barcode4j-and-barbecue.patch
index a9b4923..2b5e224 100644
--- a/debian/patches/exclude-barcode4j-and-barbecue.patch
+++ b/debian/patches/exclude-barcode4j-and-barbecue.patch
@@ -335,7 +335,7 @@ Forwarded: not-needed
}
--- a/jasperreports/pom.xml
+++ b/jasperreports/pom.xml
-@@ -112,6 +112,10 @@
+@@ -109,6 +109,10 @@
<source>1.7</source>
<target>1.7</target>
<encoding>UTF-8</encoding>
diff --git a/debian/patches/no-commons-javaflow.patch
b/debian/patches/no-commons-javaflow.patch
index 3ea0df8..106bf95 100644
--- a/debian/patches/no-commons-javaflow.patch
+++ b/debian/patches/no-commons-javaflow.patch
@@ -3,7 +3,7 @@ Author: Markus Koschany <a...@debian.org>
Forwarded: not-needed
---
a/jasperreports/src/net/sf/jasperreports/engine/fill/JRContinuationSubreportRunner.java
+++ /dev/null
-@@ -1,81 +0,0 @@
+@@ -1,87 +0,0 @@
-/*
- * JasperReports - Free Java Reporting Library.
- * Copyright (C) 2001 - 2016 TIBCO Software Inc. All rights reserved.
@@ -84,6 +84,12 @@ Forwarded: not-needed
- {
- Continuation.suspend();
- }
+-
+- @Override
+- public void abort()
+- {
+- //NOP
+- }
-}
---
a/jasperreports/src/net/sf/jasperreports/engine/fill/JRContinuationSubreportRunnerFactory.java
+++ /dev/null
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/jasperreports.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
