[pkg-java] r11058 - in trunk/jasperreports/debian: . patches
Damien Raude-Morvan
drazzib at alioth.debian.org
Thu Nov 12 23:50:13 UTC 2009
Author: drazzib
Date: 2009-11-12 23:50:13 +0000 (Thu, 12 Nov 2009)
New Revision: 11058
Added:
trunk/jasperreports/debian/patches/10_disable_fonts.diff
trunk/jasperreports/debian/patches/11_pom.diff
Modified:
trunk/jasperreports/debian/changelog
trunk/jasperreports/debian/control
trunk/jasperreports/debian/maven.rules
trunk/jasperreports/debian/patches/01_exclude_olap_and_jpa.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
trunk/jasperreports/debian/patches/series
trunk/jasperreports/debian/rules
Log:
* New upstream release
* debian/patches/11_pom.diff: remove uneeded dependencies removed from
Debian package
* debian/patches/10_disable_fonts.diff: don't build "font" package
* Build-Depends on libcommons-collections3-java instead of
libcommons-collections-java
Modified: trunk/jasperreports/debian/changelog
===================================================================
--- trunk/jasperreports/debian/changelog 2009-11-12 23:42:06 UTC (rev 11057)
+++ trunk/jasperreports/debian/changelog 2009-11-12 23:50:13 UTC (rev 11058)
@@ -1,3 +1,14 @@
+jasperreports (3.6.1+dfsg-1) UNRELEASED; urgency=low
+
+ * New upstream release
+ * debian/patches/11_pom.diff: remove uneeded dependencies removed from
+ Debian package
+ * debian/patches/10_disable_fonts.diff: don't build "font" package
+ * Build-Depends on libcommons-collections3-java instead of
+ libcommons-collections-java
+
+ -- Damien Raude-Morvan <drazzib at debian.org> Fri, 13 Nov 2009 00:49:24 +0100
+
jasperreports (3.6.0+dfsg-1) unstable; urgency=low
* New upstream release.
Modified: trunk/jasperreports/debian/control
===================================================================
--- trunk/jasperreports/debian/control 2009-11-12 23:42:06 UTC (rev 11057)
+++ trunk/jasperreports/debian/control 2009-11-12 23:50:13 UTC (rev 11058)
@@ -6,7 +6,7 @@
Build-Depends: cdbs, quilt, debhelper (>= 7), default-jdk, ant
Build-Depends-Indep: ant-optional, bsh, libasm2-java, groovy, libjcommon-java,
libspring-core-2.5-java, libspring-beans-2.5-java,
- libcommons-digester-java, libcommons-collections-java, libcommons-logging-java,
+ libcommons-digester-java, libcommons-collections3-java, libcommons-logging-java,
libcommons-beanutils-java, libcommons-codec-java, libcommons-javaflow-java,
libecj-java, libxalan2-java, libjaxen-java, libxml-commons-external-java,
libjexcelapi-java, libjakarta-poi-java (>= 3.2), libitext-java,
Modified: trunk/jasperreports/debian/maven.rules
===================================================================
--- trunk/jasperreports/debian/maven.rules 2009-11-12 23:42:06 UTC (rev 11057)
+++ trunk/jasperreports/debian/maven.rules 2009-11-12 23:50:13 UTC (rev 11058)
@@ -1,4 +1,6 @@
s/ant/org.apache.ant/ * * s/.*/debian/
junit junit jar s/3\..*/3.x/
-commons-collections commons-collections jar s/2\..*/2.x/
-javax.servlet servlet-api jar *
+commons-collections commons-collections * s/.*/3.x/
+javax.servlet servlet-api * s/.*/2.5/
+com.lowagie itext * s/.*/1.4/
+antlr antlr * s/.*/2.x/
Modified: trunk/jasperreports/debian/patches/01_exclude_olap_and_jpa.diff
===================================================================
--- trunk/jasperreports/debian/patches/01_exclude_olap_and_jpa.diff 2009-11-12 23:42:06 UTC (rev 11057)
+++ trunk/jasperreports/debian/patches/01_exclude_olap_and_jpa.diff 2009-11-12 23:50:13 UTC (rev 11058)
@@ -4,16 +4,18 @@
Last-Update: 2009-08-30
--- a/build.xml
+++ b/build.xml
-@@ -13,9 +13,9 @@
+@@ -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 2009-11-12 23:42:06 UTC (rev 11057)
+++ trunk/jasperreports/debian/patches/06_configure_javaflow.diff 2009-11-12 23:50:13 UTC (rev 11058)
@@ -5,7 +5,7 @@
Last-Update: 2009-07-16
--- a/build.xml
+++ b/build.xml
-@@ -89,12 +89,24 @@
+@@ -90,12 +90,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-11-12 23:42:06 UTC (rev 11057)
+++ trunk/jasperreports/debian/patches/07_exclude_barcode4j_and_barbecue.diff 2009-11-12 23:50:13 UTC (rev 11058)
@@ -81,7 +81,7 @@
}
protected void addListRules(Digester digester)
-@@ -89,103 +69,6 @@
+@@ -95,103 +75,6 @@
digester.addSetNext(listContentsPattern, "setContents");
}
@@ -185,7 +185,7 @@
public void writeToXml(ComponentKey componentKey, Component component,
JRXmlWriter reportWriter) throws IOException
{
-@@ -194,18 +77,6 @@
+@@ -200,18 +83,6 @@
ListComponent list = (ListComponent) component;
writeList(list, componentKey, reportWriter);
}
@@ -204,7 +204,7 @@
}
protected void writeList(ListComponent list, ComponentKey componentKey,
-@@ -230,38 +101,4 @@
+@@ -240,38 +111,4 @@
writer.closeElement();
}
@@ -245,12 +245,12 @@
}
--- a/build.xml
+++ b/build.xml
-@@ -16,6 +16,8 @@
- <exclude name="**/net/sf/jasperreports/engine/util/Java15BigDecimalHandler.java" unless="using.jdk.1.5"/>
+@@ -17,6 +17,8 @@
<exclude name="**/olap/**/*.java"/>
<exclude name="**/JRJpa*.java"/>
-+ <exclude name="**/barcode4j/*.java"/>
-+ <exclude name="**/barbecue/*.java"/>
+ <exclude name="**/Java15BigDecimalHandler.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 2009-11-12 23:42:06 UTC (rev 11057)
+++ trunk/jasperreports/debian/patches/08_no_maxmemory_for_javadoc.diff 2009-11-12 23:50:13 UTC (rev 11058)
@@ -4,7 +4,7 @@
Last-Update: 2009-08-30
--- a/build.xml
+++ b/build.xml
-@@ -309,7 +309,6 @@
+@@ -344,7 +344,6 @@
use="true"
windowtitle="JasperReports API version ${version}"
excludepackagenames="org.w3c.tools.codec"
Modified: trunk/jasperreports/debian/patches/09_use_commons_codec.diff
===================================================================
--- trunk/jasperreports/debian/patches/09_use_commons_codec.diff 2009-11-12 23:42:06 UTC (rev 11057)
+++ trunk/jasperreports/debian/patches/09_use_commons_codec.diff 2009-11-12 23:50:13 UTC (rev 11058)
@@ -14,7 +14,7 @@
/**
-@@ -814,13 +814,8 @@
+@@ -832,13 +832,8 @@
{
try
{
Added: trunk/jasperreports/debian/patches/10_disable_fonts.diff
===================================================================
--- trunk/jasperreports/debian/patches/10_disable_fonts.diff (rev 0)
+++ trunk/jasperreports/debian/patches/10_disable_fonts.diff 2009-11-12 23:50:13 UTC (rev 11058)
@@ -0,0 +1,15 @@
+Description: build.xml: don't build -font.jar (not included in our orig source tarball)
+Fowarded: no
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-10-28
+--- a/build.xml
++++ b/build.xml
+@@ -49,7 +49,7 @@
+ </antlr>
+ </target>
+
+- <target name="jar" depends="compile, javaflow, applet, fonts" description="Builds the JasperReports JAR files.">
++ <target name="jar" depends="compile, javaflow, applet" description="Builds the JasperReports JAR files.">
+ <mkdir dir="./dist"/>
+ <jar jarfile="./dist/jasperreports-${version}.jar">
+ <manifest>
Added: trunk/jasperreports/debian/patches/11_pom.diff
===================================================================
--- trunk/jasperreports/debian/patches/11_pom.diff (rev 0)
+++ trunk/jasperreports/debian/patches/11_pom.diff 2009-11-12 23:50:13 UTC (rev 11058)
@@ -0,0 +1,58 @@
+Description: Remove dependencies from pom.xml
+ - png-encoder (see 03_use_pngencoder_from_jcommon.diff)
+ - mondrian (see 01_exclude_olap_and_jpa.diff)
+ - barcode4j (see 07_exclude_barcode4j_and_barbecue.diff)
+ - barbecue (see 07_exclude_barcode4j_and_barbecue.diff)
+Author: Damien Raude-Morvan <drazzib at debian.org>
+Last-Update: 2009-11-13
+Forwarded: not-needed
+--- a/pom.xml
++++ b/pom.xml
+@@ -206,13 +206,6 @@
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+- <groupId>com.keypoint</groupId>
+- <artifactId>png-encoder</artifactId>
+- <version>1.5</version>
+- <scope>compile</scope>
+- <optional>true</optional>
+- </dependency>
+- <dependency>
+ <groupId>commons-javaflow</groupId>
+ <artifactId>commons-javaflow</artifactId>
+ <version>20060411</version>
+@@ -220,13 +213,6 @@
+ <optional>true</optional>
+ </dependency>
+ <dependency>
+- <groupId>mondrian</groupId>
+- <artifactId>mondrian</artifactId>
+- <version>3.1.1.12687</version>
+- <scope>compile</scope>
+- <optional>true</optional>
+- </dependency>
+- <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+@@ -342,19 +328,5 @@
+ <scope>compile</scope>
+ <optional>true</optional>
+ </dependency>
+- <dependency>
+- <groupId>net.sf.barcode4j</groupId>
+- <artifactId>barcode4j</artifactId>
+- <version>2.0</version>
+- <scope>compile</scope>
+- <optional>true</optional>
+- </dependency>
+- <dependency>
+- <groupId>net.sourceforge.barbecue</groupId>
+- <artifactId>barbecue</artifactId>
+- <version>1.5-beta1</version>
+- <scope>compile</scope>
+- <optional>true</optional>
+- </dependency>
+ </dependencies>
+ </project>
Modified: trunk/jasperreports/debian/patches/series
===================================================================
--- trunk/jasperreports/debian/patches/series 2009-11-12 23:42:06 UTC (rev 11057)
+++ trunk/jasperreports/debian/patches/series 2009-11-12 23:50:13 UTC (rev 11058)
@@ -5,3 +5,5 @@
07_exclude_barcode4j_and_barbecue.diff
08_no_maxmemory_for_javadoc.diff
09_use_commons_codec.diff
+10_disable_fonts.diff
+11_pom.diff
Modified: trunk/jasperreports/debian/rules
===================================================================
--- trunk/jasperreports/debian/rules 2009-11-12 23:42:06 UTC (rev 11057)
+++ trunk/jasperreports/debian/rules 2009-11-12 23:50:13 UTC (rev 11058)
@@ -9,7 +9,7 @@
DEB_JARS := ant-trax bsh asm2 groovy jcommon \
spring-core-2.5 spring-beans-2.5 \
- commons-digester commons-collections commons-logging \
+ commons-digester commons-collections3 commons-logging \
commons-beanutils commons-codec commons-javaflow \
eclipse-ecj xalan2 jaxen xml-apis-ext \
jxl jakarta-poi itext \
@@ -27,10 +27,10 @@
binary-post-install/libjasperreports-java::
mh_installpoms -plibjasperreports-java
mh_installjar -plibjasperreports-java -l pom.xml dist/jasperreports-$(VERSION).jar
- dh_install -plibjasperreports-java dist/jasperreports-$(VERSION)-applet.jar /usr/share/java/
- dh_link /usr/share/java/jasperreports-$(VERSION)-applet.jar /usr/share/java/jasperreports-applet.jar
- dh_install -plibjasperreports-java dist/jasperreports-$(VERSION)-javaflow.jar /usr/share/java/
- dh_link /usr/share/java/jasperreports-$(VERSION)-javaflow.jar /usr/share/java/jasperreports-javaflow.jar
+ dh_install -plibjasperreports-java dist/jasperreports-applet-$(VERSION).jar /usr/share/java/
+ dh_link /usr/share/java/jasperreports-applet-$(VERSION).jar /usr/share/java/jasperreports-applet.jar
+ 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/
More information about the pkg-java-commits
mailing list