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

[Damien Raude-Morvan]

Author: drazzib
Date: 2011-02-22 21:33:05 +0000 (Tue, 22 Feb 2011)
New Revision: 13346

Modified:
   trunk/jasperreports/debian/changelog
   trunk/jasperreports/debian/patches/06_configure_javaflow.diff
Log:
Revert debian/patches/06_configure_javaflow.diff

Modified: trunk/jasperreports/debian/changelog
===================================================================
--- trunk/jasperreports/debian/changelog	2011-02-22 21:25:34 UTC (rev 13345)
+++ trunk/jasperreports/debian/changelog	2011-02-22 21:33:05 UTC (rev 13346)
@@ -4,10 +4,9 @@
     - d/patches/09_use_commons_codec.diff: Refreshed.
     - d/patches/07_exclude_barcode4j_and_barbecue.diff: Refreshed.
     - d/patches/12_samples.diff: Refreshed.
-    - d/patches/09_use_commons_codec.diff: Refreshed.
   * d/copyright: Use DEP-5 format.
 
- -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 22 Feb 2011 22:17:30 +0100
+ -- Damien Raude-Morvan <drazzib at debian.org>  Tue, 22 Feb 2011 22:29:56 +0100
 
 jasperreports (3.7.4+dfsg-1) unstable; urgency=low
 

Modified: trunk/jasperreports/debian/patches/06_configure_javaflow.diff
===================================================================
--- trunk/jasperreports/debian/patches/06_configure_javaflow.diff	2011-02-22 21:25:34 UTC (rev 13345)
+++ trunk/jasperreports/debian/patches/06_configure_javaflow.diff	2011-02-22 21:33:05 UTC (rev 13346)
@@ -1,17 +1,14 @@
 Description: build.xml: configure <javaflow> ant task.
  Include missing elements from upstream classpath.
- Replace dstdir parameter by destdir (Javaflow 20100908)
 Author: Damien Raude-Morvan <drazzib at debian.org>
 Forwarded: not-needed
-Last-Update: 2010-09-17
+Last-Update: 2010-04-20
 --- a/build.xml
 +++ b/build.xml
-@@ -81,13 +81,26 @@
- 			value="net.sf.jasperreports.engine.fill.JRContinuationSubreportRunnerFactory">
+@@ -82,12 +82,25 @@
  		</replace>
  
--		<javaflow srcdir="./build/javaflow" dstdir="./build/javaflow" mode="bcel">
-+		<javaflow srcdir="./build/javaflow" destdir="./build/javaflow" mode="bcel">
+ 		<javaflow srcdir="./build/javaflow" dstdir="./build/javaflow" mode="bcel">
 +			<include name="net/sf/jasperreports/engine/JRStyle.class"/>
 +			<include name="net/sf/jasperreports/engine/JRTemplateReference.class"/>
 +			<include name="net/sf/jasperreports/engine/JRStyleSetter.class"/>