Author: drazzib
Date: 2010-02-06 21:13:23 +0000 (Sat, 06 Feb 2010)
New Revision: 11523
Added:
trunk/jasperreports/debian/libjasperreports-java-doc.install
trunk/jasperreports/debian/patches/01_exclude_jpa.diff
Removed:
trunk/jasperreports/debian/patches/01_exclude_olap_and_jpa.diff
trunk/jasperreports/debian/patches/12_itext.diff
Modified:
trunk/jasperreports/debian/changelog
trunk/jasperreports/debian/control
trunk/jasperreports/debian/libjasperreports-java-doc.doc-base.config
trunk/jasperreports/debian/libjasperreports-java-doc.doc-base.schema
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/11_pom.diff
trunk/jasperreports/debian/patches/series
trunk/jasperreports/debian/rules
Log:
* 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)
Modified: trunk/jasperreports/debian/changelog
===================================================================
--- trunk/jasperreports/debian/changelog 2010-02-06 20:25:58 UTC (rev
11522)
+++ trunk/jasperreports/debian/changelog 2010-02-06 21:13:23 UTC (rev
11523)
@@ -1,3 +1,17 @@
+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 <draz...@debian.org> Sat, 06 Feb 2010 22:03:56 +0100
+
jasperreports (3.7.0+dfsg-1) unstable; urgency=low
* New upstream release
Modified: trunk/jasperreports/debian/control
===================================================================
--- trunk/jasperreports/debian/control 2010-02-06 20:25:58 UTC (rev 11522)
+++ trunk/jasperreports/debian/control 2010-02-06 21:13:23 UTC (rev 11523)
@@ -11,8 +11,9 @@
libecj-java, libxalan2-java, libjaxen-java, libxml-commons-external-java,
libjexcelapi-java, libjakarta-poi-java (>= 3.2), libitext-java,
libbatik-java (>= 1.7), libjfreechart-java, libhibernate3-java,
- glassfish-javaee, maven-repo-helper
-Standards-Version: 3.8.3
+ glassfish-javaee, maven-repo-helper, libmondrian-java, libolap4j-java,
+ libantlr-java
+Standards-Version: 3.8.4
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/jasperreports/
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/jasperreports/
Homepage: http://jasperforge.org/jasperreports
@@ -25,8 +26,8 @@
libjcommon-java
Recommends: libjexcelapi-java, libjakarta-poi-java (>= 3.2), libitext-java,
libbatik-java (>= 1.7), libjfreechart-java, libhibernate3-java
-Suggests: bsh, libasm2-java, groovy,
- libspring-core-2.5-java, libspring-beans-2.5-java
+Suggests: bsh, libasm2-java, groovy, libmondrian-java, libolap4j-java,
+ libspring-core-2.5-java, libspring-beans-2.5-java, libantlr-java
Description: Java reporting generator library
JasperReports is a Java reporting generator library. XML report templates
are used to generate ready to print documents using data from customizable
data
Modified: trunk/jasperreports/debian/libjasperreports-java-doc.doc-base.config
===================================================================
--- trunk/jasperreports/debian/libjasperreports-java-doc.doc-base.config
2010-02-06 20:25:58 UTC (rev 11522)
+++ trunk/jasperreports/debian/libjasperreports-java-doc.doc-base.config
2010-02-06 21:13:23 UTC (rev 11523)
@@ -5,5 +5,5 @@
Section: Programming
Format: HTML
-Index: /usr/share/doc/libjasperreports-java/jasperreports-config.reference.html
-Files: /usr/share/doc/libjasperreports-java/jasperreports-config.reference.html
+Index: /usr/share/doc/libjasperreports-java/config.reference.html
+Files: /usr/share/doc/libjasperreports-java/config.reference.html
Modified: trunk/jasperreports/debian/libjasperreports-java-doc.doc-base.schema
===================================================================
--- trunk/jasperreports/debian/libjasperreports-java-doc.doc-base.schema
2010-02-06 20:25:58 UTC (rev 11522)
+++ trunk/jasperreports/debian/libjasperreports-java-doc.doc-base.schema
2010-02-06 21:13:23 UTC (rev 11523)
@@ -5,5 +5,5 @@
Section: Programming
Format: HTML
-Index: /usr/share/doc/libjasperreports-java/jasperreports-schema.reference.html
-Files: /usr/share/doc/libjasperreports-java/jasperreports-schema.reference.html
+Index: /usr/share/doc/libjasperreports-java/schema.reference.html
+Files: /usr/share/doc/libjasperreports-java/schema.reference.html
Added: trunk/jasperreports/debian/libjasperreports-java-doc.install
===================================================================
--- trunk/jasperreports/debian/libjasperreports-java-doc.install
(rev 0)
+++ trunk/jasperreports/debian/libjasperreports-java-doc.install
2010-02-06 21:13:23 UTC (rev 11523)
@@ -0,0 +1,4 @@
+dist/docs/api /usr/share/doc/libjasperreports-java/
+dist/docs/schema.reference.html /usr/share/doc/libjasperreports-java/
+dist/docs/config.reference.html /usr/share/doc/libjasperreports-java/
+
Copied: trunk/jasperreports/debian/patches/01_exclude_jpa.diff (from rev 11520,
trunk/jasperreports/debian/patches/01_exclude_olap_and_jpa.diff)
===================================================================
--- trunk/jasperreports/debian/patches/01_exclude_jpa.diff
(rev 0)
+++ trunk/jasperreports/debian/patches/01_exclude_jpa.diff 2010-02-06
21:13:23 UTC (rev 11523)
@@ -0,0 +1,18 @@
+Description: build.xml: exclude JPA modules of JasperReports.
+Fowarded: no
+Author: Damien Raude-Morvan <draz...@debian.org>
+Last-Update: 2010-02-06
+--- a/build.xml
++++ b/build.xml
+@@ -13,10 +13,7 @@
+ </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="**/Java15BigDecimalHandler.java"
unless="using.jdk.1.5"/>
++ <exclude name="**/JRJpa*.java"/>
+ <classpath>
+ <pathelement location="./build/classes"/>
+ <fileset dir="./lib">
Deleted: trunk/jasperreports/debian/patches/01_exclude_olap_and_jpa.diff
===================================================================
--- trunk/jasperreports/debian/patches/01_exclude_olap_and_jpa.diff
2010-02-06 20:25:58 UTC (rev 11522)
+++ trunk/jasperreports/debian/patches/01_exclude_olap_and_jpa.diff
2010-02-06 21:13:23 UTC (rev 11523)
@@ -1,21 +0,0 @@
-Description: build.xml: exclude OLAP and JPA modules of JasperReports.
-Fowarded: no
-Author: Damien Raude-Morvan <draz...@drazzib.com>
-Last-Update: 2009-08-30
---- a/build.xml
-+++ b/build.xml
-@@ -13,10 +13,10 @@
- </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="**/Java15BigDecimalHandler.java"
unless="using.jdk.1.5"/>
-+ <exclude
name="**/net/sf/jasperreports/engine/util/Java15BigDecimalHandler.java"/>
-+ <exclude name="**/olap/**/*.java"/>
-+ <exclude name="**/JRJpa*.java"/>
-+ <exclude name="**/Java15BigDecimalHandler.java"/>
- <classpath>
- <pathelement location="./build/classes"/>
- <fileset dir="./lib">
Modified: trunk/jasperreports/debian/patches/06_configure_javaflow.diff
===================================================================
--- trunk/jasperreports/debian/patches/06_configure_javaflow.diff
2010-02-06 20:25:58 UTC (rev 11522)
+++ trunk/jasperreports/debian/patches/06_configure_javaflow.diff
2010-02-06 21:13:23 UTC (rev 11523)
@@ -5,7 +5,7 @@
Last-Update: 2009-07-16
--- a/build.xml
+++ b/build.xml
-@@ -90,12 +90,24 @@
+@@ -87,12 +87,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
2010-02-06 20:25:58 UTC (rev 11522)
+++ trunk/jasperreports/debian/patches/07_exclude_barcode4j_and_barbecue.diff
2010-02-06 21:13:23 UTC (rev 11523)
@@ -245,12 +245,12 @@
}
--- a/build.xml
+++ b/build.xml
-@@ -17,6 +17,8 @@
- <exclude name="**/olap/**/*.java"/>
+@@ -14,6 +14,8 @@
+ </condition>
+ <javac destdir="./build/classes" debug="true" optimize="false"
deprecation="true" target="1.4" source="1.4" encoding="ISO-8859-1">
<exclude name="**/JRJpa*.java"/>
- <exclude name="**/Java15BigDecimalHandler.java"/>
-+ <exclude name="**/barcode4j/*.java"/>
-+ <exclude name="**/barbecue/*.java"/>
++ <exclude name="**/barcode4j/*.java"/>
++ <exclude name="**/barbecue/*.java"/>
<classpath>
<pathelement location="./build/classes"/>
<fileset dir="./lib">
Modified: trunk/jasperreports/debian/patches/08_no_maxmemory_for_javadoc.diff
===================================================================
--- trunk/jasperreports/debian/patches/08_no_maxmemory_for_javadoc.diff
2010-02-06 20:25:58 UTC (rev 11522)
+++ trunk/jasperreports/debian/patches/08_no_maxmemory_for_javadoc.diff
2010-02-06 21:13:23 UTC (rev 11523)
@@ -4,11 +4,19 @@
Last-Update: 2009-08-30
--- a/build.xml
+++ b/build.xml
-@@ -344,7 +344,6 @@
+@@ -341,7 +341,6 @@
use="true"
- windowtitle="JasperReports API version
${version}"
+ windowtitle="JasperReports ${version} API"
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>
+ <doctitle>
+ <![CDATA[
+@@ -450,6 +449,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>
Modified: trunk/jasperreports/debian/patches/11_pom.diff
===================================================================
--- trunk/jasperreports/debian/patches/11_pom.diff 2010-02-06 20:25:58 UTC
(rev 11522)
+++ trunk/jasperreports/debian/patches/11_pom.diff 2010-02-06 21:13:23 UTC
(rev 11523)
@@ -8,7 +8,7 @@
Forwarded: not-needed
--- a/pom.xml
+++ b/pom.xml
-@@ -206,13 +206,6 @@
+@@ -208,13 +208,6 @@
<optional>true</optional>
</dependency>
<dependency>
@@ -22,7 +22,7 @@
<groupId>commons-javaflow</groupId>
<artifactId>commons-javaflow</artifactId>
<version>20060411</version>
-@@ -220,13 +213,6 @@
+@@ -222,13 +215,6 @@
<optional>true</optional>
</dependency>
<dependency>
@@ -36,7 +36,7 @@
<groupId>javax.persistence</groupId>
<artifactId>persistence-api</artifactId>
<version>1.0</version>
-@@ -342,19 +328,5 @@
+@@ -344,19 +330,5 @@
<scope>compile</scope>
<optional>true</optional>
</dependency>
Deleted: trunk/jasperreports/debian/patches/12_itext.diff
===================================================================
--- trunk/jasperreports/debian/patches/12_itext.diff 2010-02-06 20:25:58 UTC
(rev 11522)
+++ trunk/jasperreports/debian/patches/12_itext.diff 2010-02-06 21:13:23 UTC
(rev 11523)
@@ -1,17 +0,0 @@
-Description: Fix compatibility with iText >= 2.1.2.
- Sincce "support for utf32" chunk.getUnicodeEquivalent()
- now return int (CID). We should cast it to char.
-Author: Damien Raude-Morvan <draz...@debian.org>
-Last-Update: 2009-12-12
-Forwarded: no
---- a/src/net/sf/jasperreports/engine/util/BreakIteratorSplitCharacter.java
-+++ b/src/net/sf/jasperreports/engine/util/BreakIteratorSplitCharacter.java
-@@ -111,7 +111,7 @@
- if (ck != null)
- {
- PdfChunk chunk = ck[Math.min(current, ck.length - 1)];
-- currentCh = chunk.getUnicodeEquivalent(currentCh);
-+ currentCh = (char)
chunk.getUnicodeEquivalent(currentCh);
- }
- return currentCh;
- }
Modified: trunk/jasperreports/debian/patches/series
===================================================================
--- trunk/jasperreports/debian/patches/series 2010-02-06 20:25:58 UTC (rev
11522)
+++ trunk/jasperreports/debian/patches/series 2010-02-06 21:13:23 UTC (rev
11523)
@@ -1,4 +1,4 @@
-01_exclude_olap_and_jpa.diff
+01_exclude_jpa.diff
02_use_debian_asm.diff
03_use_pngencoder_from_jcommon.diff
06_configure_javaflow.diff
@@ -7,4 +7,3 @@
09_use_commons_codec.diff
10_disable_fonts.diff
11_pom.diff
-12_itext.diff
Modified: trunk/jasperreports/debian/rules
===================================================================
--- trunk/jasperreports/debian/rules 2010-02-06 20:25:58 UTC (rev 11522)
+++ trunk/jasperreports/debian/rules 2010-02-06 21:13:23 UTC (rev 11523)
@@ -7,21 +7,18 @@
JAVA_HOME := /usr/lib/jvm/default-java
ANT_HOME := /usr/share/ant
-DEB_JARS := ant-trax bsh asm2 groovy jcommon \
+DEB_JARS := ant-trax ant-nodeps bsh asm2 groovy jcommon \
spring-core-2.5 spring-beans-2.5 \
commons-digester commons-collections3 commons-logging \
commons-beanutils commons-codec commons-javaflow \
eclipse-ecj xalan2 jaxen xml-apis-ext \
jxl jakarta-poi itext \
batik-all jfreechart hibernate3 \
- glassfish-javaee
+ glassfish-javaee mondrian olap4j antlr
DEB_ANT_BUILD_TARGET := jar docs
DEB_ANT_CLEAN_TARGET := clean
-API_DOCS := dist/javadoc/*
-SCHEMA_DOC := dist/jasperreports-*-schema.reference.html
-CONFIG_DOC := dist/jasperreports-*-config.reference.html
VERSION := $(shell echo $(DEB_UPSTREAM_VERSION) | sed -e s/\+dfsg//)
binary-post-install/libjasperreports-java::
@@ -32,11 +29,6 @@
dh_install -plibjasperreports-java
dist/jasperreports-javaflow-$(VERSION).jar /usr/share/java/
dh_link /usr/share/java/jasperreports-javaflow-$(VERSION).jar
/usr/share/java/jasperreports-javaflow.jar
-binary-post-install/libjasperreports-java-doc::
- dh_install -plibjasperreports-java-doc $(API_DOCS)
/usr/share/doc/libjasperreports-java/api/
- dh_install -plibjasperreports-java-doc $(SCHEMA_DOC)
/usr/share/doc/libjasperreports-java/jasperreports-schema.reference.html
- dh_install -plibjasperreports-java-doc $(CONFIG_DOC)
/usr/share/doc/libjasperreports-java/jasperreports-config.reference.html
-
clean::
-rm -rf debian/tmp
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
