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

[Damien Raude-Morvan]

Author: drazzib
Date: 2011-03-15 19:23:37 +0000 (Tue, 15 Mar 2011)
New Revision: 13427

Modified:
   trunk/jasperreports/debian/changelog
   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/10_disable_fonts.diff
   trunk/jasperreports/debian/patches/12_samples.diff
Log:
New upstream release: Refreshed all patches.

Modified: trunk/jasperreports/debian/changelog
===================================================================
--- trunk/jasperreports/debian/changelog	2011-03-15 05:03:53 UTC (rev 13426)
+++ trunk/jasperreports/debian/changelog	2011-03-15 19:23:37 UTC (rev 13427)
@@ -1,3 +1,9 @@
+jasperreports (4.0.1+dfsg-1) unstable; urgency=low
+
+  * New upstream release: Refreshed all patches.
+
+ -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 15 Mar 2011 19:58:44 +0100
+
 jasperreports (4.0.0+dfsg-1) unstable; urgency=low
 
   * New upstream release:

Modified: trunk/jasperreports/debian/patches/06_configure_javaflow.diff
===================================================================
--- trunk/jasperreports/debian/patches/06_configure_javaflow.diff	2011-03-15 05:03:53 UTC (rev 13426)
+++ trunk/jasperreports/debian/patches/06_configure_javaflow.diff	2011-03-15 19:23:37 UTC (rev 13427)
@@ -5,7 +5,7 @@
 Last-Update: 2010-04-20
 --- a/build.xml
 +++ b/build.xml
-@@ -82,12 +82,25 @@
+@@ -71,12 +71,25 @@
  		</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	2011-03-15 05:03:53 UTC (rev 13426)
+++ trunk/jasperreports/debian/patches/07_exclude_barcode4j_and_barbecue.diff	2011-03-15 19:23:37 UTC (rev 13427)
@@ -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;
-@@ -111,23 +105,6 @@
+@@ -113,23 +107,6 @@
  		tableManager.setComponentFillFactory(new FillTableFactory());
  		componentManagers.put(TABLE_COMPONENT_NAME, tableManager);
  		

Modified: trunk/jasperreports/debian/patches/08_no_maxmemory_for_javadoc.diff
===================================================================
--- trunk/jasperreports/debian/patches/08_no_maxmemory_for_javadoc.diff	2011-03-15 05:03:53 UTC (rev 13426)
+++ trunk/jasperreports/debian/patches/08_no_maxmemory_for_javadoc.diff	2011-03-15 19:23:37 UTC (rev 13427)
@@ -4,7 +4,7 @@
 Last-Update: 2010-04-20
 --- a/build.xml
 +++ b/build.xml
-@@ -417,7 +417,6 @@
+@@ -332,7 +332,6 @@
  				use="true"
  				windowtitle="JasperReports ${version} API"
  				excludepackagenames="org.w3c.tools.codec"

Modified: trunk/jasperreports/debian/patches/10_disable_fonts.diff
===================================================================
--- trunk/jasperreports/debian/patches/10_disable_fonts.diff	2011-03-15 05:03:53 UTC (rev 13426)
+++ trunk/jasperreports/debian/patches/10_disable_fonts.diff	2011-03-15 19:23:37 UTC (rev 13427)
@@ -11,5 +11,5 @@
 -	<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>
+ 		<jar jarfile="./dist/jasperreports-${version}.jar" manifest="src/META-INF/MANIFEST.MF">
+ 			<fileset dir="./build/classes"/>

Modified: trunk/jasperreports/debian/patches/12_samples.diff
===================================================================
--- trunk/jasperreports/debian/patches/12_samples.diff	2011-03-15 05:03:53 UTC (rev 13426)
+++ trunk/jasperreports/debian/patches/12_samples.diff	2011-03-15 19:23:37 UTC (rev 13427)
@@ -4,7 +4,7 @@
 Forwarded: no
 --- a/build.xml
 +++ b/build.xml
-@@ -462,6 +462,6 @@
+@@ -440,6 +440,6 @@
  		</copy>
  	</target>