This is an automated email from the git hooks/post-receive script. xhaakon-guest pushed a commit to branch master in repository libcommons-jxpath-java.
commit 713e4e7626d8f1636237cd2b564feb3de54b6efa Author: Emmanuel Bourg <[email protected]> Date: Wed Aug 7 23:50:22 2013 +0000 Updated the dependencies (Commons Collections 3.x and Servlet API 3.0) Removed Michael Koch from the uploaders (Closes: #654057) Updated Standards-Version to 3.9.4 (no changes) Use canonical URLs for the Vcs-* fields Improved the package description debian/rules: Improved the clean target Use mh_install instead of mh_installpoms/mh_installjar debian/copyright: Updated to the Copyright Format 1.0 Added a description to 01_build_xml.patch --- debian/ant.properties | 4 ++-- debian/changelog | 16 ++++++++++++++++ debian/control | 28 +++++++++++++++------------- debian/copyright | 30 ++++++++++++++++++------------ debian/libcommons-jxpath-java.poms | 29 ++++++++++++++++++++++++++++- debian/maven.ignoreRules | 2 ++ debian/maven.rules | 5 +++++ debian/patches/01_build_xml.patch | 6 ++++++ debian/rules | 13 +++++-------- 9 files changed, 97 insertions(+), 36 deletions(-) diff --git a/debian/ant.properties b/debian/ant.properties index fc75048..e6b0f5a 100644 --- a/debian/ant.properties +++ b/debian/ant.properties @@ -1,9 +1,9 @@ build.sysclasspath=only -final.name=commons-jxpath-1.2 +final.name=commons-jxpath-1.3 junit.jar = /usr/share/java/junit.jar jaxp.jaxp.jar = /usr/share/java/jaxp.jaxp.jar jaxp.xslt.jar = /usr/share/java/jaxp.xslt.jar -servlet.jar = /usr/share/java/servlet-2.3.jar +servlet.jar = /usr/share/java/servlet-3.0.jar commons-beanutils.jar = /usr/share/java/commons-beanutils.jar commons-collections.jar = /usr/share/java/commons-collections.jar commons-logging.jar = /usr/share/java/commons-logging.jar diff --git a/debian/changelog b/debian/changelog index a79afae..2eea9ee 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,19 @@ +libcommons-jxpath-java (1.3-6) unstable; urgency=low + + * debian/control: + - Updated the dependencies (Commons Collections 3.x and Servlet API 3.0) + - Removed Michael Koch from the uploaders (Closes: #654057) + - Updated Standards-Version to 3.9.4 (no changes) + - Use canonical URLs for the Vcs-* fields + - Improved the package description + * debian/rules: + - Improved the clean target + - Use mh_install instead of mh_installpoms/mh_installjar + * debian/copyright: Updated to the Copyright Format 1.0 + * Added a description to 01_build_xml.patch + + -- Emmanuel Bourg <[email protected]> Wed, 07 Aug 2013 19:59:01 +0200 + libcommons-jxpath-java (1.3-5) unstable; urgency=low * Team upload. diff --git a/debian/control b/debian/control index 24cb504..9d0c593 100644 --- a/debian/control +++ b/debian/control @@ -2,35 +2,35 @@ Source: libcommons-jxpath-java Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Niels Thykier <[email protected]>, Michael Koch <[email protected]> +Uploaders: Niels Thykier <[email protected]>, Emmanuel Bourg <[email protected]> Build-Depends: ant, cdbs (>= 0.4.8), debhelper (>= 7), default-jdk, junit, libcommons-beanutils-java, - libcommons-collections-java, + libcommons-collections3-java, libcommons-logging-java, libjdom1-java, - libservlet2.5-java, + libservlet3.0-java, maven-repo-helper -Standards-Version: 3.9.2 -Homepage: http://commons.apache.org/jxpath/ -Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/libcommons-jxpath-java -Vcs-Browser: http://svn.debian.org/viewsvn/pkg-java/trunk/libcommons-jxpath-java +Standards-Version: 3.9.4 +Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/libcommons-jxpath-java +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/libcommons-jxpath-java/ +Homepage: http://commons.apache.org/jxpath Package: libcommons-jxpath-java Architecture: all Depends: ${misc:Depends} Suggests: libcommons-jxpath-java-doc -Description: manipulate javabean using XPath syntax - This library provides the java developer the ability to manipulate - javabeans with the XPath syntax. It also supports java collections, +Description: Apache Commons JXPath - XPath expressions applied to Java objects + This library provides the Java developer the ability to manipulate + javabeans with the XPath syntax. It also supports Java collections, objects with dynamic properties (like Map, ServletContext, etc) and mechanism for adding support for additional models. . One of the most important feature of the component is the - unification of reference syntax between DOM and java. + unification of reference syntax between DOM and Java. Package: libcommons-jxpath-java-doc Section: doc @@ -38,5 +38,7 @@ Architecture: all Depends: ${misc:Depends} Suggests: libcommons-jxpath-java Description: Javadoc API for libcommons-jxpath-java - The javadoc API for libcommons-jxpath-java which is a library to - manipulate javabeans with the XPath syntax. + JXPath applies XPath expressions to graphs of objects of all kinds: + JavaBeans, Maps, Servlet contexts, DOM etc, including mixtures thereof. + . + This package contains the Javadoc API for libcommons-jxpath-java. diff --git a/debian/copyright b/debian/copyright index c3302a7..d847ce1 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,15 +1,21 @@ -This package was debianized by Arnaud Vandyck <[email protected]> on -Mon, 27 Oct 2003 17:57:08 +0200. +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: Apache Commons JXPath +Source: http://commons.apache.org/jxpath -It was downloaded from http://commons.apache.org/jxpath/ +Files: * +Copyright: 2001-2008, The Apache Software Foundation +License: Apache-2.0 -Upstream Author: Dmitri Plotnikov <[email protected]> - Craig McClanahan <[email protected]> - Matt Benson <[email protected]> +Files: debian/* +Copyright: 2003-2005, Arnaud Vandyck <[email protected]> + 2005-2006, Wolfgang Baer <[email protected]> + 2009, Niels Thykier <[email protected]> + 2009, Michael Koch <[email protected]> + 2010, Torsten Werner <[email protected]> + 2011, Damien Raude-Morvan <[email protected]> + 2013, Emmanuel Bourg <[email protected]> +License: Apache-2.0 -Copyright: © 2001-2008 The Apache Software Foundation - -License: Apache 2.0 - -On Debian systems the full text of the Apache License can be found -in `/usr/share/common-licenses/Apache-2.0'. +License: Apache-2.0 + On Debian systems the full text of the Apache License can be found + in `/usr/share/common-licenses/Apache-2.0'. diff --git a/debian/libcommons-jxpath-java.poms b/debian/libcommons-jxpath-java.poms index 43e746b..f661294 100644 --- a/debian/libcommons-jxpath-java.poms +++ b/debian/libcommons-jxpath-java.poms @@ -1 +1,28 @@ -pom.xml --no-parent +# 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 --no-parent --has-package-version --java-lib --artifact=target/commons-jxpath-*.jar diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules new file mode 100644 index 0000000..b14c62c --- /dev/null +++ b/debian/maven.ignoreRules @@ -0,0 +1,2 @@ +xml-apis xml-apis * * * * +xerces xercesImpl * * * * diff --git a/debian/maven.rules b/debian/maven.rules new file mode 100644 index 0000000..a373bef --- /dev/null +++ b/debian/maven.rules @@ -0,0 +1,5 @@ + +commons-jxpath commons-jxpath jar s/.*/debian/ * * +commons-logging s/commons-logging-api/commons-logging/ * s/.*/debian/ * * +javax.servlet jsp-api jar s/.*/2.2/ * * +javax.servlet servlet-api jar s/.*/3.0/ * * diff --git a/debian/patches/01_build_xml.patch b/debian/patches/01_build_xml.patch index cfe4abf..2e6a160 100644 --- a/debian/patches/01_build_xml.patch +++ b/debian/patches/01_build_xml.patch @@ -1,3 +1,9 @@ +Description: Various build tweaks + * Specifies the source/target level + * Fixes the version in the title of the Javadoc + * Removes the private fields/methods from the Javadoc + * Disables the tests (missing dependencies) +Forwarded: not-needed --- a/build.xml 2009-09-13 12:20:12.177029733 +0200 +++ b/build.xml 2009-09-13 12:20:44.817007573 +0200 @@ -33,7 +33,7 @@ diff --git a/debian/rules b/debian/rules index 8a723b5..b474150 100755 --- a/debian/rules +++ b/debian/rules @@ -9,15 +9,12 @@ include /usr/share/cdbs/1/class/ant.mk JAVA_HOME := /usr/lib/jvm/default-java ANT_HOME := /usr/share/ant -DEB_JARS := junit jdom1 servlet-api-2.5 jsp-api-2.1 commons-beanutils common-collections commons-logging +DEB_JARS := junit jdom1 servlet-api-3.0 jsp-api-2.2 commons-beanutils common-collections3 commons-logging DEB_ANT_BUILD_TARGET := jar javadoc DEB_ANT_CLEAN_TARGET := clean -LIBRARY=commons-jxpath - binary-install/libcommons-jxpath-java:: - # With the 1.3 release upstream forgot to bump the version number. - # So we are doing a little magic to get it right regardless. - test `ls -1 target/commons-jxpath-*.jar | wc -l` = 1 || ( echo "Too many matches" ; exit 1) - mh_installpoms -plibcommons-jxpath-java - mh_installjar -plibcommons-jxpath-java pom.xml target/commons-jxpath-*.jar -l + mh_install -plibcommons-jxpath-java + +clean:: + mh_clean -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/libcommons-jxpath-java.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
