[pkg-java] r9180 - in trunk/libitext1-java/debian: . patches
Ludovic Claude
ludovicc-guest at alioth.debian.org
Sun Jul 12 22:06:06 UTC 2009
Author: ludovicc-guest
Date: 2009-07-12 22:06:05 +0000 (Sun, 12 Jul 2009)
New Revision: 9180
Added:
trunk/libitext1-java/debian/patches/
trunk/libitext1-java/debian/patches/build.patch
trunk/libitext1-java/debian/patches/jpeg_encoder_classpath.patch
trunk/libitext1-java/debian/patches/series
Modified:
trunk/libitext1-java/debian/changelog
trunk/libitext1-java/debian/control
trunk/libitext1-java/debian/rules
Log:
* Fix FTBFS
Modified: trunk/libitext1-java/debian/changelog
===================================================================
--- trunk/libitext1-java/debian/changelog 2009-07-12 22:05:36 UTC (rev 9179)
+++ trunk/libitext1-java/debian/changelog 2009-07-12 22:06:05 UTC (rev 9180)
@@ -1,4 +1,4 @@
-libitext1-java (1.4-1) unstable; urgency=low
+libitext1-java (1.4-1) experimental; urgency=low
* Initial release -- iText version 1 is still needed for doxia. (Closes:
#524870)
Modified: trunk/libitext1-java/debian/control
===================================================================
--- trunk/libitext1-java/debian/control 2009-07-12 22:05:36 UTC (rev 9179)
+++ trunk/libitext1-java/debian/control 2009-07-12 22:06:05 UTC (rev 9180)
@@ -4,7 +4,7 @@
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Gerardo Curiel <gcuriel at debianvenezuela.org>, Michael Koch <konqueror at gmx.de>,
Ludovic Claude <ludovic.claude at laposte.net>
-Build-Depends: ant, cdbs, debhelper (>= 4.1.0), default-jdk-builddep
+Build-Depends: ant, cdbs, debhelper (>= 4.1.0), default-jdk, quilt
Build-Depends-Indep: libservlet2.3-java, maven-repo-helper
Standards-Version: 3.8.1
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libitext1-java
Added: trunk/libitext1-java/debian/patches/build.patch
===================================================================
--- trunk/libitext1-java/debian/patches/build.patch (rev 0)
+++ trunk/libitext1-java/debian/patches/build.patch 2009-07-12 22:06:05 UTC (rev 9180)
@@ -0,0 +1,31 @@
+--- a/ant/compile.xml
++++ b/ant/compile.xml
+@@ -28,7 +28,9 @@
+
+ <target name="compile" description="--> compiles the iText code">
+ <mkdir dir="${itext.classes}" />
+- <javac srcdir="${itext.src}" destdir="${itext.classes}" />
++ <javac srcdir="${itext.src}" destdir="${itext.classes}">
++ <include name="com/**" />
++ </javac>
+ </target>
+
+ <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+@@ -37,7 +39,9 @@
+
+ <target name="compile.debug" description="--> compiles the iText code for debugging">
+ <mkdir dir="${itext.classes}" />
+- <javac srcdir="${itext.src}" destdir="${itext.classes}" listfiles="yes" debug="true" debuglevel="lines,vars,source" />
++ <javac srcdir="${itext.src}" destdir="${itext.classes}" listfiles="yes" debug="true" debuglevel="lines,vars,source">
++ <include name="com/**" />
++ </javac>
+ </target>
+
+ <!-- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -->
+@@ -77,4 +81,4 @@
+
+ <target name="jar.debug" depends="compile.debug, make.jar" description="--> makes a jarfile from the iText code" />
+
+-</project>
+\ No newline at end of file
++</project>
Added: trunk/libitext1-java/debian/patches/jpeg_encoder_classpath.patch
===================================================================
--- trunk/libitext1-java/debian/patches/jpeg_encoder_classpath.patch (rev 0)
+++ trunk/libitext1-java/debian/patches/jpeg_encoder_classpath.patch 2009-07-12 22:06:05 UTC (rev 9180)
@@ -0,0 +1,53 @@
+--- a/com/lowagie/text/pdf/PdfGraphics2D.java
++++ b/com/lowagie/text/pdf/PdfGraphics2D.java
+@@ -99,6 +99,12 @@
+ import java.util.Iterator;
+ import java.awt.font.TextAttribute;
+
++//For Gnu-Classpath compatibility
++
++import javax.imageio.*;
++import javax.imageio.metadata.*;
++import javax.imageio.plugins.jpeg.JPEGImageWriteParam;
++
+ public class PdfGraphics2D extends Graphics2D {
+
+ private static final int FILL = 1;
+@@ -173,12 +179,12 @@
+ super();
+ dg2.setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);
+ setRenderingHint(RenderingHints.KEY_FRACTIONALMETRICS, RenderingHints.VALUE_FRACTIONALMETRICS_ON);
+- try {
++ /*try {
+ Class.forName("com.sun.image.codec.jpeg.JPEGCodec");
+ }
+ catch (Throwable t) {
+ convertImagesToJPEG = false;
+- }
++ }*/
+ this.convertImagesToJPEG = convertImagesToJPEG;
+ this.jpegQuality = quality;
+ this.onlyShapes = onlyShapes;
+@@ -1266,10 +1272,18 @@
+ g3.dispose();
+
+ ByteArrayOutputStream baos = new ByteArrayOutputStream();
+- com.sun.image.codec.jpeg.JPEGImageEncoder encoder = com.sun.image.codec.jpeg.JPEGCodec.createJPEGEncoder(baos);
+- com.sun.image.codec.jpeg.JPEGEncodeParam param = com.sun.image.codec.jpeg.JPEGCodec.getDefaultJPEGEncodeParam(scaled);
+- param.setQuality(jpegQuality, true);
+- encoder.encode(scaled, param);
++ //com.sun.image.codec.jpeg.JPEGImageEncoder encoder = com.sun.image.codec.jpeg.JPEGCodec.createJPEGEncoder(baos);
++ //com.sun.image.codec.jpeg.JPEGEncodeParam param = com.sun.image.codec.jpeg.JPEGCodec.getDefaultJPEGEncodeParam(scaled);
++ ImageWriter encoder = (ImageWriter)ImageIO.getImageWritersByFormatName("JPEG").next();
++ JPEGImageWriteParam param = new JPEGImageWriteParam(null);
++
++ param.setCompressionMode(ImageWriteParam.MODE_EXPLICIT);
++ param.setCompressionQuality(jpegQuality);
++ encoder.setOutput(baos);
++ encoder.write((IIOMetadata) null, new IIOImage(scaled,null,null), param);
++
++ //param.setQuality(jpegQuality, true);
++ //encoder.encode(scaled, param);
+ scaled.flush();
+ scaled = null;
+ image = com.lowagie.text.Image.getInstance(baos.toByteArray());
Added: trunk/libitext1-java/debian/patches/series
===================================================================
--- trunk/libitext1-java/debian/patches/series (rev 0)
+++ trunk/libitext1-java/debian/patches/series 2009-07-12 22:06:05 UTC (rev 9180)
@@ -0,0 +1,2 @@
+build.patch
+jpeg_encoder_classpath.patch
Modified: trunk/libitext1-java/debian/rules
===================================================================
--- trunk/libitext1-java/debian/rules 2009-07-12 22:05:36 UTC (rev 9179)
+++ trunk/libitext1-java/debian/rules 2009-07-12 22:06:05 UTC (rev 9180)
@@ -2,6 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
PACKAGE := $(DEB_SOURCE_PACKAGE)
VERSION := $(DEB_UPSTREAM_VERSION)
More information about the pkg-java-commits
mailing list