[ognl] 07/34: [ Damien Raude-Morvan ] * Build-Depends on default-jdk-builddep * Build a -doc package containing API and documentations * 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 myself as Uploaders
Emmanuel Bourg
ebourg-guest at moszumanska.debian.org
Sun Oct 4 23:07:34 UTC 2015
This is an automated email from the git hooks/post-receive script.
ebourg-guest pushed a commit to branch master
in repository ognl.
commit 4a40facaca4d6312cde3d5b9cc8f20d53751fe2d
Author: Damien Raude-Morvan <drazzib at debian.org>
Date: Wed Jun 17 23:13:59 2009 +0000
[ Damien Raude-Morvan ]
* Build-Depends on default-jdk-builddep
* Build a -doc package containing API and documentations
* 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 myself as Uploaders
---
debian/README.Debian | 8 --
debian/README.source | 5 +
debian/ant.properties | 3 +
debian/changelog | 18 ++-
debian/compat | 2 +-
debian/control | 28 ++++-
debian/copyright | 136 +++++++++++++++------
debian/dirs | 1 -
debian/libognl-java-doc.doc-base.api | 10 ++
debian/libognl-java-doc.doc-base.dev | 10 ++
debian/libognl-java-doc.doc-base.lang | 10 ++
debian/libognl-java-doc.docs | 4 +
debian/links | 1 -
debian/patches/01_build_xml.diff | 43 +++++++
debian/patches/01build.xml.patch | 40 ------
.../patches/02_docbook_xml_source_compliance.diff | 69 +++++++++++
debian/patches/02build.properties.patch | 13 --
debian/patches/series | 3 +
debian/rules | 26 +++-
debian/watch | 2 +
20 files changed, 314 insertions(+), 118 deletions(-)
diff --git a/debian/README.Debian b/debian/README.Debian
deleted file mode 100644
index d586316..0000000
--- a/debian/README.Debian
+++ /dev/null
@@ -1,8 +0,0 @@
-ognl
-----
-
-OGNL is an expression language for getting and setting properties of Java
-objects.
-
---
-Trygve Laugstøl
diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..76d29b5
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,5 @@
+This package uses quilt to manage all modifications to the upstream
+source. Changes are stored in the source package as diffs in
+debian/patches and applied during the build.
+
+See /usr/share/doc/quilt/README.source for a detailed explanation.
diff --git a/debian/ant.properties b/debian/ant.properties
new file mode 100644
index 0000000..20532fd
--- /dev/null
+++ b/debian/ant.properties
@@ -0,0 +1,3 @@
+docbook.xsl.path=/usr/share/xml/docbook/stylesheet/docbook-xsl/
+docbook.xml.path=/usr/share/xml/docbook/schema/dtd/4.5/
+fop.path=/usr/share/java/
diff --git a/debian/changelog b/debian/changelog
index 30e4948..1f43574 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,18 @@
-ognl (2.5.1-1) unstable; urgency=low
+ognl (2.7.3-1) UNRELEASED; urgency=low
- * Non-maintainer upload.
+ [ Trygve Laugstøl ]
* Initial Release (closes: #321476).
- -- Trygve Laugstøl <trygvis at inamo.no> Tue, 2 Aug 2005 17:20:00 +0200
+ [ Damien Raude-Morvan ]
+ * Build-Depends on default-jdk-builddep
+ * Build a -doc package containing API and documentations
+ * 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 myself as Uploaders
+
+ -- Damien Raude-Morvan <drazzib at drazzib.com> Thu, 18 Jun 2009 01:12:14 +0200
diff --git a/debian/compat b/debian/compat
index b8626c4..7ed6ff8 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-4
+5
diff --git a/debian/control b/debian/control
index 3c76d65..6895cf0 100644
--- a/debian/control
+++ b/debian/control
@@ -1,15 +1,31 @@
Source: ognl
-Section: libs
+Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Trygve Laugstøl <trygvis at inamo.no>
-Build-Depends-Indep: debhelper (>> 4.0.0), cdbs, kaffe (>= 1.1.5), javacc (>= 3.2), ant
-Standards-Version: 3.6.2
+Uploaders: Trygve Laugstøl <trygvis at inamo.no>, Damien Raude-Morvan <drazzib at drazzib.com>
+Build-Depends: debhelper (>= 5), cdbs, default-jdk-builddep, ant, quilt
+Build-Depends-Indep: libjavassist-java, junit4, docbook-xsl, docbook-xml, ant-optional, libxalan2-java
+Standards-Version: 3.8.1
+Homepage: http://www.opensymphony.com/ognl/
-Package: ognl
+Package: libognl-java
Architecture: all
-Depends: kaffe | jamvm | java2-runtime
+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.
+
diff --git a/debian/copyright b/debian/copyright
index 3b4042a..793e34a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,39 +1,97 @@
-This package was debianized by Trygve Laugstøl <trygvis at inamo.no> on
-Tue, 2 Aug 2005 17:20:00 +0200
-
-It was downloaded from http://www.ognl.org/2.5.1/ognl-2.5.1-dist.jar
-
-Upstream Authors: Drew Davidson <drew at ognl.org>
- Luke Blanshard
-
-Copyright:
-//--------------------------------------------------------------------------
-// Copyright (c) 2002, 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.
-//--------------------------------------------------------------------------
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=54
+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 license at opensymphony.com .
+
+ 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 <drew at ognl.org>
+ 1998-2004, Luke Blanshard <luke at quiq.com>
+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.
+
+
+Files: debian/*
+Copyright: 2005, Trygve Laugstøl <trygvis at inamo.no>W
+ 2009, Damien Raude-Morvan <drazzib at drazzib.com>
+License:
+ 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.
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 13c9f03..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java
diff --git a/debian/libognl-java-doc.doc-base.api b/debian/libognl-java-doc.doc-base.api
new file mode 100644
index 0000000..1838768
--- /dev/null
+++ b/debian/libognl-java-doc.doc-base.api
@@ -0,0 +1,10 @@
+Document: libognl-java-doc-api
+Title: API Javadoc for OGNL
+Author: OpenSymphony
+Abstract: This is the API Javadoc provided by the OGNL library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libognl-java-doc/api/index.html
+Files: /usr/share/doc/libognl-java-doc/api/*
+
diff --git a/debian/libognl-java-doc.doc-base.dev b/debian/libognl-java-doc.doc-base.dev
new file mode 100644
index 0000000..273224c
--- /dev/null
+++ b/debian/libognl-java-doc.doc-base.dev
@@ -0,0 +1,10 @@
+Document: libognl-java-doc-dev
+Title: Developer Guide for OGNL
+Author: OpenSymphony
+Abstract: This is the Developer Guide provided by the OGNL library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libognl-java-doc/DeveloperGuide/index.html
+Files: /usr/share/doc/libognl-java-doc/DeveloperGuide/*
+
diff --git a/debian/libognl-java-doc.doc-base.lang b/debian/libognl-java-doc.doc-base.lang
new file mode 100644
index 0000000..6157684
--- /dev/null
+++ b/debian/libognl-java-doc.doc-base.lang
@@ -0,0 +1,10 @@
+Document: libognl-java-doc-lang
+Title: Language Guide for OGNL
+Author: OpenSymphony
+Abstract: This is the Language Guide provided by the OGNL library.
+Section: Programming
+
+Format: HTML
+Index: /usr/share/doc/libognl-java-doc/LanguageGuide/index.html
+Files: /usr/share/doc/libognl-java-doc/LanguageGuide/*
+
diff --git a/debian/libognl-java-doc.docs b/debian/libognl-java-doc.docs
new file mode 100644
index 0000000..0d58d34
--- /dev/null
+++ b/debian/libognl-java-doc.docs
@@ -0,0 +1,4 @@
+build/docbook/html/LanguageGuide
+build/docbook/html/DeveloperGuide
+dist/docs/api
+
diff --git a/debian/links b/debian/links
deleted file mode 100644
index 3c160b6..0000000
--- a/debian/links
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/java/ognl-2.5.1.jar usr/share/java/ognl.jar
diff --git a/debian/patches/01_build_xml.diff b/debian/patches/01_build_xml.diff
new file mode 100644
index 0000000..669d9bf
--- /dev/null
+++ b/debian/patches/01_build_xml.diff
@@ -0,0 +1,43 @@
+Description:
+ Remove foreach usage as antcontrib is not in Debian
+ Fix classpath inclusion of fop.jar
+Origin: Damien Raude-Morvan <drazzib at drazzib.com>
+--- a/docbook.xml
++++ b/docbook.xml
+@@ -193,7 +193,12 @@
+ </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">
+@@ -266,7 +271,7 @@
+ <java classname="org.apache.fop.apps.Fop" fork="true">
+ <classpath>
+ <fileset dir="${fop.dir}">
+- <include name="**/*.jar"/>
++ <include name="fop.jar"/>
+ </fileset>
+ </classpath>
+ <arg line="-q"/>
+@@ -276,7 +281,12 @@
+ </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>
diff --git a/debian/patches/01build.xml.patch b/debian/patches/01build.xml.patch
deleted file mode 100644
index 650e822..0000000
--- a/debian/patches/01build.xml.patch
+++ /dev/null
@@ -1,40 +0,0 @@
---- ../ognl-2.5.1/build.xml 2005-08-02 17:36:49.000000000 +0200
-+++ build.xml 2005-08-06 19:41:30.818992096 +0200
-@@ -34,7 +34,7 @@
- <!-- General environment setup -->
- <property environment="env"/>
- <property file="build.properties"/>
-- <property name="workarea.root" location="../../../.."/>
-+ <property name="workarea.root" location="."/>
- <property name="workarea.lib" location="${workarea.root}/ThirdParty/Libraries"/>
- <property name="workarea.dist" location="${workarea.root}/ThirdParty/Distributions"/>
-
-@@ -335,18 +335,18 @@
- </target>
-
- <target name="parser" unless="parser.build.notRequired">
-- <java classname="COM.sun.labs.jjtree.Main" classpath="${javacc.jar}" fork="true">
-+ <java classname="org.javacc.jjtree.Main" classpath="${javacc.jar}" fork="true">
- <arg value="-OUTPUT_DIRECTORY=${output.classes}/ognl"/>
- <arg value="${project.src.java}/ognl/ognl.jjt"/>
- </java>
-- <java classname="COM.sun.labs.javacc.Main" classpath="${javacc.jar}" fork="true">
-+ <java classname="org.javacc.parser.Main" classpath="${javacc.jar}" fork="true">
- <arg value="-OUTPUT_DIRECTORY=${output.classes}/ognl"/>
- <arg value="${output.classes}/ognl/ognl.jj"/>
- </java>
- </target>
-
- <target name="compile" unless="source.build.notRequired">
-- <javac destdir="${output.classes}" optimize="${javac.optimize}" debug="${javac.debug}" deprecation="${javac.deprecation}" classpath="${output.classes}">
-+ <javac destdir="${output.classes}" optimize="${javac.optimize}" debug="${javac.debug}" deprecation="${javac.deprecation}" classpath="${output.classes}" nowarn="on">
- <classpath refid="compile.class.path"/>
- <src path="${project.src.java}/ognl"/>
- <src path="${output.classes}"/>
-@@ -379,4 +379,4 @@
- </java>
- </target>
-
--</project>
-\ No newline at end of file
-+</project>
diff --git a/debian/patches/02_docbook_xml_source_compliance.diff b/debian/patches/02_docbook_xml_source_compliance.diff
new file mode 100644
index 0000000..ff18be4
--- /dev/null
+++ b/debian/patches/02_docbook_xml_source_compliance.diff
@@ -0,0 +1,69 @@
+Description:
+ docbook.xml: use Xalan2 as XSLT processor
+ Fix some duplicated entities in upstream Docbook XML
+Origin: Damien Raude-Morvan <drazzib at drazzib.com>
+--- 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>
+--- 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/patches/02build.properties.patch b/debian/patches/02build.properties.patch
deleted file mode 100644
index bd5cd7f..0000000
--- a/debian/patches/02build.properties.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- /dev/null 2005-04-30 15:48:21.320416232 +0200
-+++ build.properties 2005-08-06 19:41:30.831990120 +0200
-@@ -0,0 +1,8 @@
-+workarea.root=.
-+env.TEMP=target
-+
-+javacc.jar=/usr/share/java/javacc.jar
-+
-+output.base=target
-+output.root=target
-+output.jars=debian/ognl/usr/share/java
-+output.jar=debian/ognl/usr/share/java/ognl-2.5.1.jar
-+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..2f8dd63
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,3 @@
+02_docbook_xml_source_compliance.diff
+01_build_xml.diff
+
diff --git a/debian/rules b/debian/rules
index 17904b8..69dfb08 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,28 @@
#!/usr/bin/make -f
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/simple-patchsys.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/class/ant.mk
-JAVA_HOME_DIRS := /usr/lib/kaffe
+JAVA_HOME := /usr/lib/jvm/default-java
-ANT_HOME := /usr/share/ant
-DEB_JARS := /usr/share/ant/lib/ant-launcher.jar
+DEB_JARS := javassist junit4 ant-trax xalan2 xml-apis serializer
+DEB_ANT_ARGS := -Dversion=$(DEB_UPSTREAM_VERSION)
DEB_ANT_CLEAN_TARGET := clean
-DEB_ANT_BUILD_TARGET := -Dshow.info=true info
-DEB_ANT_INSTALL_TARGET := jar
+DEB_ANT_BUILD_TARGET := jar docs.impl javadocs
+
+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
+
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..c69476d
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://svn.opensymphony.com/svn/ognl/tags/ (\d[\d\.]+)/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/ognl.git
More information about the pkg-java-commits
mailing list