Author: drazzib Date: 2009-11-08 19:02:26 +0000 (Sun, 08 Nov 2009) New Revision: 11037
Added: trunk/libjaxen-java/debian/build.xml trunk/libjaxen-java/debian/libjaxen-java.poms trunk/libjaxen-java/debian/maven.rules trunk/libjaxen-java/debian/pom.xml Removed: trunk/libjaxen-java/LICENSE.txt trunk/libjaxen-java/build.xml trunk/libjaxen-java/debian/libjaxen-java-doc.dirs trunk/libjaxen-java/debian/libjaxen-java.dirs trunk/libjaxen-java/maven.xml trunk/libjaxen-java/project.properties trunk/libjaxen-java/project.xml trunk/libjaxen-java/src/ trunk/libjaxen-java/xml/ Modified: trunk/libjaxen-java/debian/ trunk/libjaxen-java/debian/ant.properties trunk/libjaxen-java/debian/changelog trunk/libjaxen-java/debian/control trunk/libjaxen-java/debian/rules Log: * New upstream release. * Add myself to Uploaders * Maven POMs: - debian/control: add a Build-Depends-Indep dependency on maven-repo-helper - debian/rules: use mh_installpoms and mh_installjar to install the POM and the jar to the Maven repository - debian/pom.xml: Debian pom.xml file as upstream doesn't provide one * Move libjaxen-java-doc to "doc" Section * Add "get-orig-source" as suggested by policy * Build with source and target set to "1.3" * XOM support: - Add libxom-java to Recommends - Add XOM into package's extended description Deleted: trunk/libjaxen-java/LICENSE.txt =================================================================== --- trunk/libjaxen-java/LICENSE.txt 2009-11-08 18:46:08 UTC (rev 11036) +++ trunk/libjaxen-java/LICENSE.txt 2009-11-08 19:02:26 UTC (rev 11037) @@ -1,33 +0,0 @@ -/* - $Id: LICENSE.txt,v 1.5 2006/02/05 21:49:04 elharo Exp $ - - Copyright 2003-2006 The Werken Company. 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 Jaxen Project 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. - - */ Deleted: trunk/libjaxen-java/build.xml =================================================================== --- trunk/libjaxen-java/build.xml 2009-11-08 18:46:08 UTC (rev 11036) +++ trunk/libjaxen-java/build.xml 2009-11-08 19:02:26 UTC (rev 11037) @@ -1,174 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<!--build.xml generated by maven from project.xml version 1.1.1 - on date May 5 2007, time 1501--> - -<project default="jar" name="jaxen" basedir="."> - <property name="defaulttargetdir" value="target"> - </property> - <property name="libdir" value="target/lib"> - </property> - <property name="classesdir" value="target/classes"> - </property> - <property name="testclassesdir" value="target/test-classes"> - </property> - <property name="testclassesdir" value="target/test-classes"> - </property> - <property name="testreportdir" value="target/test-reports"> - </property> - <property name="distdir" value="dist"> - </property> - <property name="javadocdir" value="dist/docs/api"> - </property> - <property name="final.name" value="jaxen-1.1.1"> - </property> - <path id="build.classpath"> - <fileset dir="${libdir}"> - <include name="jdom1.jar"/> - <include name="dom4j.jar"/> - <include name="xercesImpl.jar"/> - </fileset> - </path> - <target name="init" description="o Initializes some properties"> - <mkdir dir="${libdir}"> - </mkdir> - <condition property="noget"> - <equals arg2="only" arg1="${build.sysclasspath}"> - </equals> - </condition> - <!--Test if JUNIT is present in ANT classpath--> - - <available property="Junit.present" classname="junit.framework.Test"> - </available> - </target> - <target name="compile" description="o Compile the code" depends="get-deps"> - <mkdir dir="${classesdir}"> - </mkdir> - <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html"> - <exclude name="org/jaxen/xom/*"/> - <src> - <pathelement location="src/java/main"> - </pathelement> - </src> - <classpath refid="build.classpath"> - </classpath> - </javac> - </target> - <target name="jar" description="o Create the jar" depends="compile,test"> - <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"> - </jar> - </target> - <target name="clean" description="o Clean up the generated directories"> - <delete dir="${defaulttargetdir}"> - </delete> - <delete dir="${distdir}"> - </delete> - </target> - <target name="dist" description="o Create a distribution" depends="jar, javadoc"> - <mkdir dir="dist"> - </mkdir> - <copy todir="dist"> - <fileset dir="${defaulttargetdir}" includes="*.jar"> - </fileset> - <fileset dir="${basedir}" includes="LICENSE*, README*"> - </fileset> - </copy> - </target> - <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test"> - <fail message="There were test failures."> - </fail> - </target> - <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"> - <sysproperty key="basedir" value="."> - </sysproperty> - <formatter type="xml"> - </formatter> - <formatter usefile="false" type="plain"> - </formatter> - <classpath> - <pathelement location="/usr/share/java/jdom1.jar"/> - <path refid="build.classpath"> - </path> - <pathelement path="${testclassesdir}"> - </pathelement> - <pathelement path="${classesdir}"> - </pathelement> - </classpath> - <batchtest todir="${testreportdir}"> - <fileset dir="src/java/test"> - <include name="**/*Test.java"/> - <exclude name="org/jaxen/test/XOM*.java"/> - </fileset> - </batchtest> - </junit> - </target> - <target name="junit-present" unless="Junit.present" depends="init"> - <echo>================================= WARNING ================================</echo> - <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo> - <echo>==========================================================================</echo> - </target> - <target name="compile-tests" if="Junit.present" depends="junit-present,compile"> - <mkdir dir="${testclassesdir}"> - </mkdir> - <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html"> - <exclude name="org/jaxen/test/XOM*.java"/> - <src> - <pathelement location="src/java/test"> - </pathelement> - </src> - <classpath> - <path refid="build.classpath"> - </path> - <pathelement path="${classesdir}"> - </pathelement> - </classpath> - </javac> - </target> - <target name="javadoc" description="o Generate javadoc" depends="get-deps"> - <mkdir dir="${javadocdir}"> - </mkdir> - <tstamp> - <format pattern="2001-yyyy" property="year"> - </format> - </tstamp> - <property name="copyright" value="Copyright &copy; 2001-2007 Codehaus. All Rights Reserved."> - </property> - <property name="title" value="jaxen 1.1.1 API"> - </property> - <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="src/java/main" packagenames="org.jaxen.*"> - <classpath> - <path refid="build.classpath"> - </path> - </classpath> - </javadoc> - </target> - <target name="get-deps" unless="noget" depends="init"> - <!--Proxy settings works only with a JDK 1.2 and higher.--> - - <setproxy> - </setproxy> - <get dest="${libdir}/dom4j-1.6.1.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/dom4j/jars/dom4j-1.6.1.jar"> - </get> - <get dest="${libdir}/jdom-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/jdom/jars/jdom-1.0.jar"> - </get> - <get dest="${libdir}/xml-apis-1.3.02.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/xml-apis/jars/xml-apis-1.3.02.jar"> - </get> - <get dest="${libdir}/xercesImpl-2.6.2.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/xerces/jars/xercesImpl-2.6.2.jar"> - </get> - <get dest="${libdir}/xom-1.0.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/xom/jars/xom-1.0.jar"> - </get> - <get dest="${libdir}/maven-cobertura-plugin-1.3.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/maven-plugins/plugins/maven-cobertura-plugin-1.3.jar"> - </get> - <get dest="${libdir}/maven-findbugs-plugin-1.3.1.jar" usetimestamp="true" ignoreerrors="true" src="http://repo1.maven.org/maven/maven-plugins/plugins/maven-findbugs-plugin-1.3.1.jar"> - </get> - </target> - <target name="install-maven"> - <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar"> - </get> - <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"> - </unjar> - </target> -</project> \ No newline at end of file Property changes on: trunk/libjaxen-java/debian ___________________________________________________________________ Added: mergeWithUpstream + 1 Modified: trunk/libjaxen-java/debian/ant.properties =================================================================== --- trunk/libjaxen-java/debian/ant.properties 2009-11-08 18:46:08 UTC (rev 11036) +++ trunk/libjaxen-java/debian/ant.properties 2009-11-08 19:02:26 UTC (rev 11037) @@ -1,2 +1,4 @@ +ant.build.javac.source=1.3 +ant.build.javac.target=1.3 noget=true libdir=/usr/share/java Copied: trunk/libjaxen-java/debian/build.xml (from rev 11034, trunk/libjaxen-java/build.xml) =================================================================== --- trunk/libjaxen-java/debian/build.xml (rev 0) +++ trunk/libjaxen-java/debian/build.xml 2009-11-08 19:02:26 UTC (rev 11037) @@ -0,0 +1,190 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!--build.xml generated by maven from project.xml version 1.1 + on date February 13 2006, time 1000--> +<project default="jar" name="jaxen" basedir=".."> + <!--Load local and user build preferences--> + <property file="build.properties"></property> + <property file="${user.home}/build.properties"></property> + <!--Build properties--> + <property name="defaulttargetdir" value="${basedir}/target"></property> + <property name="libdir" value="${user.home}/.maven/repository"></property> + <property name="classesdir" value="${basedir}/target/classes"></property> + <property name="testclassesdir" value="${basedir}/target/test-classes"></property> + <property name="testreportdir" value="${basedir}/target/test-reports"></property> + <property name="distdir" value="${basedir}/dist"></property> + <property name="javadocdir" value="${basedir}/dist/docs/api"></property> + <property name="final.name" value="jaxen-1.1.2"></property> + <property name="proxy.host" value=""></property> + <property name="proxy.port" value=""></property> + <property name="proxy.username" value=""></property> + <property name="proxy.password" value=""></property> + <path id="build.classpath"> + <pathelement location="${libdir}/dom4j.jar"></pathelement> + <pathelement location="${libdir}/jdom1.jar"></pathelement> + <pathelement location="${libdir}/xml-apis.jar"></pathelement> + <pathelement location="${libdir}/xercesImpl.jar"></pathelement> + <pathelement location="${libdir}/xom.jar"></pathelement> + <pathelement location="${libdir}/junit.jar"></pathelement> + </path> + <target name="init" description="o Initializes some properties"> + <mkdir dir="${libdir}"></mkdir> + <!--Test if JUNIT is present in ANT classpath--> + <available property="Junit.present" classname="junit.framework.Test"></available> + <!--Test if user defined a proxy--> + <condition property="useProxy"> + <and> + <isset property="proxy.host"></isset> + <not> + <equals trim="true" arg2="" arg1="${proxy.host}"></equals> + </not> + </and> + </condition> + </target> + <target name="compile" description="o Compile the code"> + <mkdir dir="${classesdir}"></mkdir> + <javac destdir="${classesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html"> + <src> + <pathelement location="${basedir}/src/java/main"></pathelement> + </src> + <classpath refid="build.classpath"></classpath> + </javac> + </target> + <target name="jar" description="o Create the jar" depends="compile,test"> + <jar jarfile="${defaulttargetdir}/${final.name}.jar" excludes="**/package.html" basedir="${classesdir}"></jar> + </target> + <target name="clean" description="o Clean up the generated directories"> + <delete dir="${defaulttargetdir}"></delete> + <delete dir="${distdir}"></delete> + </target> + <target name="dist" description="o Create a distribution" depends="jar, javadoc"> + <mkdir dir="dist"></mkdir> + <copy todir="dist"> + <fileset dir="${defaulttargetdir}" includes="*.jar"></fileset> + <fileset dir="${basedir}" includes="LICENSE*, README*"></fileset> + </copy> + </target> + <target name="test" description="o Run the test cases" if="test.failure" depends="internal-test"> + <fail message="There were test failures."></fail> + </target> + <target name="internal-test" if="Junit.present" depends="junit-present,compile-tests"> + <mkdir dir="${testreportdir}"></mkdir> + <junit dir="${basedir}" failureproperty="test.failure" printSummary="yes" fork="true" haltonerror="true"> + <sysproperty key="basedir" value="."></sysproperty> + <formatter type="xml"></formatter> + <formatter usefile="false" type="plain"></formatter> + <classpath> + <path refid="build.classpath"></path> + <pathelement path="${testclassesdir}"></pathelement> + <pathelement path="${classesdir}"></pathelement> + </classpath> + <batchtest todir="${testreportdir}"> + <fileset dir="${basedir}/src/java/test"> + <include name="**/*Test.java"></include> + <exclude name="org/jaxen/jdom/XPathTest.java"></exclude> + </fileset> + </batchtest> + </junit> + </target> + <target name="junit-present" unless="Junit.present" depends="init"> + <echo>================================= WARNING ================================</echo> + <echo>Junit isn't present in your ${ANT_HOME}/lib directory. Tests not executed.</echo> + <echo>==========================================================================</echo> + </target> + <target name="compile-tests" if="Junit.present" depends="junit-present,compile"> + <mkdir dir="${testclassesdir}"></mkdir> + <javac destdir="${testclassesdir}" deprecation="true" debug="true" optimize="false" excludes="**/package.html"> + <src> + <pathelement location="${basedir}/src/java/test"></pathelement> + </src> + <classpath> + <path refid="build.classpath"></path> + <pathelement path="${classesdir}"></pathelement> + </classpath> + </javac> + <copy todir="${testclassesdir}"> + <fileset dir="${basedir}/src/java/test"> + <include name="**/*.werk"></include> + <include name="**/*.xml"></include> + <include name="**/*.properties"></include> + </fileset> + </copy> + </target> + <target name="javadoc" description="o Generate javadoc"> + <mkdir dir="${javadocdir}"></mkdir> + <tstamp> + <format pattern="2001-yyyy" property="year"></format> + </tstamp> + <property name="copyright" value="Copyright &copy; Codehaus. All Rights Reserved."></property> + <property name="title" value="jaxen 1.1.2 API"></property> + <javadoc use="true" private="true" destdir="${javadocdir}" author="true" version="true" sourcepath="${basedir}/src/java/main" packagenames="org.jaxen.*"> + <classpath> + <path refid="build.classpath"></path> + </classpath> + </javadoc> + </target> + <target name="get-dep-dom4j.jar" description="o Download the dependency : dom4j.jar" unless="dom4j.jar" depends="init,setProxy,noProxy,get-custom-dep-dom4j.jar"> + <mkdir dir="${libdir}/JPP/jars/"></mkdir> + <get dest="${libdir}/JPP/jars/dom4j.jar" usetimestamp="true" ignoreerrors="true" src="file:/usr/share/maven/repository/JPP/jars/dom4j.jar"></get> + </target> + <target name="get-custom-dep-dom4j.jar" if="dom4j.jar" depends="init,setProxy,noProxy"> + <mkdir dir="${libdir}/JPP/jars/"></mkdir> + <get dest="${libdir}/JPP/jars/dom4j.jar" usetimestamp="true" ignoreerrors="true" src="${dom4j.jar}"></get> + </target> + <target name="get-dep-jdom.jar" description="o Download the dependency : jdom.jar" unless="jdom.jar" depends="init,setProxy,noProxy,get-custom-dep-jdom.jar"> + <mkdir dir="${libdir}/JPP/jars/"></mkdir> + <get dest="${libdir}/JPP/jars/jdom.jar" usetimestamp="true" ignoreerrors="true" src="file:/usr/share/maven/repository/JPP/jars/jdom.jar"></get> + </target> + <target name="get-custom-dep-jdom.jar" if="jdom.jar" depends="init,setProxy,noProxy"> + <mkdir dir="${libdir}/JPP/jars/"></mkdir> + <get dest="${libdir}/JPP/jars/jdom.jar" usetimestamp="true" ignoreerrors="true" src="${jdom.jar}"></get> + </target> + <target name="get-dep-xmlParserAPIs.jar" description="o Download the dependency : xmlParserAPIs.jar" unless="xmlParserAPIs.jar" depends="init,setProxy,noProxy,get-custom-dep-xmlParserAPIs.jar"> + <mkdir dir="${libdir}/JPP/jars/"></mkdir> + <get dest="${libdir}/JPP/jars/xml-commons-apis.jar" usetimestamp="true" ignoreerrors="true" src="file:/usr/share/maven/repository/JPP/jars/xml-commons-apis.jar"></get> + </target> + <target name="get-custom-dep-xmlParserAPIs.jar" if="xmlParserAPIs.jar" depends="init,setProxy,noProxy"> + <mkdir dir="${libdir}/JPP/jars/"></mkdir> + <get dest="${libdir}/JPP/jars/xml-commons-apis.jar" usetimestamp="true" ignoreerrors="true" src="${xmlParserAPIs.jar}"></get> + </target> + <target name="get-dep-xercesImpl.jar" description="o Download the dependency : xercesImpl.jar" unless="xercesImpl.jar" depends="init,setProxy,noProxy,get-custom-dep-xercesImpl.jar"> + <mkdir dir="${libdir}/JPP/jars/"></mkdir> + <get dest="${libdir}/JPP/jars/xerces-j2.jar" usetimestamp="true" ignoreerrors="true" src="file:/usr/share/maven/repository/JPP/jars/xerces-j2.jar"></get> + </target> + <target name="get-custom-dep-xercesImpl.jar" if="xercesImpl.jar" depends="init,setProxy,noProxy"> + <mkdir dir="${libdir}/JPP/jars/"></mkdir> + <get dest="${libdir}/JPP/jars/xerces-j2.jar" usetimestamp="true" ignoreerrors="true" src="${xercesImpl.jar}"></get> + </target> + <target name="get-dep-xom.jar" description="o Download the dependency : xom.jar" unless="xom.jar" depends="init,setProxy,noProxy,get-custom-dep-xom.jar"> + <mkdir dir="${libdir}/JPP/jars/"></mkdir> + <get dest="${libdir}/JPP/jars/xom.jar" usetimestamp="true" ignoreerrors="true" src="file:/usr/share/maven/repository/JPP/jars/xom.jar"></get> + </target> + <target name="get-custom-dep-xom.jar" if="xom.jar" depends="init,setProxy,noProxy"> + <mkdir dir="${libdir}/JPP/jars/"></mkdir> + <get dest="${libdir}/JPP/jars/xom.jar" usetimestamp="true" ignoreerrors="true" src="${xom.jar}"></get> + </target> + <target name="get-dep-junit.jar" description="o Download the dependency : junit.jar" unless="junit.jar" depends="init,setProxy,noProxy,get-custom-dep-junit.jar"> + <mkdir dir="${libdir}/JPP/jars/"></mkdir> + <get dest="${libdir}/JPP/jars/junit.jar" usetimestamp="true" ignoreerrors="true" src="file:/usr/share/maven/repository/JPP/jars/junit.jar"></get> + </target> + <target name="get-custom-dep-junit.jar" if="junit.jar" depends="init,setProxy,noProxy"> + <mkdir dir="${libdir}/JPP/jars/"></mkdir> + <get dest="${libdir}/JPP/jars/junit.jar" usetimestamp="true" ignoreerrors="true" src="${junit.jar}"></get> + </target> + <target name="get-deps" unless="noget" depends="get-dep-dom4j.jar,get-dep-jdom.jar,get-dep-xmlParserAPIs.jar,get-dep-xercesImpl.jar,get-dep-xom.jar,get-dep-junit.jar"></target> + <target name="setProxy" if="useProxy" depends="init"> + <!--Proxy settings works only with a JDK 1.2 and higher.--> + <echo>Proxy used :</echo> + <echo>Proxy host [${proxy.host}]</echo> + <echo>Proxy port [${proxy.port}]</echo> + <echo>Proxy user [${proxy.username}]</echo> + <setproxy proxyuser="${proxy.username}" proxyport="${proxy.port}" proxypassword="${proxy.password}" proxyhost="${proxy.host}"></setproxy> + </target> + <target name="noProxy" unless="useProxy" depends="init"> + <echo>Proxy not used.</echo> + </target> + <target name="install-maven"> + <get dest="${user.home}/maven-install-latest.jar" usetimestamp="true" src="${repo}/maven/maven-install-latest.jar"></get> + <unjar dest="${maven.home}" src="${user.home}/maven-install-latest.jar"></unjar> + </target> +</project> Modified: trunk/libjaxen-java/debian/changelog =================================================================== --- trunk/libjaxen-java/debian/changelog 2009-11-08 18:46:08 UTC (rev 11036) +++ trunk/libjaxen-java/debian/changelog 2009-11-08 19:02:26 UTC (rev 11037) @@ -1,3 +1,21 @@ +libjaxen-java (1.1.2-1) unstable; urgency=low + + * New upstream release. + * Add myself to Uploaders + * Maven POMs: + - debian/control: add a Build-Depends-Indep dependency on maven-repo-helper + - debian/rules: use mh_installpoms and mh_installjar + to install the POM and the jar to the Maven repository + - debian/pom.xml: Debian pom.xml file as upstream doesn't provide one + * Move libjaxen-java-doc to "doc" Section + * Add "get-orig-source" as suggested by policy + * Build with source and target set to "1.3" + * XOM support: + - Add libxom-java to Recommends + - Add XOM into package's extended description + + -- Damien Raude-Morvan <draz...@debian.org> Sun, 08 Nov 2009 19:51:55 +0100 + libjaxen-java (1.1.1-4) unstable; urgency=low * (Build-)Depends on default-jdk (Closes: #508976). Modified: trunk/libjaxen-java/debian/control =================================================================== --- trunk/libjaxen-java/debian/control 2009-11-08 18:46:08 UTC (rev 11036) +++ trunk/libjaxen-java/debian/control 2009-11-08 19:02:26 UTC (rev 11037) @@ -2,9 +2,10 @@ Section: java Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> -Uploaders: Arnaud Vandyck <av...@debian.org>, Marcus Better <mar...@better.se>, Michael Koch <konque...@gmx.de> -Build-Depends: cdbs, debhelper (>= 7), ant, ant-optional -Build-Depends-Indep: default-jdk, junit, libdom4j-java, libjdom1-java, libxerces2-java, libxom-java +Uploaders: Arnaud Vandyck <av...@debian.org>, Marcus Better <mar...@better.se>, Michael Koch <konque...@gmx.de>, + Damien Raude-Morvan <draz...@debian.org> +Build-Depends: cdbs, debhelper (>= 7), ant, ant-optional, default-jdk +Build-Depends-Indep: junit, libdom4j-java, libjdom1-java, libxerces2-java, libxom-java, maven-repo-helper Standards-Version: 3.8.3 Vcs-Svn: svn://svn.debian.org/pkg-java/trunk/libjaxen-java Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/libjaxen-java @@ -13,20 +14,21 @@ Package: libjaxen-java Architecture: all Depends: default-jre-headless | java2-runtime-headless, libxerces2-java, ${misc:Depends} -Recommends: libdom4j-java, libjdom1-java +Recommends: libdom4j-java, libjdom1-java, libxom-java Conflicts: libsaxpath-java Replaces: libsaxpath-java Description: Java XPath engine jaxen is a universal object model walker, capable of evaluating XPath expressions across multiple models. Currently supported are dom4j, - JDOM, and DOM. + JDOM, DOM and XOM. Package: libjaxen-java-doc Architecture: all +Section: doc Depends: ${misc:Depends} Description: Java XPath engine - documentation jaxen is a universal object model walker, capable of evaluating XPath expressions across multiple models. Currently supported are dom4j, - JDOM, and DOM. + JDOM, DOM and XOM. . This package contains the API javadocs for jaxen. Deleted: trunk/libjaxen-java/debian/libjaxen-java-doc.dirs =================================================================== --- trunk/libjaxen-java/debian/libjaxen-java-doc.dirs 2009-11-08 18:46:08 UTC (rev 11036) +++ trunk/libjaxen-java/debian/libjaxen-java-doc.dirs 2009-11-08 19:02:26 UTC (rev 11037) @@ -1 +0,0 @@ -usr/share/doc/libjaxen-java Deleted: trunk/libjaxen-java/debian/libjaxen-java.dirs =================================================================== --- trunk/libjaxen-java/debian/libjaxen-java.dirs 2009-11-08 18:46:08 UTC (rev 11036) +++ trunk/libjaxen-java/debian/libjaxen-java.dirs 2009-11-08 19:02:26 UTC (rev 11037) @@ -1 +0,0 @@ -usr/share/java Added: trunk/libjaxen-java/debian/libjaxen-java.poms =================================================================== --- trunk/libjaxen-java/debian/libjaxen-java.poms (rev 0) +++ trunk/libjaxen-java/debian/libjaxen-java.poms 2009-11-08 19:02:26 UTC (rev 11037) @@ -0,0 +1 @@ +debian/pom.xml Added: trunk/libjaxen-java/debian/maven.rules =================================================================== --- trunk/libjaxen-java/debian/maven.rules (rev 0) +++ trunk/libjaxen-java/debian/maven.rules 2009-11-08 19:02:26 UTC (rev 11037) @@ -0,0 +1,2 @@ +s/jdom/org.jdom/ jdom jar s/1\..*/debian/ + Added: trunk/libjaxen-java/debian/pom.xml =================================================================== --- trunk/libjaxen-java/debian/pom.xml (rev 0) +++ trunk/libjaxen-java/debian/pom.xml 2009-11-08 19:02:26 UTC (rev 11037) @@ -0,0 +1,36 @@ +<project> + <modelVersion>4.0.0</modelVersion> + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> + <version>1.1.2</version> + <dependencies> + <dependency> + <groupId>xml-apis</groupId> + <artifactId>xml-apis</artifactId> + <version>1.3.02</version> + </dependency> + <dependency> + <groupId>xerces</groupId> + <artifactId>xercesImpl</artifactId> + <version>2.6.2</version> + </dependency> + <dependency> + <groupId>xom</groupId> + <artifactId>xom</artifactId> + <version>1.0</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>dom4j</groupId> + <artifactId>dom4j</artifactId> + <version>1.6.1</version> + <optional>true</optional> + </dependency> + <dependency> + <groupId>jdom</groupId> + <artifactId>jdom</artifactId> + <version>1.1.1</version> + <optional>true</optional> + </dependency> + </dependencies> +</project> Modified: trunk/libjaxen-java/debian/rules =================================================================== --- trunk/libjaxen-java/debian/rules 2009-11-08 18:46:08 UTC (rev 11036) +++ trunk/libjaxen-java/debian/rules 2009-11-08 19:02:26 UTC (rev 11037) @@ -5,9 +5,16 @@ include /usr/share/cdbs/1/rules/simple-patchsys.mk JAVA_HOME := /usr/lib/jvm/default-java +DEB_ANT_BUILDFILE := debian/build.xml DEB_JARS := ant-junit junit xom DEB_ANT_BUILD_TARGET := dist install/libjaxen-java:: - install -m 644 -D dist/jaxen-$(DEB_UPSTREAM_VERSION).jar debian/libjaxen-java/usr/share/java/jaxen-$(DEB_UPSTREAM_VERSION).jar - dh_link -plibjaxen-java usr/share/java/jaxen-$(DEB_UPSTREAM_VERSION).jar usr/share/java/jaxen.jar + mh_installpoms -plibjaxen-java + mh_installjar -plibjaxen-java -l debian/pom.xml dist/jaxen-$(DEB_UPSTREAM_VERSION).jar + +clean:: + -rm -rf debian/tmp + +get-orig-source: + uscan --force-download --download-version $(DEB_UPSTREAM_VERSION) --rename Deleted: trunk/libjaxen-java/maven.xml =================================================================== --- trunk/libjaxen-java/maven.xml 2009-11-08 18:46:08 UTC (rev 11036) +++ trunk/libjaxen-java/maven.xml 2009-11-08 19:02:26 UTC (rev 11037) @@ -1,32 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns:ant="jelly:ant"> - - <preGoal name="dist:build-bin"> - <attainGoal name="dist:build-src" /> - </preGoal> - - <postGoal name="dist:build-bin"> - <ant:copy - tofile="${maven.build.dir}/distributions/jaxen-${pom.currentVersion}.pom" - file="project.xml" /> - </postGoal> - - <postGoal name="dist:prepare-bin-filesystem"> - <ant:copy todir="${maven.dist.bin.assembly.dir}"> - <fileset dir="."> - <include name="xml/**" /> - </fileset> - </ant:copy> - </postGoal> - - <postGoal name="dist:prepare-src-filesystem"> - <ant:copy todir="${maven.dist.src.assembly.dir}"> - <fileset dir="."> - <include name="xml/**" /> - </fileset> - </ant:copy> - </postGoal> - -</project> - - Deleted: trunk/libjaxen-java/project.properties =================================================================== --- trunk/libjaxen-java/project.properties 2009-11-08 18:46:08 UTC (rev 11036) +++ trunk/libjaxen-java/project.properties 2009-11-08 19:02:26 UTC (rev 11037) @@ -1,85 +0,0 @@ -# ------------------------------------------------------------ -# project properties -# ------------------------------------------------------------ - -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# core -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -maven.compile.debug = on -maven.compile.optimize = on -maven.compile.deprecation = on -maven.compile.target = 1.2 -maven.compile.source = 1.3 - - -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# xdocs -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -maven.ui.banner.background = white -maven.ui.section.background = #BBBBBB -maven.ui.subsection.background = #DDDDDD -maven.ui.section.foreground = #990000 -maven.ui.subsection.foreground = #990000 - -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# checkstyle -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -#maven.checkstyle.properties = ${basedir}/project.properties - -checkstyle.lcurly.type = nl -checkstyle.lcurly.method = nl -checkstyle.lcurly.other = nl -checkstyle.rcurly = alone - -checkstyle.paren.pad = ignore -checkstyle.maxlinelen = 132 - -checkstyle.ignore.whitespace = yes -checkstyle.allow.tabs=false - -checkstyle.header.file = LICENSE.txt -checkstyle.header.ignoreline = 1,2,3,4,5,6 -checkstyle.const.pattern = ^[a-zA-Z][a-zA-Z0-9_]*$ - -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# pmd -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# maven.jar.override=on -# maven.jar.pmd=3.8 - -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -# javadoc -# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -maven.javadoc.stylesheet = ./xdocs/stylesheets/javadoc-style.css -# maven.javadoc.overview = ${basedir}/src/java/main/org/blissed/overview.html -maven.javadoc.links = \ - http://java.sun.com/j2se/1.4.2/docs/api/ -maven.javadoc.excludepackagenames = org.jaxen.saxpath.base,org.jaxen.saxpath.helpers - -maven.javadoc.customtags=tag1 -tag1.name=todo -tag1.description=To Do: -tag1.enabled=false -tag1.scope=all - - -maven.jarResources.basedir = src/java/main/ - -maven.xdoc.date = left - -maven.docs.outputencoding = UTF-8 - -maven.junit.fork=true - -#maven.latex.src.dir = ${basedir}/src/latex/ -#maven.latex.docs = intro-slides.tex - -maven.repo.remote=http://repo1.maven.org/maven,http://dist.codehaus.org/ -maven.repo.central=dist.codehaus.org -maven.repo.central.directory=/dist -maven.remote.group=jaxen \ No newline at end of file Deleted: trunk/libjaxen-java/project.xml =================================================================== --- trunk/libjaxen-java/project.xml 2009-11-08 18:46:08 UTC (rev 11036) +++ trunk/libjaxen-java/project.xml 2009-11-08 19:02:26 UTC (rev 11037) @@ -1,348 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="http://maven.apache.org/xsd/maven-project-3.0.0.xsd"> - - <pomVersion>3</pomVersion> - <id>jaxen</id> - <name>jaxen</name> - <currentVersion>1.1.1</currentVersion> - - <organization> - <name>Codehaus</name> - <url>http://codehaus.org</url> - <logo>http://codehaus.org/codehaus-small.gif</logo> - </organization> - <inceptionYear>2001</inceptionYear> - <package>org.jaxen</package> - - - <logo>./jaxen.gif</logo> - <description> - Jaxen is a universal Java XPath engine. - </description> - <shortDescription>Universal Java XPath Engine</shortDescription> - - <url>http://jaxen.codehaus.org/</url> - - <issueTrackingUrl>http://jira.codehaus.org/BrowseProject.jspa?id=10022</issueTrackingUrl> - <siteAddress>jaxen.codehaus.org</siteAddress> - <siteDirectory>/home/projects/jaxen/public_html</siteDirectory> - <distributionDirectory>/dist</distributionDirectory> - - <repository> - <connection>scm:cvs:pserver:anonym...@cvs.jaxen.codehaus.org:/cvs/jaxen:jaxen</connection> - <url>http://cvs.jaxen.codehaus.org</url> - </repository> - - <mailingLists> - <mailingList> - <name>Jaxen Users List</name> - <subscribe>user-subscr...@jaxen.codehaus.org</subscribe> - <unsubscribe>user-unsubscr...@jaxen.codehaus.org</unsubscribe> - <archive>http://archive.jaxen.codehaus.org/user/</archive> - </mailingList> - <mailingList> - <name>Jaxen Developers List</name> - <subscribe>dev-subscr...@jaxen.codehaus.org</subscribe> - <unsubscribe>dev-unsubscr...@jaxen.codehaus.org</unsubscribe> - <archive>http://archive.jaxen.codehaus.org/dev/</archive> - </mailingList> - <mailingList> - <name>Jaxen CVS Commits List</name> - <subscribe>scm-subscr...@jaxen.codehaus.org</subscribe> - <unsubscribe>scm-unsubscr...@jaxen.codehaus.org</unsubscribe> - <archive>http://archive.jaxen.codehaus.org/scm/</archive> - </mailingList> - <!-- <mailingList> - <name>Jaxen Announcement List</name> - <subscribe>announce-subscr...@jaxen.codehaus.org</subscribe> - <unsubscribe>announce-unsubscr...@jaxen.codehaus.org</unsubscribe> - <archive>http://archive.jaxen.codehaus.org/announce/</archive> - </mailingList> --> - </mailingLists> - - - <developers> - - <developer> - <name>Bob McWhirter</name> - <id>bob</id> - <email>b...@eng.werken.com</email> - <organization>The Werken Company</organization> - </developer> - - <developer> - <name>James Strachan</name> - <id>jstrachan</id> - <email>james_strac...@yahoo.co.uk</email> - <organization>Spiritsoft</organization> - </developer> - - <developer> - <name>David Megginson</name> - <id>dmegginson</id> - <email>cont...@megginson.com</email> - <organization>Megginson Technologies</organization> - </developer> - - <developer> - <name>Erwin Bolwidt</name> - <id>eboldwidt</id> - <email>er...@klomp.org</email> - </developer> - - <developer> - <name>Mark A. Belonga</name> - <id>mbelonga</id> - <email>mbelo...@users.sourceforge.net</email> - </developer> - - <developer> - <name>Christian Nentwich</name> - <!-- <id>xcut</id> --> - <id>cnentwich</id> - <email>x...@users.sourceforge.net</email> - </developer> - - <developer> - <name>Alexander Day Chaffee</name> - <id>purpletech</id> - <email>purplet...@users.sourceforge.net</email> - <organization>Purple Technologies</organization> - </developer> - - <developer> - <name>Jan Dvorak</name> - <id>jdvorak</id> - <email>jdvo...@users.sourceforge.net</email> - </developer> - - <developer> - <name>Attila Szegedi</name> - <id>szegedia</id> - <email>szege...@users.sourceforge.net</email> - </developer> - - <developer> - <name>Peter Royal</name> - <id>proyal</id> - <email>peter.ro...@pobox.com</email> - <url>http://fotap.org/~osi</url> - </developer> - - <developer> - <name>Scott Sanders</name> - <id>ssanders</id> - <email>sc...@dotnot.org</email> - <organization>dotnot</organization> - <url>http://dotnot.org/blog</url> - </developer> - - <developer> - <name>Brian Ewins</name> - <id>bewins</id> - <email>brian.ew...@gmail.com</email> - </developer> - - <developer> - <name>Elliotte Rusty Harold</name> - <id>elharo</id> - <email>elh...@metalab.unc.edu</email> - <organization>Cafe au Lait</organization> - <url>http://www.elharo.com/</url> - </developer> - - </developers> - - <contributors> - <contributor> - <name>Ryan Gustafson</name> - <email>rgus...@users.sourceforge.net</email> - </contributor> - - <contributor> - <name>David Peterson</name> - <email>da...@randombits.org</email> - </contributor> - - <contributor> - <name>Mark Wilson</name> - <email>mark.wil...@wilsoncom.de</email> - </contributor> - - <contributor> - <name>Jacob Kjome</name> - <email>h...@visi.com</email> - </contributor> - - <contributor> - <name>Michael Brennan</name> - <email>mpbren...@earthlink.net</email> - </contributor> - - <contributor> - <name>Jason Hunter</name> - <email>jhun...@xquery.com</email> - </contributor> - - <contributor> - <name>Brett Mclaughlin</name> - <email>brett.mclaugh...@lutris.com</email> - </contributor> - - <contributor> - <name>Bradley S. Huffman</name> - <email>h...@cs.okstate.edu</email> - </contributor> - - <!-- found him on sourceforge http://sourceforge.net/project/memberlist.php?group_id=26014 --> - <contributor> - <name>K. Ari Krupnikov</name> - <email>a...@lib.aero</email> - </contributor> - - <!-- found him on sourceforge http://sourceforge.net/project/memberlist.php?group_id=31447 --> - <contributor> - <name>Paul R. Brown</name> - <email>p...@fivesight.com</email> - </contributor> - - - <!-- next two found on http://lists.debian.org/debian-mentors/2003/09/msg00217.html --> - <contributor> - <name>Guoliang Cao</name> - <email>c...@ispsoft.com</email> - </contributor> - - <contributor> - <name>Jérôme Nègre</name> - <email>jerome.ne...@e-xmlmedia.fr</email> - </contributor> - - <!-- org.jaxen.ext.MatrixConcat function --> - <!-- <contributor> - <name>James Pereira</name> - <email>jpere...@ct.bbd.co.za</email> - </contributor> --> - - <!-- found next two in CVS--> - <contributor> - <name>Eddie McGreal</name> - <email>emcgr...@blackpearl.com</email> - </contributor> - - <contributor> - <name>Steen Lehmann</name> - <email>slehm...@users.sourceforge.net</email> - </contributor> - - </contributors> - - <reports> - <report>maven-jdepend-plugin</report> - <report>maven-checkstyle-plugin</report> - <report>maven-cobertura-plugin</report> - <report>maven-changelog-plugin</report> - <report>maven-developer-activity-plugin</report> - <report>maven-file-activity-plugin</report> - <report>maven-license-plugin</report> - <report>maven-javadoc-plugin</report> - <report>maven-jxr-plugin</report> - <report>maven-junit-report-plugin</report> - <report>maven-linkcheck-plugin</report> - <report>maven-pmd-plugin</report> - <report>maven-findbugs-plugin</report> - <!-- commenting out until they fix their repository <report>jutils-lint4j-plugin</report> --> - <!-- <report>maven-hammurapi-plugin</report> --> - </reports> - - <!-- Need to mark these as compile-time/run-time --> - - <dependencies> - - <dependency> - <groupId>dom4j</groupId> - <artifactId>dom4j</artifactId> - <version>1.6.1</version> - </dependency> - - <dependency> - <groupId>jdom</groupId> - <artifactId>jdom</artifactId> - <version>1.0</version> - <url>http://jdom.org</url> - </dependency> - - <dependency> - <groupId>xml-apis</groupId> - <artifactId>xml-apis</artifactId> - <version>1.3.02</version> - </dependency> - - <dependency> - <groupId>xerces</groupId> - <artifactId>xercesImpl</artifactId> - <version>2.6.2</version> - </dependency> - - <dependency> - <groupId>xom</groupId> - <artifactId>xom</artifactId> - <version>1.0</version> - </dependency> - - <dependency> - <groupId>maven-plugins</groupId> - <artifactId>maven-cobertura-plugin</artifactId> - <version>1.3</version> - <type>plugin</type> - </dependency> - -<!-- <dependency> - <groupId>maven-plugins</groupId> - <artifactId>maven-latex-plugin</artifactId> - <version>1.5</version> - <type>plugin</type> - </dependency> --> - - <dependency> - <groupId>maven-plugins</groupId> - <artifactId>maven-findbugs-plugin</artifactId> - <version>1.3.1</version> - <type>plugin</type> - </dependency> - -<!-- <dependency> - <groupId>lint4j</groupId> - <artifactId>jutils-lint4j-plugin</artifactId> - <version>1.1</version> - <type>plugin</type> - </dependency> --> - - <!-- <dependency> - <groupId>org.hammurapi</groupId> - <artifactId>maven-hammurapi-plugin</artifactId> - <version>1.0</version> - <type>plugin</type> - </dependency> --> - </dependencies> - - <build> - - <nagEmailAddress>d...@jaxen.codehaus.org</nagEmailAddress> - <sourceDirectory>src/java/main</sourceDirectory> - <unitTestSourceDirectory>src/java/test</unitTestSourceDirectory> - - <!-- Unit test classes --> - - <unitTest> - <includes> - <include>**/*Test.java</include> - </includes> - </unitTest> - - </build> - -</project> - - _______________________________________________ pkg-java-commits mailing list pkg-java-comm...@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits