[pkg-java] r15635 - trunk/fop/debian/patches

[Mathieu Malaterre]

Author: malat-guest
Date: 2012-01-03 14:33:44 +0000 (Tue, 03 Jan 2012)
New Revision: 15635

Modified:
   trunk/fop/debian/patches/illegalargex.patch
   trunk/fop/debian/patches/series
Log:
Redo patch. Remove renaming.

Modified: trunk/fop/debian/patches/illegalargex.patch
===================================================================
--- trunk/fop/debian/patches/illegalargex.patch	2012-01-03 14:13:13 UTC (rev 15634)
+++ trunk/fop/debian/patches/illegalargex.patch	2012-01-03 14:33:44 UTC (rev 15635)
@@ -4,8 +4,8 @@
 Origin: http://svn.apache.org/viewvc?view=revision&revision=1042115
 Index: fop-1.0.dfsg2/src/java/org/apache/fop/fo/FOTreeBuilder.java
 ===================================================================
---- fop-1.0.dfsg2.orig/src/java/org/apache/fop/fo/FOTreeBuilder.java	2012-01-03 15:12:46.000000000 +0100
-+++ fop-1.0.dfsg2/src/java/org/apache/fop/fo/FOTreeBuilder.java	2012-01-03 15:12:48.000000000 +0100
+--- fop-1.0.dfsg2.orig/src/java/org/apache/fop/fo/FOTreeBuilder.java	2012-01-03 15:29:44.000000000 +0100
++++ fop-1.0.dfsg2/src/java/org/apache/fop/fo/FOTreeBuilder.java	2012-01-03 15:29:46.000000000 +0100
 @@ -398,7 +398,9 @@
                  FOValidationEventProducer eventProducer
                      = FOValidationEventProducer.Provider.get(
@@ -19,8 +19,8 @@
              }
 Index: fop-1.0.dfsg2/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java
 ===================================================================
---- fop-1.0.dfsg2.orig/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java	2012-01-03 15:12:46.000000000 +0100
-+++ fop-1.0.dfsg2/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java	2012-01-03 15:12:48.000000000 +0100
+--- fop-1.0.dfsg2.orig/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java	2012-01-03 15:29:44.000000000 +0100
++++ fop-1.0.dfsg2/src/java/org/apache/fop/layoutmgr/inline/TextLayoutManager.java	2012-01-03 15:32:00.000000000 +0100
 @@ -774,10 +774,7 @@
          while (lastIndex > 0 && foText.charAt(lastIndex - 1) == CharUtilities.SOFT_HYPHEN) {
              lastIndex--;
@@ -59,14 +59,14 @@
 +        // shy+chars at start of word: wordLength == 0 && breakOpportunity
 +        // shy only characters in word: wordLength == 0 && !breakOpportunity
 +        int wordLength = lastIndex - thisStart;
-+        int letterSpaces = 0;
++        int iLetterSpaces = 0;
 +        if (wordLength != 0) {
-+            letterSpaces = wordLength - 1;
++            iLetterSpaces = wordLength - 1;
 +            // if there is a break opportunity and the next one
 +            // is not a space, it could be used as a line end;
 +            // add one more letter space, in case other text follows
 +            if (breakOpportunity && !TextLayoutManager.isSpace(ch)) {
-+                letterSpaces++;
++                iLetterSpaces++;
 +            }
          }
          assert iLetterSpaces >= 0;

Modified: trunk/fop/debian/patches/series
===================================================================
--- trunk/fop/debian/patches/series	2012-01-03 14:13:13 UTC (rev 15634)
+++ trunk/fop/debian/patches/series	2012-01-03 14:33:44 UTC (rev 15635)
@@ -4,3 +4,4 @@
 fixbuildxml.patch
 fixnpeinlinestacking.patch
 illegalargex.patch
+debian-changes-1:1.0.dfsg2-5