This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository libjaxen-java.
commit 1ff144afe280c2ecb3b45058cea9dcd280ffc350 Author: Marcus Better <mar...@better.se> Date: Mon Oct 9 08:36:45 2006 +0000 Move to new location. --- debian/README.Debian | 14 ++++++ debian/ant.properties | 1 + debian/changelog | 38 +++++++++++++++ debian/compat | 1 + debian/control | 21 ++++++++ debian/copyright | 55 +++++++++++++++++++++ debian/dirs | 1 + debian/docs | 1 + ...0_BuildXml_DisableXomDom4J_CompileAndTest.patch | 56 ++++++++++++++++++++++ debian/patches/01_RemoveXomDom4jTests.patch | 38 +++++++++++++++ debian/rules | 20 ++++++++ 11 files changed, 246 insertions(+) diff --git a/debian/README.Debian b/debian/README.Debian new file mode 100644 index 0000000..3b4100c --- /dev/null +++ b/debian/README.Debian @@ -0,0 +1,14 @@ +libjaxen-java for Debian +------------------------ + +Jaxen in Debian supports JDOM, DOM out of the box. + +Due to circular dependencies which need to be solved upstream we split +the XOM and DOM4J XPath support parts out to their respective packages +in debian (currently there is only a dom4j package). + +As one needs the dom4j jar is one wants to use jaxen with dom4j there is +no difference from a user point of view if some classes are in the dom4j jar +instead of the jaxen jar. + + -- Arnaud Vandyck <av...@debian.org>, Fri Apr 15 16:31:06 2005 diff --git a/debian/ant.properties b/debian/ant.properties new file mode 100644 index 0000000..f425dac --- /dev/null +++ b/debian/ant.properties @@ -0,0 +1 @@ +noget=true diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..0205d0a --- /dev/null +++ b/debian/changelog @@ -0,0 +1,38 @@ +libjaxen-java (1.1.beta8-1) unstable; urgency=low + + * New upstream release + * libsaxpath-java code is now included in the jaxen source base + + No more libsaxpath-java binary from this source + + Added conflicts, replaces with libsaxpath-java + * Updated jdom dependency to libjdom1-java + * Updated documentation everywhere (description, README.Debian, download + location and copyright) + * Applied several patches: 01_RemoveXomDom4jTests.patch - to disable + outsourced dom4j/xom functionality from tests. + * Enabled junit tests + + -- Wolfgang Baer <wb...@gmx.de> Sun, 12 Feb 2006 17:56:29 +0100 + +libjaxen-java (1.0FCS-3) unstable; urgency=low + + * Removed libgnujaxp-java dependency - not needed anymore + * Removed unused build dependency / dependency on old package libdom1-java + * debian/rules: Removed jikes build compiler property + * Bumped debhelper version dependency to fix linda error + * Added myself to uploaders + + -- Wolfgang Baer <wb...@gmx.de> Thu, 5 Jan 2006 10:34:13 +0100 + +libjaxen-java (1.0FCS-2) unstable; urgency=low + + * ant transition + * Standards-Version to 3.6.2, no change needed. + + -- Arnaud Vandyck <av...@debian.org> Tue, 4 Oct 2005 13:46:44 +0200 + +libjaxen-java (1.0FCS-1) unstable; urgency=low + + * Initial Release. + + -- Arnaud Vandyck <av...@debian.org> Fri, 15 Apr 2005 17:42:45 +0200 + diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..b8626c4 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +4 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..ba6625c --- /dev/null +++ b/debian/control @@ -0,0 +1,21 @@ +Source: libjaxen-java +Section: libs +Priority: optional +Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> +Uploaders: Arnaud Vandyck <av...@debian.org>, Wolfgang Baer <wb...@gmx.de> +Build-Depends-Indep: debhelper (>= 4.2.30), cdbs (>= 0.4.8), kaffe (>= 2:1.1.5-1), ant, ant-optional, junit, libjdom1-java, libjaxp1.2-java +Standards-Version: 3.6.2 + +Package: libjaxen-java +Architecture: all +Depends: kaffe | java1-runtime | java2-runtime, libjdom1-java +Suggests: java-virtual-machine +Conflicts: libsaxpath-java +Replaces: libsaxpath-java +Description: Java XPath engine for use on a variety of XML object models + The Jaxen project is a Java XPath Engine. Jaxen is a universal object model + walker, capable of evaluating XPath expressions across multiple models. + Currently supported models are JDOM, DOM internally. DOM4J is supported + through its own package. XOM is currently not packaged in Debian. + . + Homepage: <http://jaxen.org> diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..7c0a3bd --- /dev/null +++ b/debian/copyright @@ -0,0 +1,55 @@ +This package was debianized by Arnaud Vandyck <av...@debian.org> on +Fri, 15 Apr 2005 15:53:37 +0200. + +It was downloaded <from http://jaxen.org/> + +Upstream Authors: Bob McWhirter <b...@werken.com> and + James Strachan <jstrac...@apache.org> + +Copyright: + +/* + $Id$ + + Copyright 2003 (C) The Werken Company. All Rights Reserved. + + Redistribution and use of this software and associated documentation + ("Software"), with or without modification, are permitted provided + that the following conditions are met: + + 1. Redistributions of source code must retain copyright + statements and notices. Redistributions must also contain a + copy of this document. + + 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 name "jaxen" must not be used to endorse or promote + products derived from this Software without prior written + permission of The Werken Company. For written permission, + please contact b...@werken.com. + + 4. Products derived from this Software may not be called "jaxen" + nor may "jaxen" appear in their names without prior written + permission of The Werken Company. "jaxen" is a registered + trademark of The Werken Company. + + 5. Due credit should be given to The Werken Company. + (http://jaxen.werken.com/). + + THIS SOFTWARE IS PROVIDED BY THE WERKEN COMPANY AND CONTRIBUTORS + ``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 WERKEN COMPANY 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. + + */ diff --git a/debian/dirs b/debian/dirs new file mode 100644 index 0000000..13c9f03 --- /dev/null +++ b/debian/dirs @@ -0,0 +1 @@ +usr/share/java diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..81a398b --- /dev/null +++ b/debian/docs @@ -0,0 +1 @@ +dist/docs/api diff --git a/debian/patches/00_BuildXml_DisableXomDom4J_CompileAndTest.patch b/debian/patches/00_BuildXml_DisableXomDom4J_CompileAndTest.patch new file mode 100644 index 0000000..f17ad3b --- /dev/null +++ b/debian/patches/00_BuildXml_DisableXomDom4J_CompileAndTest.patch @@ -0,0 +1,56 @@ +--- build.xml.orig 2006-02-12 18:03:46.000000000 +0100 ++++ build.xml 2006-02-12 16:10:59.000000000 +0100 +@@ -44,6 +44,8 @@ + <mkdir dir="${classesdir}"> + </mkdir> + <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html"> ++ <exclude name="org/jaxen/dom4j/*"/> ++ <exclude name="org/jaxen/xom/*"/> + <src> + <pathelement location="src/java/main"> + </pathelement> +@@ -79,7 +81,7 @@ + <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests"> + <mkdir dir="${testreportdir}"> + </mkdir> +- <junit dir="./" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true"> ++ <junit dir="./" failureproperty="false" printSummary="yes" fork="true" haltonerror="false"> + <sysproperty key="basedir" value="."> + </sysproperty> + <formatter type="xml"> +@@ -87,6 +89,7 @@ + <formatter usefile="false" type="plain"> + </formatter> + <classpath> ++ <pathelement location="/usr/share/java/jdom1.jar"/> + <path refid="build.classpath"> + </path> + <pathelement path="${testclassesdir}"> +@@ -98,8 +101,9 @@ + <fileset dir="src/java/test"> + <include name="**/*Test.java"> + </include> +- <exclude name="org/jaxen/jdom/XPathTest.java"> +- </exclude> ++ <exclude name="org/jaxen/jdom/XPathTest.java"/> ++ <exclude name="org/jaxen/dom4j/*.java"/> ++ <exclude name="org/jaxen/xom/*.java"/> + </fileset> + </batchtest> + </junit> +@@ -113,6 +117,8 @@ + <mkdir dir="${testclassesdir}"> + </mkdir> + <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html"> ++ <exclude name="org/jaxen/dom4j/*"/> ++ <exclude name="org/jaxen/xom/*"/> + <src> + <pathelement location="src/java/test"> + </pathelement> +@@ -169,4 +175,4 @@ + <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"> + </unjar> + </target> +-</project> +\ Kein Zeilenumbruch am Dateiende. ++</project> diff --git a/debian/patches/01_RemoveXomDom4jTests.patch b/debian/patches/01_RemoveXomDom4jTests.patch new file mode 100644 index 0000000..21b3dac --- /dev/null +++ b/debian/patches/01_RemoveXomDom4jTests.patch @@ -0,0 +1,38 @@ +--- src/java/test/org/jaxen/JaxenTests.java.orig 2006-02-12 15:33:02.000000000 +0100 ++++ src/java/test/org/jaxen/JaxenTests.java 2006-02-12 15:48:10.000000000 +0100 +@@ -63,7 +63,7 @@ + package org.jaxen; + + import org.jaxen.dom.DOMTests; +-import org.jaxen.dom4j.DOM4JTests; ++//import org.jaxen.dom4j.DOM4JTests; + import org.jaxen.expr.ExprTests; + import org.jaxen.function.FunctionTests; + import org.jaxen.javabean.JavaBeanTests; +@@ -73,7 +73,7 @@ + import org.jaxen.saxpath.base.BaseTests; + import org.jaxen.saxpath.helpers.HelpersTests; + import org.jaxen.util.UtilTests; +-import org.jaxen.xom.XOMTests; ++//import org.jaxen.xom.XOMTests; + + import junit.framework.Test; + import junit.framework.TestSuite; +@@ -98,8 +98,8 @@ + result.addTest(CoreTests.suite()); + result.addTest(DOMTests.suite()); + result.addTest(JDOMTests.suite()); +- result.addTest(DOM4JTests.suite()); +- result.addTest(XOMTests.suite()); ++ //result.addTest(DOM4JTests.suite()); ++ //result.addTest(XOMTests.suite()); + result.addTest(JavaBeanTests.suite()); + result.addTest(PatternTests.suite()); + result.addTest(BaseTests.suite()); +@@ -111,4 +111,4 @@ + } + + +-} +\ Kein Zeilenumbruch am Dateiende. ++} diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..3415f6c --- /dev/null +++ b/debian/rules @@ -0,0 +1,20 @@ +#!/usr/bin/make -f +# debian/rules for libjaxen-java (uses CDBS) + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +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 := /usr/lib/kaffe +ANT_HOME := /usr/share/ant +DEB_JARS := $(ANT_HOME)/lib/ant-launcher.jar $(ANT_HOME)/lib/ant-junit.jar jdom1 junit +DEB_ANT_BUILD_TARGET := jar javadoc + +VERSION=1.1.beta8 + +install/libjaxen-java:: + install -m 644 target/jaxen-1.1-beta-8.jar debian/libjaxen-java/usr/share/java/jaxen-$(VERSION).jar + ln -s jaxen-$(VERSION).jar debian/libjaxen-java/usr/share/java/jaxen.jar -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libjaxen-java.git _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits