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

[Damien Raude-Morvan]

Author: drazzib
Date: 2009-12-12 12:58:30 +0000 (Sat, 12 Dec 2009)
New Revision: 11248

Added:
   trunk/jasperreports/debian/patches/12_itext.diff
Modified:
   trunk/jasperreports/debian/changelog
   trunk/jasperreports/debian/orig-tar.sh
   trunk/jasperreports/debian/patches/09_use_commons_codec.diff
   trunk/jasperreports/debian/patches/series
Log:
* New upstream release
  - new patch 12_itext.diff to fix utf32 compatibility

Modified: trunk/jasperreports/debian/changelog
===================================================================
--- trunk/jasperreports/debian/changelog	2009-12-12 12:56:37 UTC (rev 11247)
+++ trunk/jasperreports/debian/changelog	2009-12-12 12:58:30 UTC (rev 11248)
@@ -1,9 +1,11 @@
-jasperreports (3.6.1+dfsg-2) UNRELEASED; urgency=low
+jasperreports (3.7.0+dfsg-1) UNRELEASED; urgency=low
 
+  * New upstream release
+    - new patch 12_itext.diff to fix utf32 compatibility
   * Depends on libcommons-collection3-java
   * Fix debian/maven.rules to transform more dependencies
 
- -- Damien Raude-Morvan <drazzib at debian.org>  Thu, 26 Nov 2009 23:44:18 +0100
+ -- Damien Raude-Morvan <drazzib at debian.org>  Sat, 12 Dec 2009 13:57:30 +0100
 
 jasperreports (3.6.1+dfsg-1) unstable; urgency=low
 

Modified: trunk/jasperreports/debian/orig-tar.sh
===================================================================
--- trunk/jasperreports/debian/orig-tar.sh	2009-12-12 12:56:37 UTC (rev 11247)
+++ trunk/jasperreports/debian/orig-tar.sh	2009-12-12 12:58:30 UTC (rev 11248)
@@ -3,7 +3,7 @@
 # $2 = version
 # $3 = file
 DIR=jasperreports-$2.orig
-TAR=jasperreports_$2.orig.tar.gz
+TAR=jasperreports_$2+dfsg.orig.tar.gz
 
 # clean up the upstream tarball
 tar zxf $3

Modified: trunk/jasperreports/debian/patches/09_use_commons_codec.diff
===================================================================
--- trunk/jasperreports/debian/patches/09_use_commons_codec.diff	2009-12-12 12:56:37 UTC (rev 11247)
+++ trunk/jasperreports/debian/patches/09_use_commons_codec.diff	2009-12-12 12:58:30 UTC (rev 11248)
@@ -14,7 +14,7 @@
  
  
  /**
-@@ -832,13 +832,8 @@
+@@ -835,13 +835,8 @@
  			{
  				try
  				{

Added: trunk/jasperreports/debian/patches/12_itext.diff
===================================================================
--- trunk/jasperreports/debian/patches/12_itext.diff	                        (rev 0)
+++ trunk/jasperreports/debian/patches/12_itext.diff	2009-12-12 12:58:30 UTC (rev 11248)
@@ -0,0 +1,17 @@
+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 <drazzib at 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	2009-12-12 12:56:37 UTC (rev 11247)
+++ trunk/jasperreports/debian/patches/series	2009-12-12 12:58:30 UTC (rev 11248)
@@ -7,3 +7,4 @@
 09_use_commons_codec.diff
 10_disable_fonts.diff
 11_pom.diff
+12_itext.diff