[pkg-java] r7433 - in trunk/doxia/debian: . patches

[twerner at alioth.debian.org]

Author: twerner
Date: 2008-11-28 15:53:42 +0000 (Fri, 28 Nov 2008)
New Revision: 7433

Modified:
   trunk/doxia/debian/changelog
   trunk/doxia/debian/patches/itext.diff
Log:
Improve patch itext.diff.

Modified: trunk/doxia/debian/changelog
===================================================================
--- trunk/doxia/debian/changelog	2008-11-27 23:02:42 UTC (rev 7432)
+++ trunk/doxia/debian/changelog	2008-11-28 15:53:42 UTC (rev 7433)
@@ -1,3 +1,9 @@
+doxia (1.0-alpha-11-2) experimental; urgency=low
+
+  * Improve patch itext.diff.
+
+ -- Torsten Werner <twerner at debian.org>  Fri, 28 Nov 2008 16:49:47 +0100
+
 doxia (1.0-alpha-11-1) experimental; urgency=low
 
   [ Michael Koch ]

Modified: trunk/doxia/debian/patches/itext.diff
===================================================================
--- trunk/doxia/debian/patches/itext.diff	2008-11-27 23:02:42 UTC (rev 7432)
+++ trunk/doxia/debian/patches/itext.diff	2008-11-28 15:53:42 UTC (rev 7433)
@@ -1,9 +1,10 @@
 some fixes for iText 2 but there are still some FIXMEs
+http://jira.codehaus.org/browse/DOXIA-267
 
 Index: doxia-1.0-alpha-11/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java
 ===================================================================
---- doxia-1.0-alpha-11.orig/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java	2008-11-27 21:00:10.000000000 +0100
-+++ doxia-1.0-alpha-11/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java	2008-11-27 21:00:15.000000000 +0100
+--- doxia-1.0-alpha-11.orig/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java	2007-01-16 15:27:31.000000000 +0100
++++ doxia-1.0-alpha-11/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextFont.java	2008-11-28 16:46:06.000000000 +0100
 @@ -23,7 +23,7 @@
  
  import com.lowagie.text.Font;
@@ -63,8 +64,8 @@
      /**
 Index: doxia-1.0-alpha-11/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
 ===================================================================
---- doxia-1.0-alpha-11.orig/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java	2008-11-27 21:00:10.000000000 +0100
-+++ doxia-1.0-alpha-11/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java	2008-11-27 21:00:15.000000000 +0100
+--- doxia-1.0-alpha-11.orig/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java	2007-08-31 14:55:39.000000000 +0200
++++ doxia-1.0-alpha-11/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java	2008-11-28 16:46:06.000000000 +0100
 @@ -1172,9 +1172,9 @@
          try
          {
@@ -80,8 +81,8 @@
          {
 Index: doxia-1.0-alpha-11/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java
 ===================================================================
---- doxia-1.0-alpha-11.orig/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java	2008-11-27 21:00:10.000000000 +0100
-+++ doxia-1.0-alpha-11/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java	2008-11-27 21:01:16.000000000 +0100
+--- doxia-1.0-alpha-11.orig/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java	2007-01-16 15:27:31.000000000 +0100
++++ doxia-1.0-alpha-11/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextUtil.java	2008-11-28 16:48:14.000000000 +0100
 @@ -22,9 +22,11 @@
  import com.lowagie.text.DocumentException;
  import com.lowagie.text.PageSize;
@@ -103,49 +104,50 @@
          {
              return "LETTER";
          }
-@@ -109,6 +111,7 @@
-      * @throws RuntimeException if any
-      * @see com.lowagie.text.xml.XmlToPdf
+@@ -111,6 +113,7 @@
       */
-+    /* FIXME: update for iText 2
      public static void writePdf( InputStream is, OutputStream os )
      {
++	/* FIXME: update for iText 2
          try
-@@ -122,6 +125,7 @@
+         {
+             XmlToPdf x = new XmlToPdf();
+@@ -121,6 +124,7 @@
+         {
              throw new RuntimeException( "DocumentException : " + e.getMessage() );
          }
++	*/
      }
-+    */
  
      /**
-      * Parse an iText XML from the specified <CODE>InputStream</CODE>, writing an rtf document
-@@ -132,6 +136,7 @@
-      * @throws RuntimeException if any
-      * @see com.lowagie.text.xml.XmlToRtf
+@@ -134,6 +138,7 @@
       */
-+    /* FIXME: update for iText 2
      public static void writeRtf( InputStream is, OutputStream os )
      {
++	/* FIXME: update for iText 2
          try
-@@ -144,6 +149,7 @@
+         {
+             XmlToRtf x = new XmlToRtf();
+@@ -143,6 +148,7 @@
+         {
              throw new RuntimeException( "DocumentException : " + e.getMessage() );
          }
++	*/
      }
-+    */
  
      /**
-      * Parse an iText XML from the specified <CODE>InputStream</CODE>, writing an html document
-@@ -154,6 +160,7 @@
-      * @throws RuntimeException if any
-      * @see com.lowagie.text.xml.XmlToHtml
+@@ -156,6 +162,7 @@
       */
-+    /* FIXME: update for iText 2
      public static void writeHtml( InputStream is, OutputStream os )
      {
++	/* FIXME: update for iText 2
          try
-@@ -166,4 +173,5 @@
+         {
+             XmlToHtml x = new XmlToHtml();
+@@ -165,5 +172,6 @@
+         {
              throw new RuntimeException( "DocumentException : " + e.getMessage() );
          }
++	*/
      }
-+    */
  }