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 75ca4ede19f6ea81e036d980c74bd8d296d5e466 Author: Emmanuel Bourg <ebo...@apache.org> Date: Thu Jul 25 22:58:10 2013 +0000 New upstream release (1.1.6) - Use the upstream pom instead of debian/pom.xml - Switched to Maven to build the package debian/control: - Removed Michael Koch from the uploaders (Closes: #654073) - Updated the Homepage field Added debian/orig-tar.sh to build the source tarball from the svn tag since the upstream archive is missing the resources required to run the tests. debian/copyright: - Updated to the Copyright Format 1.0 - Added the missing W3C license for UserDataHandler.java - Listed all the upstream authors --- debian/ant.properties | 4 - debian/build.xml | 190 ------------------------ debian/changelog | 25 +++- debian/control | 6 +- debian/copyright | 164 ++++++++++++++------ debian/libjaxen-java-doc.doc-base | 4 +- debian/libjaxen-java-doc.docs | 2 +- debian/libjaxen-java-doc.links | 2 +- debian/libjaxen-java.poms | 29 +++- debian/maven.ignoreRules | 2 - debian/maven.publishedRules | 2 + debian/maven.rules | 4 +- debian/orig-tar.sh | 19 +++ debian/patches/01-change-packaging-to-jar.patch | 14 ++ debian/patches/series | 1 + debian/pom.xml | 36 ----- debian/rules | 12 +- debian/watch | 2 +- 18 files changed, 216 insertions(+), 302 deletions(-) diff --git a/debian/ant.properties b/debian/ant.properties deleted file mode 100644 index cb5bec8..0000000 --- a/debian/ant.properties +++ /dev/null @@ -1,4 +0,0 @@ -ant.build.javac.source=1.3 -ant.build.javac.target=1.3 -noget=true -libdir=/usr/share/java diff --git a/debian/build.xml b/debian/build.xml deleted file mode 100644 index de0d4d7..0000000 --- a/debian/build.xml +++ /dev/null @@ -1,190 +0,0 @@ -<?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.3"></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.3 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> diff --git a/debian/changelog b/debian/changelog index 4678879..b82e70c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,10 +1,23 @@ -libjaxen-java (1.1.3-2) UNRELEASED; urgency=low +libjaxen-java (1.1.6-1) unstable; urgency=low - * Updated Standards-Version to 3.9.4 (no changes) - * Use canonical URLs for the Vcs-* fields - * Removed the unused dependency on libxerces2-java - - -- Emmanuel Bourg <ebo...@apache.org> Thu, 25 Jul 2013 16:43:15 +0200 + * New upstream release. + - Use the upstream pom instead of debian/pom.xml + - Switched to Maven to build the package + * debian/control: + - Removed the unused dependency on libxerces2-java + - Removed Michael Koch from the uploaders (Closes: #654073) + - Updated Standards-Version to 3.9.4 (no changes) + - Use canonical URLs for the Vcs-* fields + - Updated the Homepage field + * Added debian/orig-tar.sh to build the source tarball from the svn tag + since the upstream archive is missing the resources required to run + the tests. + * debian/copyright: + - Updated to the Copyright Format 1.0 + - Added the missing W3C license for UserDataHandler.java + - Listed all the upstream authors + + -- Emmanuel Bourg <ebo...@apache.org> Thu, 25 Jul 2013 22:33:32 +0200 libjaxen-java (1.1.3-1) unstable; urgency=low diff --git a/debian/control b/debian/control index fd56105..c33aea1 100644 --- a/debian/control +++ b/debian/control @@ -4,12 +4,12 @@ Priority: optional Maintainer: Debian Java Maintainers <pkg-java-maintainers@lists.alioth.debian.org> Uploaders: Marcus Better <mar...@better.se>, Emmanuel Bourg <ebo...@apache.org>, Damien Raude-Morvan <draz...@debian.org> -Build-Depends: cdbs, debhelper (>= 7), ant, ant-optional, default-jdk -Build-Depends-Indep: junit, libdom4j-java, libjdom1-java, libxom-java, maven-repo-helper +Build-Depends: cdbs, debhelper (>= 7), default-jdk +Build-Depends-Indep: junit, libdom4j-java, libjdom1-java, libxom-java, maven-debian-helper Standards-Version: 3.9.4 Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libjaxen-java Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libjaxen-java -Homepage: http://jaxen.org +Homepage: http://jaxen.codehaus.org Package: libjaxen-java Architecture: all diff --git a/debian/copyright b/debian/copyright index acdec58..e278be9 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,49 +1,127 @@ -This package was debianized by Arnaud Vandyck <av...@debian.org> on -Fri, 15 Apr 2005 15:53:37 +0200. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: jaxen +Upstream-Contact: Elliotte Rusty Harold <elh...@ibiblio.org> +Source: http://jaxen.codehaus.org -It was downloaded from <http://jaxen.org>. +Files: * +Copyright: 2000-2005, Bob McWhirter and James Strachan + 2000-2004, Jason Hunter and Brett McLaughlin + 2001, David Megginson + 2001, Erwin Bolwidt <e...@klomp.org> + 2001, Mark A. Belonga + 2001-2007, Codehaus + 2002, Attila Szegedi + 2002, Alexander Day Chaffee + 2002, Jan Dvorak <jan.dvo...@mathan.cz> + 2003-2004, Scott Sanders + 2003-2005, Peter Royal + 2003-2006, The Werken Company + 2004, Christian Nentwich + 2004-2007, Brian Ewins + 2005-2013, Elliotte Rusty Harold +License: BSD +Comment: Upstream contributors: + Stephen Colebourne + James Pereira <jpere...@ct.bbd.co.za> + Ryan Gustafson <rgus...@users.sourceforge.net> + David Peterson <da...@randombits.org> + Mark Wilson <mark.wil...@wilsoncom.de> + Jacob Kjome <h...@visi.com> + Michael Brennan <mpbren...@earthlink.net> + Bradley S. Huffman <h...@cs.okstate.edu> + K. Ari Krupnikov <a...@lib.aero> + Paul R. Brown <p...@fivesight.com> + Guoliang Cao <c...@ispsoft.com> + Jérôme Nègre <jerome.ne...@e-xmlmedia.fr> + Eddie McGreal <emcgr...@blackpearl.com> + Steen Lehmann <slehm...@users.sourceforge.net> + Ben McCann <benjamin.j.mcc...@gmail.com> + Don Corley <d...@donandann.com> -Upstream Authors: Attila Szegedi, Bob McWhirter <b...@werken.com>, -Bradley S. Huffman, Brett McLaughlin, David Megginson, Elliotte Rusty -Harold, Erwin Bolwidt <e...@klomp.org>, James Pereira -<jpere...@ct.bbd.co.za>, James Strachan <jstrac...@apache.org>, Jan -Dvorak <jan.dvo...@mathan.cz>, Jason Hunter, Jérôme Nègre -<jerome.ne...@e-xmlmedia.fr>, Mark Wilson <m...@wilsoncom.de>, Stephen -Colebourne. -Copyright (C) 2000-2005 Bob McWhirter and James Strachan -Copyright (C) 2000-2004 Jason Hunter and Brett McLaughlin -Copyright (C) 2001-2007 Codehaus -Copyright (C) 2003-2006 The Werken Company -Copyright (C) 2005-2006 Elliotte Rusty Harold +Files: src/java/main/org/w3c/dom/UserDataHandler.java +Copyright: 2004, W3C +License: W3C + W3C Software Notice and License + . + This work (and included software, documentation such as READMEs, or + other related items) is being provided by the copyright holders under + the following license. + . + License + . + By obtaining, using and/or copying this work, you (the licensee) agree + that you have read, understood, and will comply with the following + terms and conditions. + . + Permission to copy, modify, and distribute this software and its + documentation, with or without modification, for any purpose and + without fee or royalty is hereby granted, provided that you include + the following on ALL copies of the software and documentation or + portions thereof, including modifications: + . + - The full text of this NOTICE in a location viewable to users of + the redistributed or derivative work. + . + - Any pre-existing intellectual property disclaimers, notices, or + terms and conditions. If none exist, the W3C Software Short + Notice [1] should be included (hypertext is preferred, text is + permitted) within the body of any redistributed or derivative + code. + . + - Notice of any changes or modifications to the files, including + the date changes were made. (We recommend you provide URIs to + the location from which the code is derived.) + . + Disclaimers + . + THIS SOFTWARE AND DOCUMENTATION IS PROVIDED "AS IS," AND COPYRIGHT + HOLDERS MAKE NO REPRESENTATIONS OR WARRANTIES, EXPRESS OR IMPLIED, + INCLUDING BUT NOT LIMITED TO, WARRANTIES OF MERCHANTABILITY OR FITNESS + FOR ANY PARTICULAR PURPOSE OR THAT THE USE OF THE SOFTWARE OR + DOCUMENTATION WILL NOT INFRINGE ANY THIRD PARTY PATENTS, COPYRIGHTS, + TRADEMARKS OR OTHER RIGHTS. + . + COPYRIGHT HOLDERS WILL NOT BE LIABLE FOR ANY DIRECT, INDIRECT, SPECIAL + OR CONSEQUENTIAL DAMAGES ARISING OUT OF ANY USE OF THE SOFTWARE OR + DOCUMENTATION. + . + [1] http://www.w3.org/Consortium/Legal/2002/copyright-software-short-notice-20021231.html -Copyright (C) 2006-2007 Marcus Better -License: +Files: debian/* +Copyright: 2005, Arnaud Vandyck <av...@debian.org> + 2006, Wolfgang Baer <wb...@gmx.de> + 2006-2007, Marcus Better <mar...@better.se> + 2008-2009, Michael Koch <konque...@gmx.de> + 2009-2011, Damien Raude-Morvan <draz...@debian.org> + 2013, Emmanuel Bourg <ebo...@apache.org> +License: BSD - 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. +License: BSD + 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. diff --git a/debian/libjaxen-java-doc.doc-base b/debian/libjaxen-java-doc.doc-base index 690e94d..9d128ad 100644 --- a/debian/libjaxen-java-doc.doc-base +++ b/debian/libjaxen-java-doc.doc-base @@ -5,5 +5,5 @@ Abstract: This is the API Javadoc provided by the jaxen library. Section: Programming Format: HTML -Index: /usr/share/doc/libjaxen-java-doc/api/index.html -Files: /usr/share/doc/libjaxen-java-doc/api/* +Index: /usr/share/doc/libjaxen-java-doc/apidocs/index.html +Files: /usr/share/doc/libjaxen-java-doc/apidocs/* diff --git a/debian/libjaxen-java-doc.docs b/debian/libjaxen-java-doc.docs index 81a398b..47f322c 100644 --- a/debian/libjaxen-java-doc.docs +++ b/debian/libjaxen-java-doc.docs @@ -1 +1 @@ -dist/docs/api +target/apidocs diff --git a/debian/libjaxen-java-doc.links b/debian/libjaxen-java-doc.links index e692a99..db546e7 100644 --- a/debian/libjaxen-java-doc.links +++ b/debian/libjaxen-java-doc.links @@ -1 +1 @@ -usr/share/doc/libjaxen-java-doc/api usr/share/doc/libjaxen-java/api +usr/share/doc/libjaxen-java-doc/apidocs usr/share/doc/libjaxen-java/api diff --git a/debian/libjaxen-java.poms b/debian/libjaxen-java.poms index 1a7e280..d334a6b 100644 --- a/debian/libjaxen-java.poms +++ b/debian/libjaxen-java.poms @@ -1 +1,28 @@ -debian/pom.xml +# List of POM files for the package +# Format of this file is: +# <path to pom file> [option]* +# where option can be: +# --ignore: ignore this POM and its artifact if any +# --ignore-pom: don't install the POM. To use on POM files that are created +# temporarily for certain artifacts such as Javadoc jars. [mh_install, mh_installpoms] +# --no-parent: remove the <parent> tag from the POM +# --package=<package>: an alternative package to use when installing this POM +# and its artifact +# --has-package-version: to indicate that the original version of the POM is the same as the upstream part +# of the version for the package. +# --keep-elements=<elem1,elem2>: a list of XML elements to keep in the POM +# during a clean operation with mh_cleanpom or mh_installpom +# --artifact=<path>: path to the build artifact associated with this POM, +# it will be installed when using the command mh_install. [mh_install] +# --java-lib: install the jar into /usr/share/java to comply with Debian +# packaging guidelines +# --usj-name=<name>: name to use when installing the library in /usr/share/java +# --usj-version=<version>: version to use when installing the library in /usr/share/java +# --no-usj-versionless: don't install the versionless link in /usr/share/java +# --dest-jar=<path>: the destination for the real jar. +# It will be installed with mh_install. [mh_install] +# --classifier=<classifier>: Optional, the classifier for the jar. Empty by default. +# --site-xml=<location>: Optional, the location for site.xml if it needs to be installed. +# Empty by default. [mh_install] +# +pom.xml --has-package-version --no-parent --java-lib diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules deleted file mode 100644 index 3e465cc..0000000 --- a/debian/maven.ignoreRules +++ /dev/null @@ -1,2 +0,0 @@ -xerces xercesImpl * * * * -xml-apis xml-apis * * * * diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules new file mode 100644 index 0000000..1d342fa --- /dev/null +++ b/debian/maven.publishedRules @@ -0,0 +1,2 @@ + +jaxen jaxen s/jar/bundle/ s/.*/debian/ * * diff --git a/debian/maven.rules b/debian/maven.rules index b51a812..8eae3e3 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,2 +1,4 @@ -s/jdom/org.jdom/ jdom jar s/1\..*/debian/ +jaxen jaxen s/bundle/jar/ s/.*/debian/ * * +s/jdom/org.jdom/ jdom jar s/1\..*/debian/ * * +junit junit * s/.*/3.x/ * * diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh new file mode 100755 index 0000000..4802e35 --- /dev/null +++ b/debian/orig-tar.sh @@ -0,0 +1,19 @@ +#!/bin/sh -e + +VERSION=$2 +TAR=../libjaxen-java_$VERSION.orig.tar.gz +DIR=jaxen-$VERSION +TAG=V_$(echo $VERSION | sed 's/\./_/g')_Final + +svn export http://svn.codehaus.org/jaxen/tags/$TAG/jaxen $DIR +rm -f $DIR/project.* $DIR/maven.xml $DIR/.cvsignore +tar -c -z -f $TAR $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 diff --git a/debian/patches/01-change-packaging-to-jar.patch b/debian/patches/01-change-packaging-to-jar.patch new file mode 100644 index 0000000..c6ee335 --- /dev/null +++ b/debian/patches/01-change-packaging-to-jar.patch @@ -0,0 +1,14 @@ +Description: Change packaging to jar +Author: Emmanuel Bourg <ebo...@apache.org> +Forwarded: not-needed +--- a/pom.xml ++++ b/pom.xml +@@ -10,7 +10,7 @@ + + <groupId>jaxen</groupId> + <artifactId>jaxen</artifactId> +- <packaging>bundle</packaging> ++ <packaging>jar</packaging> + <name>jaxen</name> + <version>1.1.6</version> + <description>Jaxen is a universal Java XPath engine.</description> diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..9e463b9 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +01-change-packaging-to-jar.patch diff --git a/debian/pom.xml b/debian/pom.xml deleted file mode 100644 index 1637941..0000000 --- a/debian/pom.xml +++ /dev/null @@ -1,36 +0,0 @@ -<project> - <modelVersion>4.0.0</modelVersion> - <groupId>jaxen</groupId> - <artifactId>jaxen</artifactId> - <version>1.1.3</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> diff --git a/debian/rules b/debian/rules index dcff8d3..4af27cf 100755 --- a/debian/rules +++ b/debian/rules @@ -1,19 +1,9 @@ #!/usr/bin/make -f -include /usr/share/cdbs/1/class/ant.mk +include /usr/share/cdbs/1/class/maven.mk include /usr/share/cdbs/1/rules/debhelper.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:: - mh_installpoms -plibjaxen-java - mh_installjar -plibjaxen-java -l debian/pom.xml dist/jaxen-$(DEB_UPSTREAM_VERSION).jar - -clean:: - mh_clean get-orig-source: uscan --force-download --download-version $(DEB_UPSTREAM_VERSION) --rename diff --git a/debian/watch b/debian/watch index 018c8f0..d3a8bc1 100644 --- a/debian/watch +++ b/debian/watch @@ -1,3 +1,3 @@ version=3 opts="dversionmangle=s/~beta/-beta-/" \ - http://dist.codehaus.org/jaxen/distributions/jaxen-(.*)-src.tar.gz + http://dist.codehaus.org/jaxen/distributions/jaxen-(.*)-src.tar.gz debian debian/orig-tar.sh -- 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