Author: drazzib-guest Date: 2009-09-23 23:18:53 +0000 (Wed, 23 Sep 2009) New Revision: 10556
Added: tags/ognl/2.7.3-1/ tags/ognl/2.7.3-1/debian/changelog tags/ognl/2.7.3-1/debian/control tags/ognl/2.7.3-1/debian/copyright tags/ognl/2.7.3-1/debian/patches/01_build_xml.diff tags/ognl/2.7.3-1/debian/patches/02_docbook_xml_source_compliance.diff Removed: tags/ognl/2.7.3-1/debian/changelog tags/ognl/2.7.3-1/debian/control tags/ognl/2.7.3-1/debian/copyright tags/ognl/2.7.3-1/debian/patches/01_build_xml.diff tags/ognl/2.7.3-1/debian/patches/02_docbook_xml_source_compliance.diff Log: [svn-buildpackage] Tagging ognl (2.7.3-1) Deleted: tags/ognl/2.7.3-1/debian/changelog =================================================================== --- trunk/ognl/debian/changelog 2009-09-23 21:36:13 UTC (rev 10553) +++ tags/ognl/2.7.3-1/debian/changelog 2009-09-23 23:18:53 UTC (rev 10556) @@ -1,19 +0,0 @@ -ognl (2.7.3-1) unstable; urgency=low - - [ Trygve Laugstøl ] - * Initial Release (closes: #321476). - - [ Damien Raude-Morvan ] - * Build-Depends on default-jdk - * Build a -doc package containing API and documentations (HTML and PDF) - * Add debian/watch - * Use quilt to apply patches - * Bump Standards-Version to 3.8.2: - - Add a README.source - - Add a get-orig-source target - - Move to "java" Section of the archive - - Add Homepage in debian/control - - Add Vcs-* fields - * Add myself as Uploaders - - -- Damien Raude-Morvan <[email protected]> Fri, 19 Jun 2009 23:56:39 +0200 Copied: tags/ognl/2.7.3-1/debian/changelog (from rev 10555, trunk/ognl/debian/changelog) =================================================================== --- tags/ognl/2.7.3-1/debian/changelog (rev 0) +++ tags/ognl/2.7.3-1/debian/changelog 2009-09-23 23:18:53 UTC (rev 10556) @@ -0,0 +1,19 @@ +ognl (2.7.3-1) unstable; urgency=low + + [ Trygve Laugstøl ] + * Initial Release (closes: #321476). + + [ Damien Raude-Morvan ] + * Build-Depends on default-jdk + * Build a -doc package containing API and documentations (HTML and PDF) + * Add debian/watch + * Use quilt to apply patches + * Bump Standards-Version to 3.8.3: + - Add a README.source + - Add a get-orig-source target + - Move to "java" Section of the archive + - Add Homepage in debian/control + - Add Vcs-* fields + * Add myself as Uploaders + + -- Damien Raude-Morvan <[email protected]> Thu, 24 Sep 2009 01:14:02 +0200 Deleted: tags/ognl/2.7.3-1/debian/control =================================================================== --- trunk/ognl/debian/control 2009-09-23 21:36:13 UTC (rev 10553) +++ tags/ognl/2.7.3-1/debian/control 2009-09-23 23:18:53 UTC (rev 10556) @@ -1,33 +0,0 @@ -Source: ognl -Section: java -Priority: optional -Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Trygve Laugstøl <[email protected]>, Damien Raude-Morvan <[email protected]> -Build-Depends: debhelper (>= 5), cdbs, default-jdk, ant, quilt -Build-Depends-Indep: libjavassist-java, junit4, docbook-xsl, docbook-xml, ant-optional, libxalan2-java, javacc, fop -Standards-Version: 3.8.2 -Homepage: http://www.opensymphony.com/ognl/ -Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/ognl -Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/ognl - -Package: libognl-java -Architecture: all -Depends: ${misc:Depends}, default-jre-headless | java2-runtime -Description: Java expression language - OGNL stands for Object-Graph Navigation Language; it is an expression language - for getting and setting properties of Java objects. You use the same - expression for both getting and setting the value of a property. - - -Package: libognl-java-doc -Architecture: all -Section: doc -Depends: ${misc:Depends} -Description: Java expression language - Documentation - OGNL stands for Object-Graph Navigation Language; it is an expression language - for getting and setting properties of Java objects. You use the same - expression for both getting and setting the value of a property. - . - This package contains Language, Developper Documentation and API of - OGNL software. - Copied: tags/ognl/2.7.3-1/debian/control (from rev 10555, trunk/ognl/debian/control) =================================================================== --- tags/ognl/2.7.3-1/debian/control (rev 0) +++ tags/ognl/2.7.3-1/debian/control 2009-09-23 23:18:53 UTC (rev 10556) @@ -0,0 +1,33 @@ +Source: ognl +Section: java +Priority: optional +Maintainer: Debian Java Maintainers <[email protected]> +Uploaders: Trygve Laugstøl <[email protected]>, Damien Raude-Morvan <[email protected]> +Build-Depends: debhelper (>= 5), cdbs, default-jdk, ant, quilt +Build-Depends-Indep: libjavassist-java, junit4, docbook-xsl, docbook-xml, ant-optional, libxalan2-java, javacc, fop +Standards-Version: 3.8.3 +Homepage: http://www.opensymphony.com/ognl/ +Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/ognl +Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/ognl + +Package: libognl-java +Architecture: all +Depends: ${misc:Depends}, default-jre-headless | java2-runtime +Description: Java expression language + OGNL stands for Object-Graph Navigation Language; it is an expression language + for getting and setting properties of Java objects. You use the same + expression for both getting and setting the value of a property. + + +Package: libognl-java-doc +Architecture: all +Section: doc +Depends: ${misc:Depends} +Description: Java expression language - Documentation + OGNL stands for Object-Graph Navigation Language; it is an expression language + for getting and setting properties of Java objects. You use the same + expression for both getting and setting the value of a property. + . + This package contains Language, Developper Documentation and API of + OGNL software. + Deleted: tags/ognl/2.7.3-1/debian/copyright =================================================================== --- trunk/ognl/debian/copyright 2009-09-23 21:36:13 UTC (rev 10553) +++ tags/ognl/2.7.3-1/debian/copyright 2009-09-23 23:18:53 UTC (rev 10556) @@ -1,106 +0,0 @@ -Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59 -Name: OpenSymphony OGNL -Source: http://svn.opensymphony.com/svn/ognl/ - -Copyright: 2001-2004, The OpenSymphony Group -License: other - The OpenSymphony Software License, Version 1.1 - - (this license is derived and fully compatible with the Apache Software - License - see http://www.apache.org/LICENSE.txt) - - Copyright (c) 2001-2004 The OpenSymphony Group. All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - 3. The end-user documentation included with the redistribution, - if any, must include the following acknowledgment: - "This product includes software developed by the - OpenSymphony Group (http://www.opensymphony.com/)." - Alternately, this acknowledgment may appear in the software itself, - if and wherever such third-party acknowledgments normally appear. - - 4. The names "OpenSymphony" and "The OpenSymphony Group" - must not be used to endorse or promote products derived from this - software without prior written permission. For written - permission, please contact [email protected] . - - 5. Products derived from this software may not be called "OpenSymphony" - or "OGNL", nor may "OpenSymphony" or "OGNL" appear in their - name, without prior written permission of the OpenSymphony Group. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED - WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES - OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE - DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR - ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, - SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT - LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF - USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND - ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT - OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - SUCH DAMAGE. - - -File: src/* -Copyright: 1998-2004, Drew Davidson <[email protected]> - 1998-2004, Luke Blanshard <[email protected]> -Licence: BSD - Copyright (c) 1998-2004, Drew Davidson and Luke Blanshard - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are - met: - - Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - Neither the name of the Drew Davidson nor the names of its contributors - may be used to endorse or promote products derived from this software - without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS - FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, - INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, - BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS - OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, - OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF - THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH - DAMAGE. - - -File: src/java/ognl/OgnlParserTreeConstants.java, - src/java/ognl/JJTOgnlParserState.java, - src/java/ognl/TokenMgrError.java, - src/java/ognl/ParseException.java, - src/java/ognl/Token.java, - src/java/ognl/JavaCharStream.java -Licence: other - Thoses files are generated from src/java/ognl/ognl.jjt using javacc. - -Files: debian/* -Copyright: 2005, Trygve Laugstøl <[email protected]> - 2009, Damien Raude-Morvan <[email protected]> -License: BSD - Copying and distribution of this package, with or without - modification, are permitted in any medium without royalty - provided the copyright notice and this notice are - preserved. Copied: tags/ognl/2.7.3-1/debian/copyright (from rev 10554, trunk/ognl/debian/copyright) =================================================================== --- tags/ognl/2.7.3-1/debian/copyright (rev 0) +++ tags/ognl/2.7.3-1/debian/copyright 2009-09-23 23:18:53 UTC (rev 10556) @@ -0,0 +1,106 @@ +Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59 +Name: OpenSymphony OGNL +Source: http://svn.opensymphony.com/svn/ognl/ + +Copyright: 2001-2004, The OpenSymphony Group +License: other + The OpenSymphony Software License, Version 1.1 + + (this license is derived and fully compatible with the Apache Software + License - see http://www.apache.org/LICENSE.txt) + + Copyright (c) 2001-2004 The OpenSymphony Group. All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + + 1. Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in + the documentation and/or other materials provided with the + distribution. + + 3. The end-user documentation included with the redistribution, + if any, must include the following acknowledgment: + "This product includes software developed by the + OpenSymphony Group (http://www.opensymphony.com/)." + Alternately, this acknowledgment may appear in the software itself, + if and wherever such third-party acknowledgments normally appear. + + 4. The names "OpenSymphony" and "The OpenSymphony Group" + must not be used to endorse or promote products derived from this + software without prior written permission. For written + permission, please contact [email protected] . + + 5. Products derived from this software may not be called "OpenSymphony" + or "OGNL", nor may "OpenSymphony" or "OGNL" appear in their + name, without prior written permission of the OpenSymphony Group. + + THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED + WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES + OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE + DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR + ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, + SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT + LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF + USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND + ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT + OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + + +File: src/* +Copyright: 1998-2004, Drew Davidson <[email protected]> + 1998-2004, Luke Blanshard <[email protected]> +Licence: BSD + Copyright (c) 1998-2004, Drew Davidson and Luke Blanshard + All rights reserved. + + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions are + met: + + Redistributions of source code must retain the above copyright notice, + this list of conditions and the following disclaimer. + Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + Neither the name of the Drew Davidson nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, + OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF + THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH + DAMAGE. + + +File: src/java/ognl/OgnlParserTreeConstants.java, + src/java/ognl/JJTOgnlParserState.java, + src/java/ognl/TokenMgrError.java, + src/java/ognl/ParseException.java, + src/java/ognl/Token.java, + src/java/ognl/JavaCharStream.java +Licence: other + Thoses files are generated from src/java/ognl/ognl.jjt using javacc. + +Files: debian/* +Copyright: 2005, Trygve Laugstøl <[email protected]> + 2009, Damien Raude-Morvan <[email protected]> +License: BSD + Copying and distribution of this package, with or without + modification, are permitted in any medium without royalty + provided the copyright notice and this notice are + preserved. Deleted: tags/ognl/2.7.3-1/debian/patches/01_build_xml.diff =================================================================== --- trunk/ognl/debian/patches/01_build_xml.diff 2009-09-23 21:36:13 UTC (rev 10553) +++ tags/ognl/2.7.3-1/debian/patches/01_build_xml.diff 2009-09-23 23:18:53 UTC (rev 10556) @@ -1,109 +0,0 @@ -Description: - - build.xml: Remove foreach usage as antcontrib is not in Debian - - build.xml: Don't fork javacc-generate (use Ant Classpath) - - docbook.xml: Use Xalan2 as XSLT processor - - docbook.xml: Fix classpath inclusion of fop.jar -Origin: Damien Raude-Morvan <[email protected]> ---- a/docbook.xml -+++ b/docbook.xml -@@ -183,16 +183,24 @@ - force="true" - in="${project.docbook}/${docbook.file}.xml" - out="${output.docbook.html}/${docbook.file}/index.html"> -+ <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/> - <param name="base.dir" expression="${output.docbook.html}/${docbook.file}/"/> - <param name="chunk.quietly" expression="1"/> - <param name="root.filename" expression="index"/> - <param name="use.id.as.filename" expression="1"/> -+ <param name="fop.extensions" expression="0"/> -+ <param name="fop1.extensions" expression="0"/> - <xmlcatalog refid="docbook.catalog"/> - </xslt> - </target> - - <target name="docbook-html-doc" depends="docbook-init"> -- <foreach target="docbook-html-doc-single" list="${project.docbook.filelist}" param="docbook.file"/> -+ <antcall target="docbook-html-doc-single"> -+ <param name="docbook.file" value="LanguageGuide" /> -+ </antcall> -+ <antcall target="docbook-html-doc-single"> -+ <param name="docbook.file" value="DeveloperGuide" /> -+ </antcall> - </target> - - <target name="docbook-pdf-doc-single" depends="docbook-init"> -@@ -252,29 +260,32 @@ - force="true" - in="${project.docbook}/${docbook.file}.xml" - out="${output.docbook.fop}/${docbook.file}.fop"> -+ <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/> - <param name="base.dir" expression="${output.docbook.html}/${docbook.file}/"/> - <param name="project.docbook.file" expression="${docbook.file}"/> - <param name="use.id.as.filename" expression="1"/> -+ <param name="fop.extensions" expression="0"/> -+ <param name="fop1.extensions" expression="0"/> - <xmlcatalog refid="docbook.catalog"/> - </xslt> - </target> - - <target name="docbook-convert-fo-to-pdf" unless="uptodate.pdf"> - <echo>Converting FO to PDF ...</echo> -- <java classname="org.apache.fop.apps.Fop" fork="true"> -- <classpath> -- <fileset dir="${fop.dir}"> -- <include name="**/*.jar"/> -- </fileset> -- </classpath> -+ <exec executable="/usr/bin/fop"> - <arg line="-q"/> - <arg line="-fo ${output.docbook.fop}/${docbook.file}.fop"/> - <arg line="-pdf ${output.docbook.pdf}/${docbook.file}.pdf"/> -- </java> -+ </exec> - </target> - - <target name="docbook-pdf-doc" depends="docbook-init"> -- <foreach target="docbook-pdf-doc-single" list="${project.docbook.filelist}" param="docbook.file"/> -+ <antcall target="docbook-pdf-doc-single"> -+ <param name="docbook.file" value="LanguageGuide" /> -+ </antcall> -+ <antcall target="docbook-pdf-doc-single"> -+ <param name="docbook.file" value="DeveloperGuide" /> -+ </antcall> - </target> - - </project> ---- a/osbuild.xml -+++ b/osbuild.xml -@@ -138,14 +138,11 @@ - classpathref="cp" - author="true" - version="true" -- overview="${src.java}/overview.html" - windowTitle="${fullname} API - ${version}" - doctitle="${fullname} API (${version})" - footer="<a href="http://www.opensymphony.com/${name}/" target="_top">${fullname} Project Page</a>" - use="true" - verbose="false"> -- <link href="http://java.sun.com/j2se/${compile.version}/docs/api/"/> -- <link href="http://java.sun.com/j2ee/${compile.version}/docs/api/"/> - </javadoc> - <!-- <copy overwrite="yes" file="${docs}/main.css" tofile="${docs}/api/stylesheet.css"/> --> - </target> ---- a/build.xml -+++ b/build.xml -@@ -59,12 +59,12 @@ - </target> - - <target name="javacc-generate"> -- <java classname="org.javacc.jjtree.Main" classpathref="cp" fork="true"> -+ <java classname="org.javacc.jjtree.Main" fork="false"> - <arg value="-OUTPUT_DIRECTORY=${src.java}/ognl"/> - <arg value="${src.java}/ognl/ognl.jjt"/> - </java> - -- <java classname="org.javacc.parser.Main" classpathref="cp" fork="true"> -+ <java classname="org.javacc.parser.Main" fork="false"> - <arg value="-OUTPUT_DIRECTORY=${src.java}/ognl"/> - <arg value="${src.java}/ognl/ognl.jj"/> - </java> Copied: tags/ognl/2.7.3-1/debian/patches/01_build_xml.diff (from rev 10554, trunk/ognl/debian/patches/01_build_xml.diff) =================================================================== --- tags/ognl/2.7.3-1/debian/patches/01_build_xml.diff (rev 0) +++ tags/ognl/2.7.3-1/debian/patches/01_build_xml.diff 2009-09-23 23:18:53 UTC (rev 10556) @@ -0,0 +1,109 @@ +Description: + - build.xml: Remove foreach usage as antcontrib is not in Debian + - build.xml: Don't fork javacc-generate (use Ant Classpath) + - docbook.xml: Use Xalan2 as XSLT processor + - docbook.xml: Fix classpath inclusion of fop.jar +Origin: Damien Raude-Morvan <[email protected]> +--- a/docbook.xml ++++ b/docbook.xml +@@ -183,16 +183,24 @@ + force="true" + in="${project.docbook}/${docbook.file}.xml" + out="${output.docbook.html}/${docbook.file}/index.html"> ++ <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/> + <param name="base.dir" expression="${output.docbook.html}/${docbook.file}/"/> + <param name="chunk.quietly" expression="1"/> + <param name="root.filename" expression="index"/> + <param name="use.id.as.filename" expression="1"/> ++ <param name="fop.extensions" expression="0"/> ++ <param name="fop1.extensions" expression="0"/> + <xmlcatalog refid="docbook.catalog"/> + </xslt> + </target> + + <target name="docbook-html-doc" depends="docbook-init"> +- <foreach target="docbook-html-doc-single" list="${project.docbook.filelist}" param="docbook.file"/> ++ <antcall target="docbook-html-doc-single"> ++ <param name="docbook.file" value="LanguageGuide" /> ++ </antcall> ++ <antcall target="docbook-html-doc-single"> ++ <param name="docbook.file" value="DeveloperGuide" /> ++ </antcall> + </target> + + <target name="docbook-pdf-doc-single" depends="docbook-init"> +@@ -252,29 +260,32 @@ + force="true" + in="${project.docbook}/${docbook.file}.xml" + out="${output.docbook.fop}/${docbook.file}.fop"> ++ <factory name="org.apache.xalan.processor.TransformerFactoryImpl"/> + <param name="base.dir" expression="${output.docbook.html}/${docbook.file}/"/> + <param name="project.docbook.file" expression="${docbook.file}"/> + <param name="use.id.as.filename" expression="1"/> ++ <param name="fop.extensions" expression="0"/> ++ <param name="fop1.extensions" expression="0"/> + <xmlcatalog refid="docbook.catalog"/> + </xslt> + </target> + + <target name="docbook-convert-fo-to-pdf" unless="uptodate.pdf"> + <echo>Converting FO to PDF ...</echo> +- <java classname="org.apache.fop.apps.Fop" fork="true"> +- <classpath> +- <fileset dir="${fop.dir}"> +- <include name="**/*.jar"/> +- </fileset> +- </classpath> ++ <exec executable="/usr/bin/fop"> + <arg line="-q"/> + <arg line="-fo ${output.docbook.fop}/${docbook.file}.fop"/> + <arg line="-pdf ${output.docbook.pdf}/${docbook.file}.pdf"/> +- </java> ++ </exec> + </target> + + <target name="docbook-pdf-doc" depends="docbook-init"> +- <foreach target="docbook-pdf-doc-single" list="${project.docbook.filelist}" param="docbook.file"/> ++ <antcall target="docbook-pdf-doc-single"> ++ <param name="docbook.file" value="LanguageGuide" /> ++ </antcall> ++ <antcall target="docbook-pdf-doc-single"> ++ <param name="docbook.file" value="DeveloperGuide" /> ++ </antcall> + </target> + + </project> +--- a/osbuild.xml ++++ b/osbuild.xml +@@ -138,14 +138,11 @@ + classpathref="cp" + author="true" + version="true" +- overview="${src.java}/overview.html" + windowTitle="${fullname} API - ${version}" + doctitle="${fullname} API (${version})" + footer="<a href="http://www.opensymphony.com/${name}/" target="_top">${fullname} Project Page</a>" + use="true" + verbose="false"> +- <link href="http://java.sun.com/j2se/${compile.version}/docs/api/"/> +- <link href="http://java.sun.com/j2ee/${compile.version}/docs/api/"/> + </javadoc> + <!-- <copy overwrite="yes" file="${docs}/main.css" tofile="${docs}/api/stylesheet.css"/> --> + </target> +--- a/build.xml ++++ b/build.xml +@@ -59,12 +59,12 @@ + </target> + + <target name="javacc-generate"> +- <java classname="org.javacc.jjtree.Main" classpathref="cp" fork="true"> ++ <java classname="org.javacc.jjtree.Main" fork="false"> + <arg value="-OUTPUT_DIRECTORY=${src.java}/ognl"/> + <arg value="${src.java}/ognl/ognl.jjt"/> + </java> + +- <java classname="org.javacc.parser.Main" classpathref="cp" fork="true"> ++ <java classname="org.javacc.parser.Main" fork="false"> + <arg value="-OUTPUT_DIRECTORY=${src.java}/ognl"/> + <arg value="${src.java}/ognl/ognl.jj"/> + </java> Deleted: tags/ognl/2.7.3-1/debian/patches/02_docbook_xml_source_compliance.diff =================================================================== --- trunk/ognl/debian/patches/02_docbook_xml_source_compliance.diff 2009-09-23 21:36:13 UTC (rev 10553) +++ tags/ognl/2.7.3-1/debian/patches/02_docbook_xml_source_compliance.diff 2009-09-23 23:18:53 UTC (rev 10556) @@ -1,50 +0,0 @@ -Description: - Fix some duplicated entities in upstream Docbook XML -Origin: Damien Raude-Morvan <[email protected]> ---- a/docbook/DeveloperGuide.xml -+++ b/docbook/DeveloperGuide.xml -@@ -33,7 +33,7 @@ - of some sort to data transfer objects that are operated on by a view. Another example is an XML configuration file wherein values are generated via expressions which are then bound to configured objects.</para> - - <section id="embeddingOGNL"> -- <title id="embeddingOGNL">Embedding OGNL</title> -+ <title>Embedding OGNL</title> - - <para>The <classname>ognl.Ognl</classname> class contains convenience methods for evaluating <acronym>OGNL</acronym> expressions. You can do this in two stages, parsing an expression into an internal form and then using that internal form - to either set or get the value of a property; or you can do it in a single stage, and get or set a property using the String form of the expression directly. It is more efficient to pre-compile the expression to it's parsed form, -@@ -79,7 +79,7 @@ - </section> - - <section id="extendingOGNL"> -- <title id="extendingOGNL">Extending OGNL</title> -+ <title>Extending OGNL</title> - - <para>OGNL expressions are not evaluated in a static environment, as Java programs are. Expressions are not compiled to bytecode at the expression level based on static class reachability. The same expression can have multiple paths - through an object graph depending upon the root object specified and the dynamic results of the navigation. Objects that are delegated to handle all of the access to properties of objects, elements of collections, methods of objects, -@@ -264,4 +264,4 @@ - the <classname>Evaluation</classname>.</para> - </section> - </chapter> --</book> -\ No newline at end of file -+</book> ---- a/docbook/LanguageGuide.xml -+++ b/docbook/LanguageGuide.xml -@@ -449,8 +449,8 @@ - <section id="constructors"> - <title>Calling Constructors</title> - -- <para>You can create new objects as in Java, with the <function>new</function> operator. One difference is that you must specify the fully qualified class name for classes other than those in the java.lang package.<footnoteref -- linkend="classresolver" /><footnote><para>This is only true with the default ClassResolver in place. With a custom class resolver packages can be mapped in such a way that more Java-like references to classes can be made. Refer to the -+ <para>You can create new objects as in Java, with the <function>new</function> operator. One difference is that you must specify the fully qualified class name for classes other than those in the java.lang package. -+ <footnote><para>This is only true with the default ClassResolver in place. With a custom class resolver packages can be mapped in such a way that more Java-like references to classes can be made. Refer to the - OGNL Developer's Guide for details on using <classname>ClassResolver</classname> class.</para></footnote> (for example, <function>new java.util.ArrayList()</function>, rather than simply <function>new ArrayList()</function>).</para> - - <para><acronym>OGNL</acronym> chooses the right constructor to call using the same procedure it uses for overloaded method calls.</para> -@@ -971,4 +971,4 @@ - </table> - </section> - </appendix> --</book> -\ No newline at end of file -+</book> Copied: tags/ognl/2.7.3-1/debian/patches/02_docbook_xml_source_compliance.diff (from rev 10554, trunk/ognl/debian/patches/02_docbook_xml_source_compliance.diff) =================================================================== --- tags/ognl/2.7.3-1/debian/patches/02_docbook_xml_source_compliance.diff (rev 0) +++ tags/ognl/2.7.3-1/debian/patches/02_docbook_xml_source_compliance.diff 2009-09-23 23:18:53 UTC (rev 10556) @@ -0,0 +1,50 @@ +Description: + Fix some duplicated entities in upstream Docbook XML +Origin: Damien Raude-Morvan <[email protected]> +--- a/docbook/DeveloperGuide.xml ++++ b/docbook/DeveloperGuide.xml +@@ -33,7 +33,7 @@ + of some sort to data transfer objects that are operated on by a view. Another example is an XML configuration file wherein values are generated via expressions which are then bound to configured objects.</para> + + <section id="embeddingOGNL"> +- <title id="embeddingOGNL">Embedding OGNL</title> ++ <title>Embedding OGNL</title> + + <para>The <classname>ognl.Ognl</classname> class contains convenience methods for evaluating <acronym>OGNL</acronym> expressions. You can do this in two stages, parsing an expression into an internal form and then using that internal form + to either set or get the value of a property; or you can do it in a single stage, and get or set a property using the String form of the expression directly. It is more efficient to pre-compile the expression to it's parsed form, +@@ -79,7 +79,7 @@ + </section> + + <section id="extendingOGNL"> +- <title id="extendingOGNL">Extending OGNL</title> ++ <title>Extending OGNL</title> + + <para>OGNL expressions are not evaluated in a static environment, as Java programs are. Expressions are not compiled to bytecode at the expression level based on static class reachability. The same expression can have multiple paths + through an object graph depending upon the root object specified and the dynamic results of the navigation. Objects that are delegated to handle all of the access to properties of objects, elements of collections, methods of objects, +@@ -264,4 +264,4 @@ + the <classname>Evaluation</classname>.</para> + </section> + </chapter> +-</book> +\ No newline at end of file ++</book> +--- a/docbook/LanguageGuide.xml ++++ b/docbook/LanguageGuide.xml +@@ -449,8 +449,8 @@ + <section id="constructors"> + <title>Calling Constructors</title> + +- <para>You can create new objects as in Java, with the <function>new</function> operator. One difference is that you must specify the fully qualified class name for classes other than those in the java.lang package.<footnoteref +- linkend="classresolver" /><footnote><para>This is only true with the default ClassResolver in place. With a custom class resolver packages can be mapped in such a way that more Java-like references to classes can be made. Refer to the ++ <para>You can create new objects as in Java, with the <function>new</function> operator. One difference is that you must specify the fully qualified class name for classes other than those in the java.lang package. ++ <footnote><para>This is only true with the default ClassResolver in place. With a custom class resolver packages can be mapped in such a way that more Java-like references to classes can be made. Refer to the + OGNL Developer's Guide for details on using <classname>ClassResolver</classname> class.</para></footnote> (for example, <function>new java.util.ArrayList()</function>, rather than simply <function>new ArrayList()</function>).</para> + + <para><acronym>OGNL</acronym> chooses the right constructor to call using the same procedure it uses for overloaded method calls.</para> +@@ -971,4 +971,4 @@ + </table> + </section> + </appendix> +-</book> +\ No newline at end of file ++</book> _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
