This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository ognl.
commit dce67fa3948ba9bfee01a462808fca603ca22f4c Author: Damien Raude-Morvan <[email protected]> Date: Sun Aug 9 14:42:56 2009 +0000 [ognl] * Generate Parser using javacc * Include PDF documentation --- debian/changelog | 4 +- debian/control | 2 +- debian/copyright | 15 ++++- debian/libognl-java-doc.doc-base.dev | 2 + debian/libognl-java-doc.doc-base.lang | 2 + debian/libognl-java-doc.docs | 7 ++- debian/orig-tar.exclude | 1 + debian/orig-tar.sh | 21 +++++++ debian/patches/01_build_xml.diff | 71 ++++++++++++++++++---- .../patches/02_docbook_xml_source_compliance.diff | 19 ------ debian/rules | 16 ++--- 11 files changed, 110 insertions(+), 50 deletions(-) diff --git a/debian/changelog b/debian/changelog index 1c2a036..fb89a1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,8 @@ ognl (2.7.3-1) UNRELEASED; urgency=low * Initial Release (closes: #321476). [ Damien Raude-Morvan ] - * Build-Depends on default-jdk-builddep - * Build a -doc package containing API and documentations + * 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: diff --git a/debian/control b/debian/control index 9009ac2..237cac8 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ 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 +Build-Depends-Indep: libjavassist-java, junit4, docbook-xsl, docbook-xml, ant-optional, libxalan2-java, javacc Standards-Version: 3.8.2 Homepage: http://www.opensymphony.com/ognl/ Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/ognl diff --git a/debian/copyright b/debian/copyright index 793e34a..097cf75 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=54 +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/ @@ -87,10 +87,19 @@ Licence: BSD 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]>W +Copyright: 2005, Trygve Laugstøl <[email protected]> 2009, Damien Raude-Morvan <[email protected]> -License: +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 diff --git a/debian/libognl-java-doc.doc-base.dev b/debian/libognl-java-doc.doc-base.dev index 273224c..1d51de7 100644 --- a/debian/libognl-java-doc.doc-base.dev +++ b/debian/libognl-java-doc.doc-base.dev @@ -8,3 +8,5 @@ Format: HTML Index: /usr/share/doc/libognl-java-doc/DeveloperGuide/index.html Files: /usr/share/doc/libognl-java-doc/DeveloperGuide/* +Format: PDF +Files: /usr/share/doc/libognl-java-doc/DeveloperGuide.pdf diff --git a/debian/libognl-java-doc.doc-base.lang b/debian/libognl-java-doc.doc-base.lang index 6157684..e436b2e 100644 --- a/debian/libognl-java-doc.doc-base.lang +++ b/debian/libognl-java-doc.doc-base.lang @@ -8,3 +8,5 @@ Format: HTML Index: /usr/share/doc/libognl-java-doc/LanguageGuide/index.html Files: /usr/share/doc/libognl-java-doc/LanguageGuide/* +Format: PDF +Files: /usr/share/doc/libognl-java-doc/LanguageGuide.pdf diff --git a/debian/libognl-java-doc.docs b/debian/libognl-java-doc.docs index 0d58d34..929dd92 100644 --- a/debian/libognl-java-doc.docs +++ b/debian/libognl-java-doc.docs @@ -1,4 +1,5 @@ -build/docbook/html/LanguageGuide -build/docbook/html/DeveloperGuide +dist/docs/html/LanguageGuide +dist/docs/html/DeveloperGuide +dist/docs/pdf/DeveloperGuide.pdf +dist/docs/pdf/LanguageGuide.pdf dist/docs/api - diff --git a/debian/orig-tar.exclude b/debian/orig-tar.exclude new file mode 100644 index 0000000..623ba1a --- /dev/null +++ b/debian/orig-tar.exclude @@ -0,0 +1 @@ +*/lib/* diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh new file mode 100644 index 0000000..99642e9 --- /dev/null +++ b/debian/orig-tar.sh @@ -0,0 +1,21 @@ +#!/bin/sh -e + +# $1 version +TAR=../ognl_$1.orig.tar.gz +DIR=ognl-$1.orig +TAG=$1 + +# clean up the upstream tarball +mkdir $DIR +svn export --force http://svn.opensymphony.com/svn/ognl/tags/$TAG $DIR +GZIP=--best tar -c -z -f $TAR -X debian/orig-tar.exclude $DIR +rm -rf $DIR + +# move to directory 'tarballs' +if [ -r .svn/deb-layout ]; then + . .svn/deb-layout + mv $TAR $origDir + echo "moved $TAR to $origDir" +fi + +exit 0 diff --git a/debian/patches/01_build_xml.diff b/debian/patches/01_build_xml.diff index 60612db..4e5a496 100644 --- a/debian/patches/01_build_xml.diff +++ b/debian/patches/01_build_xml.diff @@ -1,10 +1,24 @@ Description: - Remove foreach usage as antcontrib is not in Debian - Fix classpath inclusion of fop.jar + - 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 -@@ -193,7 +193,12 @@ +@@ -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"> @@ -18,16 +32,34 @@ Origin: Damien Raude-Morvan <[email protected]> </target> <target name="docbook-pdf-doc-single" depends="docbook-init"> -@@ -266,7 +271,7 @@ - <java classname="org.apache.fop.apps.Fop" fork="true"> - <classpath> - <fileset dir="${fop.dir}"> +@@ -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"/> -+ <include name="fop.jar"/> - </fileset> - </classpath> +- </fileset> +- </classpath> ++ <exec executable="/usr/bin/fop"> <arg line="-q"/> -@@ -276,7 +281,12 @@ + <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"> @@ -58,3 +90,20 @@ Origin: Damien Raude-Morvan <[email protected]> </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> diff --git a/debian/patches/02_docbook_xml_source_compliance.diff b/debian/patches/02_docbook_xml_source_compliance.diff index ff18be4..f3a3393 100644 --- a/debian/patches/02_docbook_xml_source_compliance.diff +++ b/debian/patches/02_docbook_xml_source_compliance.diff @@ -1,5 +1,4 @@ Description: - docbook.xml: use Xalan2 as XSLT processor Fix some duplicated entities in upstream Docbook XML Origin: Damien Raude-Morvan <[email protected]> --- a/docbook/DeveloperGuide.xml @@ -49,21 +48,3 @@ Origin: Damien Raude-Morvan <[email protected]> -</book> \ No newline at end of file +</book> ---- a/docbook.xml -+++ b/docbook.xml -@@ -183,6 +183,7 @@ - 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"/> -@@ -252,6 +253,7 @@ - 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"/> diff --git a/debian/rules b/debian/rules index 69dfb08..0ae0512 100755 --- a/debian/rules +++ b/debian/rules @@ -6,23 +6,17 @@ include /usr/share/cdbs/1/class/ant.mk JAVA_HOME := /usr/lib/jvm/default-java -DEB_JARS := javassist junit4 ant-trax xalan2 xml-apis serializer +DEB_JARS := javassist junit4 ant-trax xalan2 xml-apis serializer javacc DEB_ANT_ARGS := -Dversion=$(DEB_UPSTREAM_VERSION) DEB_ANT_CLEAN_TARGET := clean -DEB_ANT_BUILD_TARGET := jar docs.impl javadocs +DEB_ANT_BUILD_TARGET := javacc-generate jar docs.impl javadocs + +DEB_COMPRESS_EXCLUDE := .pdf binary-post-install/libognl-java:: dh_install build/ognl-$(DEB_UPSTREAM_VERSION).jar usr/share/java dh_link usr/share/java/ognl-$(DEB_UPSTREAM_VERSION).jar usr/share/java/ognl.jar -# Export from SVN and remove externals JAR in lib/ get-orig-source: - mkdir orig_tmp - (cd orig_tmp && \ - svn export http://svn.opensymphony.com/svn/ognl/tags/$(DEB_UPSTREAM_VERSION) \ - ognl-$(DEB_UPSTREAM_VERSION) && \ - rm -rf ognl-$(DEB_UPSTREAM_VERSION)/lib/* && \ - tar -czf ../../${DEB_SOURCE_PACKAGE}_$(DEB_UPSTREAM_VERSION).orig.tar.gz ognl-$(DEB_UPSTREAM_VERSION)) - rm -rf orig_tmp - + sh debian/orig-tar.sh $(DEB_UPSTREAM_VERSION) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ognl.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
