[pkg-java] r7424 - in trunk/doxia/debian: . patches
twerner at alioth.debian.org
twerner at alioth.debian.org
Thu Nov 27 20:04:04 UTC 2008
Author: twerner
Date: 2008-11-27 20:04:04 +0000 (Thu, 27 Nov 2008)
New Revision: 7424
Added:
trunk/doxia/debian/patches/
trunk/doxia/debian/patches/itext.diff
trunk/doxia/debian/patches/series
Modified:
trunk/doxia/debian/build.properties
trunk/doxia/debian/build.xml
trunk/doxia/debian/changelog
trunk/doxia/debian/control
trunk/doxia/debian/rules
Log:
Add patch itext.diff.
Modified: trunk/doxia/debian/build.properties
===================================================================
--- trunk/doxia/debian/build.properties 2008-11-27 17:54:59 UTC (rev 7423)
+++ trunk/doxia/debian/build.properties 2008-11-27 20:04:04 UTC (rev 7424)
@@ -9,4 +9,5 @@
/usr/share/java/velocity.jar:\
/usr/share/java/modello-core.jar:\
/usr/share/java/modello-plugin-xml.jar:\
- /usr/share/java/maven-ant-helper.jar
+ /usr/share/java/maven-ant-helper.jar:\
+ /usr/share/java/itext.jar
Modified: trunk/doxia/debian/build.xml
===================================================================
--- trunk/doxia/debian/build.xml 2008-11-27 17:54:59 UTC (rev 7423)
+++ trunk/doxia/debian/build.xml 2008-11-27 20:04:04 UTC (rev 7424)
@@ -12,7 +12,15 @@
<ant target="clean" antfile="${maven.build.xml}" dir="doxia-sink-api"/>
<ant target="clean" antfile="${maven.build.xml}" dir="doxia-core"/>
<ant target="clean" antfile="${maven.build.xml}"
+ dir="doxia-modules/doxia-module-apt"/>
+ <ant target="clean" antfile="${maven.build.xml}"
+ dir="doxia-modules/doxia-module-confluence"/>
+ <ant target="clean" antfile="${maven.build.xml}"
+ dir="doxia-modules/doxia-module-docbook-simple"/>
+ <ant target="clean" antfile="${maven.build.xml}"
dir="doxia-modules/doxia-module-fml"/>
+ <ant target="clean" antfile="${maven.build.xml}"
+ dir="doxia-modules/doxia-module-itext"/>
</target>
<target name="generate-sources">
@@ -28,16 +36,36 @@
<property name="artifactId" value="doxia-core"/>
</ant>
<ant target="package" antfile="${maven.build.xml}"
+ dir="doxia-modules/doxia-module-apt">
+ <property name="artifactId" value="doxia-module-apt"/>
+ </ant>
+ <ant target="package" antfile="${maven.build.xml}"
+ dir="doxia-modules/doxia-module-confluence">
+ <property name="artifactId" value="doxia-module-confluence"/>
+ </ant>
+ <ant target="package" antfile="${maven.build.xml}"
+ dir="doxia-modules/doxia-module-docbook-simple">
+ <property name="artifactId" value="doxia-module-docbook-simple"/>
+ </ant>
+ <ant target="package" antfile="${maven.build.xml}"
dir="doxia-modules/doxia-module-fml">
<property name="artifactId" value="doxia-module-fml"/>
- </ant>
+ </ant>
+ <ant target="package" antfile="${maven.build.xml}"
+ dir="doxia-modules/doxia-module-itext">
+ <property name="artifactId" value="doxia-module-itext"/>
+ </ant>
</target>
<target name="javadoc">
<javadoc destdir="${javadoc.dir}">
<packageset dir="doxia-sink-api/src/main/java/"/>
<packageset dir="doxia-core/src/main/java/"/>
+ <packageset dir="doxia-modules/doxia-module-apt/src/main/java/"/>
+ <packageset dir="doxia-modules/doxia-module-confluence/src/main/java/"/>
+ <packageset dir="doxia-modules/doxia-module-docbook-simple/src/main/java/"/>
<packageset dir="doxia-modules/doxia-module-fml/src/main/java/"/>
+ <packageset dir="doxia-modules/doxia-module-itext/src/main/java/"/>
</javadoc>
</target>
Modified: trunk/doxia/debian/changelog
===================================================================
--- trunk/doxia/debian/changelog 2008-11-27 17:54:59 UTC (rev 7423)
+++ trunk/doxia/debian/changelog 2008-11-27 20:04:04 UTC (rev 7424)
@@ -9,8 +9,9 @@
* new upstream version
* Added myself to Uploaders.
* Updated Standards-Version to 3.8.0.
+ * Add patch itext.diff.
- -- Torsten Werner <twerner at debian.org> Thu, 27 Nov 2008 18:31:22 +0100
+ -- Torsten Werner <twerner at debian.org> Thu, 27 Nov 2008 20:37:58 +0100
doxia (1.0-alpha-7-1) unstable; urgency=low
Modified: trunk/doxia/debian/control
===================================================================
--- trunk/doxia/debian/control 2008-11-27 17:54:59 UTC (rev 7423)
+++ trunk/doxia/debian/control 2008-11-27 20:04:04 UTC (rev 7424)
@@ -3,8 +3,8 @@
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Trygve Laugstol <trygvis at inamo.no>, Paul Cager <paul-debian at home.paulcager.org>, Michael Koch <konqueror at gmx.de>, Torsten Werner <twerner at debian.org>
-Build-Depends-Indep: java-gcj-compat-dev (>=1.0.65), ant-optional, libxalan2-java, libbcpg-java, libbcpg-java-doc, libbcprov-java, libbcprov-java-doc, classpath-doc, libcommons-cli-java, libwagon-java, libplexus-i18n-java, libplexus-velocity-java, libmodello-java, velocity, maven-ant-helper
-Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3)
+Build-Depends-Indep: java-gcj-compat-dev (>=1.0.65), ant-optional, libxalan2-java, libbcpg-java, libbcpg-java-doc, libbcprov-java, libbcprov-java-doc, classpath-doc, libcommons-cli-java, libwagon-java, libplexus-i18n-java, libplexus-velocity-java, libmodello-java, velocity, maven-ant-helper, libitext-java
+Build-Depends: ant, debhelper (>= 5), cdbs (>= 0.4.5.3), quilt
Standards-Version: 3.8.0
Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/doxia
Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/doxia
Added: trunk/doxia/debian/patches/itext.diff
===================================================================
--- trunk/doxia/debian/patches/itext.diff (rev 0)
+++ trunk/doxia/debian/patches/itext.diff 2008-11-27 20:04:04 UTC (rev 7424)
@@ -0,0 +1,151 @@
+some fixes for iText 2 but there are still some FIXMEs
+
+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
+@@ -23,7 +23,7 @@
+
+ import com.lowagie.text.Font;
+ import com.lowagie.text.FontFactory;
+-import com.lowagie.text.markup.MarkupTags;
++import com.lowagie.text.html.Markup;
+ import com.lowagie.text.pdf.DefaultFontMapper;
+ import com.lowagie.text.pdf.FontMapper;
+
+@@ -38,16 +38,16 @@
+ public class ITextFont
+ {
+ /** A normal font style */
+- public static final String NORMAL = MarkupTags.CSS_VALUE_NORMAL;
++ public static final String NORMAL = Markup.CSS_VALUE_NORMAL;
+
+ /** A bold font style */
+- public static final String BOLD = MarkupTags.CSS_VALUE_BOLD;
++ public static final String BOLD = Markup.CSS_VALUE_BOLD;
+
+ /** A italic font style */
+- public static final String ITALIC = MarkupTags.CSS_VALUE_ITALIC;
++ public static final String ITALIC = Markup.CSS_VALUE_ITALIC;
+
+ /** An underline font style */
+- public static final String UNDERLINE = MarkupTags.CSS_VALUE_UNDERLINE;
++ public static final String UNDERLINE = Markup.CSS_VALUE_UNDERLINE;
+
+ /** A default font name */
+ public static final String DEFAULT_FONT_NAME = FontFactory.HELVETICA;
+@@ -258,7 +258,7 @@
+ {
+ Font font = getCurrentFont();
+
+- return String.valueOf( font.color().getBlue() );
++ return String.valueOf( font.getColor().getBlue() );
+ }
+
+ /**
+@@ -270,7 +270,7 @@
+ {
+ Font font = getCurrentFont();
+
+- return String.valueOf( font.color().getGreen() );
++ return String.valueOf( font.getColor().getGreen() );
+ }
+
+ /**
+@@ -282,7 +282,7 @@
+ {
+ Font font = getCurrentFont();
+
+- return String.valueOf( font.color().getRed() );
++ return String.valueOf( font.getColor().getRed() );
+ }
+
+ /**
+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
+@@ -1172,9 +1172,9 @@
+ try
+ {
+ Image image = Image.getInstance( new URL( urlName ) );
+- image.scaleToFit( ITextUtil.getDefaultPageSize().width() / 2, ITextUtil.getDefaultPageSize().height() / 2 );
+- width = image.plainWidth();
+- height = image.plainHeight();
++ image.scaleToFit( ITextUtil.getDefaultPageSize().getWidth() / 2, ITextUtil.getDefaultPageSize().getHeight() / 2 );
++ width = image.getPlainWidth();
++ height = image.getPlainHeight();
+ }
+ catch ( BadElementException e )
+ {
+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
+@@ -22,9 +22,11 @@
+ import com.lowagie.text.DocumentException;
+ import com.lowagie.text.PageSize;
+ import com.lowagie.text.Rectangle;
++/* FIXME: update for iText 2
+ import com.lowagie.text.xml.XmlToHtml;
+ import com.lowagie.text.xml.XmlToPdf;
+ import com.lowagie.text.xml.XmlToRtf;
++*/
+
+ import java.io.InputStream;
+ import java.io.OutputStream;
+@@ -68,7 +70,7 @@
+ */
+ public static String getPageSize( Rectangle rect )
+ {
+- if ( ( rect.width() == PageSize.LETTER.width() ) && ( rect.height() == PageSize.LETTER.height() ) )
++ if ( ( rect.getWidth() == PageSize.LETTER.getWidth() ) && ( rect.getHeight() == PageSize.LETTER.getHeight() ) )
+ {
+ return "LETTER";
+ }
+@@ -109,6 +111,7 @@
+ * @throws RuntimeException if any
+ * @see com.lowagie.text.xml.XmlToPdf
+ */
++ /* FIXME: update for iText 2
+ public static void writePdf( InputStream is, OutputStream os )
+ {
+ try
+@@ -122,6 +125,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
+ */
++ /* FIXME: update for iText 2
+ public static void writeRtf( InputStream is, OutputStream os )
+ {
+ try
+@@ -144,6 +149,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
+ */
++ /* FIXME: update for iText 2
+ public static void writeHtml( InputStream is, OutputStream os )
+ {
+ try
+@@ -166,4 +173,5 @@
+ throw new RuntimeException( "DocumentException : " + e.getMessage() );
+ }
+ }
++ */
+ }
Added: trunk/doxia/debian/patches/series
===================================================================
--- trunk/doxia/debian/patches/series (rev 0)
+++ trunk/doxia/debian/patches/series 2008-11-27 20:04:04 UTC (rev 7424)
@@ -0,0 +1 @@
+itext.diff
Modified: trunk/doxia/debian/rules
===================================================================
--- trunk/doxia/debian/rules 2008-11-27 17:54:59 UTC (rev 7423)
+++ trunk/doxia/debian/rules 2008-11-27 20:04:04 UTC (rev 7424)
@@ -2,7 +2,7 @@
include /usr/share/cdbs/1/rules/debhelper.mk
include /usr/share/cdbs/1/class/ant.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
PACKAGE := $(shell dpkg-parsechangelog | egrep '^Source:' | cut -f2 -d' ')
VERSION := $(shell dpkg-parsechangelog | egrep '^Version:' | sed 's/Version: \(.*\)-.*/\1/')
@@ -18,8 +18,16 @@
uscan --force-download
binary-post-install/lib$(PACKAGE)-java::
+ dh_install -plib$(PACKAGE)-java $(PACKAGE)-modules/doxia-module-apt/build/$(PACKAGE)-module-apt-$(VERSION).jar usr/share/java
+ dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-module-apt-$(VERSION).jar usr/share/java/$(PACKAGE)-module-apt.jar
+ dh_install -plib$(PACKAGE)-java $(PACKAGE)-modules/doxia-module-confluence/build/$(PACKAGE)-module-confluence-$(VERSION).jar usr/share/java
+ dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-module-confluence-$(VERSION).jar usr/share/java/$(PACKAGE)-module-confluence.jar
+ dh_install -plib$(PACKAGE)-java $(PACKAGE)-modules/doxia-module-docbook-simple/build/$(PACKAGE)-module-docbook-simple-$(VERSION).jar usr/share/java
+ dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-module-docbook-simple-$(VERSION).jar usr/share/java/$(PACKAGE)-module-docbook-simple.jar
dh_install -plib$(PACKAGE)-java $(PACKAGE)-modules/doxia-module-fml/build/$(PACKAGE)-module-fml-$(VERSION).jar usr/share/java
dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-module-fml-$(VERSION).jar usr/share/java/$(PACKAGE)-module-fml.jar
+ dh_install -plib$(PACKAGE)-java $(PACKAGE)-modules/doxia-module-itext/build/$(PACKAGE)-module-itext-$(VERSION).jar usr/share/java
+ dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-module-itext-$(VERSION).jar usr/share/java/$(PACKAGE)-module-itext.jar
dh_install -plib$(PACKAGE)-java $(PACKAGE)-core/build/$(PACKAGE)-core-$(VERSION).jar usr/share/java
dh_link -plib$(PACKAGE)-java usr/share/java/$(PACKAGE)-core-$(VERSION).jar usr/share/java/$(PACKAGE)-core.jar
dh_install -plib$(PACKAGE)-java $(PACKAGE)-sink-api/build/$(PACKAGE)-sink-api-$(VERSION).jar usr/share/java
More information about the pkg-java-commits
mailing list