[pkg-java] r3425 - in trunk/fop/debian: . patches
Arnaud Vandyck
avdyk at alioth.debian.org
Thu May 10 12:39:03 UTC 2007
Author: avdyk
Date: 2007-05-10 12:39:03 +0000 (Thu, 10 May 2007)
New Revision: 3425
Added:
trunk/fop/debian/NEWS.Debian
Removed:
trunk/fop/debian/patches/01_README_url_fix.patch
trunk/fop/debian/patches/02_Batik1.5.1_CompilePatch.patch
trunk/fop/debian/patches/03_JavaDoc_Workaround.patch
Modified:
trunk/fop/debian/README.Debian
trunk/fop/debian/changelog
trunk/fop/debian/control
trunk/fop/debian/fop.sh
trunk/fop/debian/rules
Log:
fop (1:0.93.dfsg.1-1) unstable; urgency=low
* New upstream (closes: #349376, #406109)
* fop shell script comes with java.awt.headless set to true (closes:
#407018)
* Removed Ola Lundqvist, Takashi Okamoto, Stefan Gybas and Wolfgang Baer
from uploaders (closes: #374117)
* Updated Standards Version to 3.7.2, no change needed
* added dependencies to libxp6, libxt6, and libxtst6 so no X environment
is needed (closes: #363556)
* debian/README.Debian updated to reflect changes regarding JIMI, thanks
to Massimo Manghi (closes: #354086)
* debian/README.Debian: changed the url to download jai
-- Arnaud Vandyck <avdyk at debian.org> Thu, 10 May 2007 12:17:35 +0200
Added: trunk/fop/debian/NEWS.Debian
===================================================================
--- trunk/fop/debian/NEWS.Debian 2007-05-10 08:12:35 UTC (rev 3424)
+++ trunk/fop/debian/NEWS.Debian 2007-05-10 12:39:03 UTC (rev 3425)
@@ -0,0 +1,7 @@
+fop (0.93.dfsg.1-1) unstable; urgency=low
+
+ * fop shell script comes with java.awt.headless set to true.
+ * fop has been built with jdk6 (ibm), JAI and JIMI support.
+
+ -- Arnaud Vandyck <avdyk at debian.org> Thu, 10 May 2007 12:50:20 +0200
+
Modified: trunk/fop/debian/README.Debian
===================================================================
--- trunk/fop/debian/README.Debian 2007-05-10 08:12:35 UTC (rev 3424)
+++ trunk/fop/debian/README.Debian 2007-05-10 12:39:03 UTC (rev 3425)
@@ -40,12 +40,25 @@
jimi-1.0.jar), or you can edit the /usr/bin/fop shell script for
how you would rather have things work.
+UPDATE:
+-------
+
+Massimo Manghi wrote this in bug #354086:
+
+Sun now releases an archive that carries the whole source files tree for
+JIMI and a jar archive named JimiProClasses.zip which is the library
+that has to be installed.
+
+Thanks to him.
+
fop is built with JAI support
-----------------------------
Download JAI (Java Advanced Imaging) at Sun:
http://java.sun.com/products/java-media/jai/
+(I built with jai-1_1_3-alpha)
+
And install the jar files in /usr/share/java (or set your CLASSPATH) and
the .so somewhere in the library path /usr/local/lib or /usr/lib.
@@ -55,5 +68,20 @@
Thanks for feedbacks.
- -- Arnaud Vandyck <avdyk at debian.org>, Fri Oct 14 10:19:42 2005
+fop 0.93.dfsg.1
+---------------
+I removed generated plan examples and all the jars in the lib directory
+
+
+Why not in main?
+----------------
+
+fop needs xmlgraphics-commons which is in contrib.
+
+xmlgraphics-commons is in contrib because it needs not (yet) free sun.*
+classes for jpeg codecs. When OpenJDK will be a reality, these classes
+will be merged in GNU Classpath and xmlgraphics-commons and fop could be
+in main.
+
+ -- Arnaud Vandyck <avdyk at debian.org>, Thu, 10 May 2007 12:46:33 +0200
Modified: trunk/fop/debian/changelog
===================================================================
--- trunk/fop/debian/changelog 2007-05-10 08:12:35 UTC (rev 3424)
+++ trunk/fop/debian/changelog 2007-05-10 12:39:03 UTC (rev 3425)
@@ -1,3 +1,19 @@
+fop (1:0.93.dfsg.1-1) unstable; urgency=low
+
+ * New upstream (closes: #349376, #406109)
+ * fop shell script comes with java.awt.headless set to true (closes:
+ #407018)
+ * Removed Ola Lundqvist, Takashi Okamoto, Stefan Gybas and Wolfgang Baer
+ from uploaders (closes: #374117)
+ * Updated Standards Version to 3.7.2, no change needed
+ * added dependencies to libxp6, libxt6, and libxtst6 so no X environment
+ is needed (closes: #363556)
+ * debian/README.Debian updated to reflect changes regarding JIMI, thanks
+ to Massimo Manghi (closes: #354086)
+ * debian/README.Debian: changed the url to download jai
+
+ -- Arnaud Vandyck <avdyk at debian.org> Thu, 10 May 2007 12:17:35 +0200
+
fop (1:0.20.5-8) unstable; urgency=low
* added a wrapper script for ttfreader called fop-ttfreader. I also
Modified: trunk/fop/debian/control
===================================================================
--- trunk/fop/debian/control 2007-05-10 08:12:35 UTC (rev 3424)
+++ trunk/fop/debian/control 2007-05-10 12:39:03 UTC (rev 3425)
@@ -1,15 +1,15 @@
Source: fop
-Section: contrib/text
+Section: text
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Ola Lundqvist <opal at debian.org>, Takashi Okamoto <tora at debian.org>, Stefan Gybas <sgybas at debian.org>, Arnaud Vandyck <avdyk at debian.org>, Wolfgang Baer <WBaer at gmx.de>
-Build-Depends-Indep: debhelper (>= 4.2.30), cdbs (>= 0.4.27), j2sdk1.4 | java2-compiler, ant, ant-optional, libbatik-java (>= 1.5.1-1), libavalon-framework-java (>=4.1.2-2), libxalan2-java, libxerces2-java
-Standards-Version: 3.6.2
+Uploaders: Arnaud Vandyck <avdyk at debian.org>
+Build-Depends-Indep: debhelper (>= 4.2.30), cdbs (>= 0.4.27), ant, ant-optional, libbatik-java (>= 1.5.1-1), libavalon-framework-java (>=4.1.2-2), libxalan2-java, libxerces2-java, java-gcj-compat-dev, libcommons-io-java, libcommons-logging-java, junit, libxmlgraphics-commons-java, libservlet2.4-java, ibm-j2sdk1.6
+Standards-Version: 3.7.2
Package: fop
Architecture: all
-Depends: java-common, j2re1.3 | j2re1.4 | java2-runtime, libxerces2-java, libxalan2-java, libbsf-java, liblogkit-java, libavalon-framework-java (>=4.1.2-2), libbatik-java (>= 1.5.1-1)
-Suggests: fop-doc
+Depends: java-gcj-compat-dev | java2-runtime, libxerces2-java, libxalan2-java, libbsf-java, libavalon-framework-java (>=4.1.2-2), libbatik-java (>= 1.5.1-1), libcommons-io-java, libcommons-logging-java, libxp6, libxt6, libxtst6, libxmlgraphics-commons-java
+Suggests: fop-doc, libservlet2.4-java
Replaces: libfop-java
Description: XML to PDF Translator
FOP is a print formatter driven by XSL formatting objects.
Modified: trunk/fop/debian/fop.sh
===================================================================
--- trunk/fop/debian/fop.sh 2007-05-10 08:12:35 UTC (rev 3424)
+++ trunk/fop/debian/fop.sh 2007-05-10 12:39:03 UTC (rev 3425)
@@ -6,4 +6,4 @@
export CLASSPATH=$JAVASH/fop.jar:$JAVASH/xalan2.jar:$JAVASH/xercesImpl.jar:$JAVASH/xmlParserAPIs.jar:$JAVASH/logkit.jar:$JAVASH/avalon-framework.jar:$JAVASH/batik.jar:$JAVASH/jimi-1.0.jar:$JAVASH/jai_core.jar:$JAVASH/jai_codec.jar:$JAVASH/mlibwrapper_jai.jar:$CLASSPATH
-java $JAVA_OPTS org.apache.fop.apps.Fop "$@"
+java $JAVA_OPTS -Djava.awt.headless=true org.apache.fop.apps.Fop "$@"
Deleted: trunk/fop/debian/patches/01_README_url_fix.patch
===================================================================
--- trunk/fop/debian/patches/01_README_url_fix.patch 2007-05-10 08:12:35 UTC (rev 3424)
+++ trunk/fop/debian/patches/01_README_url_fix.patch 2007-05-10 12:39:03 UTC (rev 3425)
@@ -1,11 +0,0 @@
---- README.orig 2003-07-15 04:03:13.000000000 +0200
-+++ README 2003-12-15 12:40:36.932792496 +0100
-@@ -8,7 +8,7 @@
- directly on screen.
-
- FOP is part of Apache's XML project. The homepage of FOP is
-- http:/xml.apache.org/fop
-+ http://xml.apache.org/fop
-
- HTML-Documentation can be found in the subdirectory build/site
-
Deleted: trunk/fop/debian/patches/02_Batik1.5.1_CompilePatch.patch
===================================================================
--- trunk/fop/debian/patches/02_Batik1.5.1_CompilePatch.patch 2007-05-10 08:12:35 UTC (rev 3424)
+++ trunk/fop/debian/patches/02_Batik1.5.1_CompilePatch.patch 2007-05-10 12:39:03 UTC (rev 3425)
@@ -1,28 +0,0 @@
---- src/org/apache/fop/svg/PDFTextPainter.java.orig 2003-07-15 04:03:14.000000000 +0200
-+++ src/org/apache/fop/svg/PDFTextPainter.java 2005-03-11 11:26:01.679972072 +0100
-@@ -70,6 +70,7 @@
- import org.apache.batik.gvt.TextPainter;
- import org.apache.batik.gvt.TextNode;
- import org.apache.batik.gvt.text.GVTAttributedCharacterIterator;
-+import org.apache.batik.gvt.text.TextPaintInfo;
- import org.apache.batik.gvt.text.Mark;
- import org.apache.batik.gvt.font.GVTFontFamily;
- import org.apache.batik.gvt.renderer.StrokingTextPainter;
-@@ -191,8 +192,15 @@
- if (size == null) {
- return loc;
- }
-- Stroke stroke =
-- (Stroke)aci.getAttribute(GVTAttributedCharacterIterator.TextAttribute.STROKE);
-+
-+ TextPaintInfo tpi = (TextPaintInfo) aci.getAttribute(
-+ GVTAttributedCharacterIterator.TextAttribute.PAINT_INFO);
-+
-+ if (tpi == null) {
-+ return loc;
-+ }
-+
-+ Stroke stroke = tpi.strokeStroke;
-
- Float posture = (Float)aci.getAttribute(TextAttribute.POSTURE);
- Float taWeight = (Float)aci.getAttribute(TextAttribute.WEIGHT);
Deleted: trunk/fop/debian/patches/03_JavaDoc_Workaround.patch
===================================================================
--- trunk/fop/debian/patches/03_JavaDoc_Workaround.patch 2007-05-10 08:12:35 UTC (rev 3424)
+++ trunk/fop/debian/patches/03_JavaDoc_Workaround.patch 2007-05-10 12:39:03 UTC (rev 3425)
@@ -1,11 +0,0 @@
---- build.xml.orig 2005-03-11 17:05:10.495481904 +0100
-+++ build.xml 2005-03-11 14:04:11.000000000 +0100
-@@ -649,7 +649,7 @@
- bottom="Copyright © ${year} Apache Software Foundation. All Rights Reserved."
- overview="${build.src}/overview.html"
- use="true"
-- failonerror="true">
-+ failonerror="false">
- <group title="Control and Startup">
- <package name="org.apache.fop.apps"/>
- <package name="org.apache.fop.configuration"/>
Modified: trunk/fop/debian/rules
===================================================================
--- trunk/fop/debian/rules 2007-05-10 08:12:35 UTC (rev 3424)
+++ trunk/fop/debian/rules 2007-05-10 12:39:03 UTC (rev 3425)
@@ -11,15 +11,12 @@
include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/ant.mk
-export JITC_PROCESSOR_TYPE=6
-
-JAVA_HOME_DIRS := /usr/local/IBMJava2-ppc-142 /usr/lib/j2sdk1.5-sun /usr/lib/j2sdk1.4-sun /usr/lib/j2sdk1.4-ibm /usr/lib/j2sdk1.4-blackdown
-ANT_HOME := /usr/share/ant
-DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-trax.jar batik avalon-framework xercesImpl xmlParserAPIs xalan2 /usr/local/jimi-1.0.jar
+JAVA_HOME_DIRS := /usr/lib/j2sdk1.6-ibm /usr/lib/jvm/java-gcj
+DEB_JARS := $(ANT_HOME)/lib/ant-trax.jar batik avalon-framework xercesImpl xmlParserAPIs xalan2 junit commons-io commons-logging xmlgraphics-commons servlet-api-2.4 /usr/local/jimi-1.0.jar /usr/local/jai_core.jar /usr/local/jai_codec.jar
DEB_ANT_BUILD_TARGET := package javadocs #docs
DEB_ANT_CLEAN_TARGET := distclean
-VERSION=0.20.5
+VERSION=0.93
DOCD=debian/fop-doc/usr/share/doc/fop-doc
install/fop::
More information about the pkg-java-commits
mailing list