Author: malat Date: 2012-11-03 14:37:46 +0000 (Sat, 03 Nov 2012) New Revision: 16353
Modified: trunk/fop/debian/changelog trunk/fop/debian/control trunk/fop/debian/fop.1 trunk/fop/debian/fop.1.in trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch trunk/fop/debian/patches/fixbuildxml.patch trunk/fop/debian/patches/series Log: Prepare an experimental fop 1.1 Modified: trunk/fop/debian/changelog =================================================================== --- trunk/fop/debian/changelog 2012-11-03 14:35:24 UTC (rev 16352) +++ trunk/fop/debian/changelog 2012-11-03 14:37:46 UTC (rev 16353) @@ -1,3 +1,17 @@ +fop (1:1.1.dfsg-1) experimental; urgency=low + + * New upstream. Closes: #691474 + * Use my @d.o alias, remove DMUA flags + * Bump Std-Vers to 3.9.3, no changes needed + * Remove patches applied upstream: + - d/p/enco.patch + - d/p/enco2.patch + - d/p/fixnpeinlinestacking.patch + - d/p/illegalargex.patch + * d/control: now requires xmlgraphics-commons >= 1.5 + + -- Mathieu Malaterre <ma...@debian.org> Sat, 03 Nov 2012 15:35:23 +0100 + fop (1:1.0.dfsg2-6) unstable; urgency=low [ Mathieu Malaterre ] Modified: trunk/fop/debian/control =================================================================== --- trunk/fop/debian/control 2012-11-03 14:35:24 UTC (rev 16352) +++ trunk/fop/debian/control 2012-11-03 14:37:46 UTC (rev 16353) @@ -2,19 +2,18 @@ Section: text Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintain...@lists.alioth.debian.org> -DM-Upload-Allowed: yes Uploaders: Sylvestre Ledru <sylves...@debian.org>, Torsten Werner <twer...@debian.org>, - Mathieu Malaterre <mathieu.malate...@gmail.com>, + Mathieu Malaterre <ma...@debian.org>, Vincent Fourmond <fourm...@debian.org> Build-Depends: debhelper (>= 5), cdbs (>= 0.4.27) Build-Depends-Indep: ant-optional (>= 1.8.2), libbatik-java (>= 1.7), libavalon-framework-java (>=4.1.2-2), libxalan2-java, libxerces2-java, default-jdk, libcommons-io-java, libxmlunit-java, - libcommons-logging-java, junit, libxmlgraphics-commons-java (>= 1.4), + libcommons-logging-java, junit, libxmlgraphics-commons-java (>= 1.5), libservlet2.5-java, libxml-commons-external-java, maven-repo-helper, libqdox-java, unzip -Standards-Version: 3.9.2 +Standards-Version: 3.9.3 Homepage: http://xmlgraphics.apache.org/fop/ Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/fop Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/fop/ Modified: trunk/fop/debian/fop.1 =================================================================== --- trunk/fop/debian/fop.1 2012-11-03 14:35:24 UTC (rev 16352) +++ trunk/fop/debian/fop.1 2012-11-03 14:37:46 UTC (rev 16353) @@ -1,5 +1,5 @@ -.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. -.TH FOP "1" "January 2012" "fop Version 1.0" "User Commands" +.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.40.12. +.TH FOP "1" "November 2012" "fop Version 1.1" "User Commands" .SH NAME fop \- Command line wrapper for the java version of fop. @@ -35,6 +35,9 @@ \fB\-l\fR lang the language to use for user information .TP +\fB\-nocs\fR +disable complex script features +.TP \fB\-r\fR relaxed/less strict validation (where available) .TP @@ -65,6 +68,18 @@ \fB\-noannotations\fR PDF file will be encrypted without edit annotation permission .TP +\fB\-nofillinforms\fR +PDF file will be encrypted without fill in interactive form fields permission +.TP +\fB\-noaccesscontent\fR +PDF file will be encrypted without extract text and graphics permission +.TP +\fB\-noassembledoc\fR +PDF file will be encrypted without assemble the document permission +.TP +\fB\-noprinthq\fR +PDF file will be encrypted without print high quality permission +.TP \fB\-a\fR enables accessibility features (Tagged PDF etc., default off) .TP @@ -73,8 +88,14 @@ (Examples for prof: PDF/A\-1b or PDF/X\-3:2003) .TP \fB\-conserve\fR -Enable memory\-conservation policy (trades memory\-consumption for disk I/O) +enable memory\-conservation policy (trades memory\-consumption for disk I/O) (Note: currently only influences whether the area tree is serialized.) +.TP +\fB\-cache\fR +specifies a file/directory path location for the font cache file +.TP +\fB\-flush\fR +flushes the current font cache file .IP .SH INPUT .TP @@ -159,7 +180,7 @@ .TP \fB\-out\fR mime outfile input will be rendered using the given MIME type (outfile req'd) Example: "\-out application/pdf D:\eout.pdf" -(Tip: "\-out list" prints the list of supported MIME types) +(Tip: "\-out list" prints the list of supported MIME types and exits) .TP \fB\-svg\fR outfile input will be rendered as an SVG slides file (outfile req'd) @@ -190,6 +211,8 @@ fop foo.fo \fB\-print\fR fop foo.fo \fB\-awt\fR +.PP +FOP Version 1.1 .SH HYPENATION fop can make use of external hyphenation rules that can be supplied in @@ -213,7 +236,7 @@ .SH AUTHOR Wrapper author: Ola Lundqvist <o...@debian.org> -This manual page was written by Mathieu Malaterre <mathieu.malate...@gmail.com>, +This manual page was written by Mathieu Malaterre <ma...@debian.org>, for the Debian project (and may be used by others). .SH "SEE ALSO" .BR fop-ttfreader(1), Modified: trunk/fop/debian/fop.1.in =================================================================== --- trunk/fop/debian/fop.1.in 2012-11-03 14:35:24 UTC (rev 16352) +++ trunk/fop/debian/fop.1.in 2012-11-03 14:37:46 UTC (rev 16353) @@ -33,7 +33,7 @@ [AUTHOR] Wrapper author: Ola Lundqvist <o...@debian.org> -This manual page was written by Mathieu Malaterre <mathieu.malate...@gmail.com>, +This manual page was written by Mathieu Malaterre <ma...@debian.org>, for the Debian project (and may be used by others). [SEE ALSO] Modified: trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch =================================================================== --- trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch 2012-11-03 14:35:24 UTC (rev 16352) +++ trunk/fop/debian/patches/04_fixqdoxbuildfailure.patch 2012-11-03 14:37:46 UTC (rev 16353) @@ -1,9 +1,9 @@ Fix a lintian issue: add class-path -Index: fop-1.0/build.xml +Index: fop-1.1/build.xml =================================================================== ---- fop-1.0.orig/build.xml 2010-07-12 21:34:37.000000000 +0200 -+++ fop-1.0/build.xml 2011-08-26 15:15:10.000000000 +0200 -@@ -517,7 +517,7 @@ +--- fop-1.1.orig/build.xml 2012-10-16 17:47:36.000000000 +0200 ++++ fop-1.1/build.xml 2012-11-03 14:58:00.773621554 +0100 +@@ -477,7 +477,7 @@ <pathconvert property="manifest.classpath" dirsep="/" pathsep=" " refid="libs-build-classpath"> <map from="${basedir}${file.separator}lib${file.separator}" to=""/> </pathconvert> @@ -11,10 +11,10 @@ + <jar jarfile="${build.dir}/fop.jar" basedir="${build.classes.dir}" manifest="${basedir}/fop.mf"> <manifest> <attribute name="Main-Class" value="org.apache.fop.cli.Main"/> - <attribute name="Class-Path" value="${manifest.classpath}"/> -Index: fop-1.0/fop.mf + <attribute name="Build-Id" value="${ts} (${user.name} [${os.name} ${os.version} ${os.arch}, Java ${java.runtime.version}, Target Java ${javac.target}])"/> +Index: fop-1.1/fop.mf =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ fop-1.0/fop.mf 2011-08-26 15:15:10.000000000 +0200 -@@ -0,0 +1,1 @@ ++++ fop-1.1/fop.mf 2012-11-03 14:58:00.773621554 +0100 +@@ -0,0 +1 @@ +Class-Path: xercesImpl.jar xalan2.jar bsf.jar avalon-framework.jar batik.jar commons-io.jar commons-logging.jar xmlgraphics-commons.jar xml-commons-external.jar Modified: trunk/fop/debian/patches/fixbuildxml.patch =================================================================== --- trunk/fop/debian/patches/fixbuildxml.patch 2012-11-03 14:35:24 UTC (rev 16352) +++ trunk/fop/debian/patches/fixbuildxml.patch 2012-11-03 14:37:46 UTC (rev 16353) @@ -1,16 +1,14 @@ -Index: fop-1.0.dfsg2/build.xml -=================================================================== ---- fop-1.0.dfsg2.orig/build.xml 2011-09-16 15:10:36.000000000 +0200 -+++ fop-1.0.dfsg2/build.xml 2011-09-16 15:10:57.000000000 +0200 -@@ -149,8 +149,9 @@ - <property name="javac.debug" value="on"/> - <property name="javac.optimize" value="off"/> +Description: Use proper encoding to remove warnings +Author: Mathieu Malaterre <ma...@debian.org> +Forwarded: no + +--- fop-1.1.dfsg.orig/build.xml ++++ fop-1.1.dfsg/build.xml +@@ -156,6 +156,7 @@ list of possible build targets. <property name="javac.deprecation" value="on"/> -- <property name="javac.source" value="1.4"/> -- <property name="javac.target" value="1.4"/> -+ <property name="javac.source" value="1.5"/> -+ <property name="javac.target" value="1.5"/> + <property name="javac.source" value="1.5"/> + <property name="javac.target" value="1.5"/> + <property name="javac.encoding" value="utf-8"/> <property name="javac.fork" value="no"/> - <property name="junit.fork" value="on"/> + <property name="junit.fork" value="yes"/> <property name="junit.haltonfailure" value="off"/> Modified: trunk/fop/debian/patches/series =================================================================== --- trunk/fop/debian/patches/series 2012-11-03 14:35:24 UTC (rev 16352) +++ trunk/fop/debian/patches/series 2012-11-03 14:37:46 UTC (rev 16353) @@ -1,6 +1,2 @@ 04_fixqdoxbuildfailure.patch -enco.patch -enco2.patch fixbuildxml.patch -fixnpeinlinestacking.patch -illegalargex.patch _______________________________________________ pkg-java-commits mailing list pkg-java-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits