CVS fop/debian
Arnaud Vandyck
avdyk@haydn.debian.org
Mon Mar 21 13:23:02 2005
Update of /cvsroot/pkg-java/fop/debian
In directory haydn:/tmp/cvs-serv15722/debian
Modified Files:
README.Debian ant.properties changelog control fop.sh rules
Added Files:
fop-doc.dirs fop-doc.doc-base fop-doc.examples fop-doc.files
fop.dirs fop.manpages
Log Message:
new version from Wolfgang
--- /cvsroot/pkg-java/fop/debian/README.Debian 2003/11/03 23:23:23 1.2
+++ /cvsroot/pkg-java/fop/debian/README.Debian 2005/03/21 20:22:26 1.3
@@ -1,18 +1,24 @@
-libfop-java for Debian
-----------------------
+fop for Debian
+--------------
You can set the environment variable JAVA_OPTS with options that
are passed to the java interpreter.
-About jimi
-----------
+FOP is built with Jimi support
+------------------------------
-Lot of people would like to have Fop built with Jimi in Debian. But Jimi
-is not free and Jimi is not yet packaged in Debian. If someone plans to
-package Jimi for Debian, I can try to build Fop with Jimi support.
+As fop is in contrib, we can built it with libraries not in
+Debian. That's what I did with fop and jimi. So you only have to
+download jimi for the Sun web site:
-More informations about Jimi:
http://java.sun.com/products/jimi/
- -- Arnaud Vandyck <avdyk@debian.org>, Tue Nov 4 00:10:53 2003
+and copy the jar file to /usr/share/java/ with the name jimi-1.0.jar and
+fop will support images.
+
+If you want to place the jar file else where, you'll have to make a
+symlink to /usr/share/java/jimi-1.0.jar or to modify the /usr/bin/fop
+launcher script.
+
+ -- Arnaud Vandyck <avdyk@debian.org>, Mon Dec 15 17:13:12 2003
--- /cvsroot/pkg-java/fop/debian/ant.properties 2003/11/03 23:23:23 1.1
+++ /cvsroot/pkg-java/fop/debian/ant.properties 2005/03/21 20:22:26 1.2
@@ -1 +1 @@
-runtime.classpath=xercesImpl.jar xml-apis.jar xalan2.jar batik.jar jimi-1.0.jar avalon-framework.jar
+#runtime.classpath=xercesImpl.jar xml-apis.jar xalan2.jar batik.jar avalon-framework.jar
--- /cvsroot/pkg-java/fop/debian/changelog 2003/11/03 23:23:23 1.2
+++ /cvsroot/pkg-java/fop/debian/changelog 2005/03/21 20:22:26 1.3
@@ -1,3 +1,39 @@
+fop (1:0.20.5-5) unstable; urgency=low
+
+ * Patched to compile against libbatik-java 1.5.1
+ updated build-depends to reflect this
+ * Build with jdk1.4 - therefore encryption support enabled (closes: 284634)
+ * Moved from ant to libant1.6-java build-dependency
+ * Use libxerces2-java instead of libxerces-java (closes: 298525)
+ * Removed conflicts with libfop-java and libfop-java-doc (closes: 251270)
+ * avdyk: added Wolfgang to the uploaders
+
+ -- Wolfgang Baer <WBaer@gmx.de> Fri, 11 Mar 2005 11:09:13 +0100
+
+fop (1:0.20.5-4) unstable; urgency=low
+
+ * debian/changelog: The bug was not 210151 but 220151!
+ * README: corrected the url (closes: 220151).
+
+ -- Arnaud Vandyck <avdyk@debian.org> Wed, 7 Jan 2004 18:40:11 +0100
+
+fop (1:0.20.5-3) unstable; urgency=low
+
+ * From libfop-java(-doc) to fop(-doc) and also from contrib/libs to
+ contrib/text (closes: 220237).
+ * debian/README.Debian: explain that I built fop with jimi support
+ * debian/ant.properties: commented the runtime.classpath line
+ * debian/control: modified the compiler
+ * debian/rules:
+ - cdbs include /usr/share/cdbs/1/rules/simple-patchsys.mk
+ - added /usr/local/jimi-1.0.jar in the classpath so fop is now
+ build with jimi support (closes: 180492). See README.Debian!
+ * README: corrected the url (closes: 210151).
+ * debian/libfop-java-doc.doc-base: registered the html documentation
+ (closes: 107782).
+
+ -- Arnaud Vandyck <avdyk@debian.org> Tue, 16 Dec 2003 00:13:04 +0100
+
fop (1:0.20.5-2) unstable; urgency=low
* debian/ant.properties:
@@ -12,8 +48,8 @@
fop (1:0.20.5-1) unstable; urgency=low
* New upstream release
- * changed the version dependency of libavalon-framework-java (Closes:
- #194056)
+ * changed the version dependency of libavalon-framework-java
+ (Closes: #194056)
* using CDBS to build the package.
* Maintainer are Debian Java Maintainers, uploaders: Ola Lundqvist
<opal@debian.org>, Takashi Okamoto <tora@debian.org>, Stefan Gybas
--- /cvsroot/pkg-java/fop/debian/control 2003/10/27 12:48:50 1.1.1.1
+++ /cvsroot/pkg-java/fop/debian/control 2005/03/21 20:22:26 1.2
@@ -1,18 +1,17 @@
Source: fop
-Section: contrib/libs
+Section: contrib/text
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org>
-Uploaders: Ola Lundqvist <opal@debian.org>, Takashi Okamoto <tora@debian.org>, Stefan Gybas <sgybas@debian.org>, Arnaud Vandyck <avdyk@debian.org>
-Build-Depends-Indep: debhelper (>= 4.1), cdbs (>= 0.4.8), j2sdk1.4 | java2-compiler, libant1.5-java, ant (>= 1.5.4-2), libbatik-java (>= 1.5final), libavalon-framework-java (>=4.1.2-2)
+Uploaders: Ola Lundqvist <opal@debian.org>, Takashi Okamoto <tora@debian.org>, Stefan Gybas <sgybas@debian.org>, Arnaud Vandyck <avdyk@debian.org>, Wolfgang Baer <WBaer@gmx.de>
+Build-Depends-Indep: debhelper (>= 4.2.30), cdbs (>= 0.4.27), j2sdk1.4 | java2-compiler, libant1.6-java, libbatik-java (>= 1.5.1-1), libavalon-framework-java (>=4.1.2-2), libxalan2-java, libxerces2-java
Standards-Version: 3.6.1
-Package: libfop-java
+Package: fop
Architecture: all
-Depends: java-common, kaffe (>= 1.1.1) | j2re1.3 | java2-runtime, libxerces-java, libxalan2-java, libbsf-java (>>20010106-2), liblogkit-java, libavalon-framework-java (>=4.1.2-2), libbatik-java (>= 1.5final)
-Suggests: libfop-java-doc, libfop-java-apidoc
-Replaces: lib-fop-java
-Conflicts: lib-fop-java
-Description: A XML to PDF Translator
+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
+Replaces: libfop-java
+Description: XML to PDF Translator
FOP is a print formatter driven by XSL formatting objects.
It is a Java application that reads a formatting object
tree and then turns it into a PDF document. The formatting
@@ -20,15 +19,13 @@
an XSLT engine like xalan) or can be passed in memory as a DOM
Document or (in the case of xalan) SAX events.
-Package: libfop-java-doc
+Package: fop-doc
Architecture: all
-Replaces: lib-fop-java-doc
-Conflicts: lib-fop-java-doc
-Description: Documentation for lib-fop-java
+Replaces: libfop-java-doc
+Description: Documentation for fop
FOP is a print formatter driven by XSL formatting objects.
It is a Java 1.1 application that reads a formatting object
tree and then turns it into a PDF document. The formatting
object tree can be in the form of an XML document (output by
an XSLT engine like xalan) or can be passed in memory as a DOM
Document or (in the case of xalan) SAX events.
-
--- /cvsroot/pkg-java/fop/debian/fop.sh 2003/10/27 12:48:50 1.1.1.1
+++ /cvsroot/pkg-java/fop/debian/fop.sh 2005/03/21 20:22:27 1.2
@@ -4,6 +4,6 @@
JAVASH=/usr/share/java
-export CLASSPATH=$JAVASH/fop.jar:$JAVASH/xalan2.jar:$JAVASH/xerces.jar:$JAVASH/logkit.jar:$JAVASH/avalon-framework.jar:$JAVASH/batik.jar:$JAVASH/jimi-1.0.jar:$CLASSPATH
+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:$CLASSPATH
java $JAVA_OPTS org.apache.fop.apps.Fop "$@"
--- /cvsroot/pkg-java/fop/debian/rules 2003/11/03 23:23:23 1.2
+++ /cvsroot/pkg-java/fop/debian/rules 2005/03/21 20:22:27 1.3
@@ -8,36 +8,34 @@
#export DH_COMPAT=4
include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/rules/simple-patchsys.mk
include /usr/share/cdbs/1/class/ant.mk
-JAVA_HOME_DIRS := /usr/lib/j2se/1.4
-#JAVA_HOME_DIRS := /usr/lib/kaffe
-ANT_HOME := /usr/share/ant
-DEB_JARS := ant-optional batik avalon-framework
-#DEB_ANT_COMPILER := jikes
-DEB_ANT_BUILD_TARGET := package #javadocs
-DEB_BUILDDIR := .
-#DEB_ANT_BUILDFILE := build.xml
+export JITC_PROCESSOR_TYPE=6
+
+JAVA_HOME_DIRS := /usr/local/IBMJava2-ppc-142 /usr/lib/j2se/1.4 /usr/lib/j2sdk1.4-sun
+ANT_HOME := /usr/share/ant1.6
+DEB_JARS := /usr/share/ant1.6/lib/ant-launcher.jar /usr/share/ant1.6/lib/ant-trax.jar batik avalon-framework xercesImpl xmlParserAPIs xalan2 /usr/local/jimi-1.0.jar
+DEB_ANT_BUILD_TARGET := package javadocs #docs
DEB_ANT_CLEAN_TARGET := distclean
-LIBRARY=fop
VERSION=0.20.5
-DOCD=debian/libfop-java-doc/usr/share/doc/libfop-java-doc
+DOCD=debian/fop-doc/usr/share/doc/fop-doc
-install/lib${LIBRARY}-java::
- cp build/${LIBRARY}.jar debian/libfop-java/usr/share/java/${LIBRARY}-${VERSION}.jar
- dh_link usr/share/java/${LIBRARY}-${VERSION}.jar usr/share/java/${LIBRARY}.jar
- cp -a debian/fop.sh debian/libfop-java/usr/bin/fop
+install/fop::
+ cp build/fop.jar debian/fop/usr/share/java/fop-${VERSION}.jar
+ dh_link usr/share/java/fop-${VERSION}.jar usr/share/java/fop.jar
+ cp -a debian/fop.sh debian/fop/usr/bin/fop
pod2man --section=1 \
--release="Fop " \
--date="`date`" \
debian/fop.pod > build/fop.1
+install/fop-doc::
+ -mkdir -p html/api
+ #No documentation at the moment... FORREST needed
+ #cp -a build/docs/* html/
+ cp -a build/javadocs/* debian/fop-doc/usr/share/doc/fop-doc/html/api/
clean::
-rm -Rf build
-
-
-######################################################
-# chmod +x debian/fop.sh
-