[pkg-java] r17129 - in trunk/libcommons-jxpath-java/debian: . patches
Emmanuel Bourg
ebourg-guest at alioth.debian.org
Wed Aug 7 23:50:23 UTC 2013
Author: ebourg-guest
Date: 2013-08-07 23:50:22 +0000 (Wed, 07 Aug 2013)
New Revision: 17129
Added:
trunk/libcommons-jxpath-java/debian/maven.ignoreRules
trunk/libcommons-jxpath-java/debian/maven.rules
Modified:
trunk/libcommons-jxpath-java/debian/ant.properties
trunk/libcommons-jxpath-java/debian/changelog
trunk/libcommons-jxpath-java/debian/control
trunk/libcommons-jxpath-java/debian/copyright
trunk/libcommons-jxpath-java/debian/libcommons-jxpath-java.poms
trunk/libcommons-jxpath-java/debian/patches/01_build_xml.patch
trunk/libcommons-jxpath-java/debian/rules
Log:
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
Modified: trunk/libcommons-jxpath-java/debian/ant.properties
===================================================================
--- trunk/libcommons-jxpath-java/debian/ant.properties 2013-08-07 07:14:40 UTC (rev 17128)
+++ trunk/libcommons-jxpath-java/debian/ant.properties 2013-08-07 23:50:22 UTC (rev 17129)
@@ -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
Modified: trunk/libcommons-jxpath-java/debian/changelog
===================================================================
--- trunk/libcommons-jxpath-java/debian/changelog 2013-08-07 07:14:40 UTC (rev 17128)
+++ trunk/libcommons-jxpath-java/debian/changelog 2013-08-07 23:50:22 UTC (rev 17129)
@@ -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 <ebourg at apache.org> Wed, 07 Aug 2013 19:59:01 +0200
+
libcommons-jxpath-java (1.3-5) unstable; urgency=low
* Team upload.
Modified: trunk/libcommons-jxpath-java/debian/control
===================================================================
--- trunk/libcommons-jxpath-java/debian/control 2013-08-07 07:14:40 UTC (rev 17128)
+++ trunk/libcommons-jxpath-java/debian/control 2013-08-07 23:50:22 UTC (rev 17129)
@@ -2,35 +2,35 @@
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Niels Thykier <niels at thykier.net>, Michael Koch <konqueror at gmx.de>
+Uploaders: Niels Thykier <niels at thykier.net>, Emmanuel Bourg <ebourg at apache.org>
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 @@
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.
Modified: trunk/libcommons-jxpath-java/debian/copyright
===================================================================
--- trunk/libcommons-jxpath-java/debian/copyright 2013-08-07 07:14:40 UTC (rev 17128)
+++ trunk/libcommons-jxpath-java/debian/copyright 2013-08-07 23:50:22 UTC (rev 17129)
@@ -1,15 +1,21 @@
-This package was debianized by Arnaud Vandyck <avdyk at debian.org> 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 <dmitri at apache.org>
- Craig McClanahan <Craig.McClanahan at eng.sun.com>
- Matt Benson <mbenson at apache.org>
+Files: debian/*
+Copyright: 2003-2005, Arnaud Vandyck <avdyk at debian.org>
+ 2005-2006, Wolfgang Baer <WBaer at gmx.de>
+ 2009, Niels Thykier <niels at thykier.net>
+ 2009, Michael Koch <konqueror at gmx.de>
+ 2010, Torsten Werner <twerner at debian.org>
+ 2011, Damien Raude-Morvan <drazzib at debian.org>
+ 2013, Emmanuel Bourg <ebourg at apache.org>
+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'.
Modified: trunk/libcommons-jxpath-java/debian/libcommons-jxpath-java.poms
===================================================================
--- trunk/libcommons-jxpath-java/debian/libcommons-jxpath-java.poms 2013-08-07 07:14:40 UTC (rev 17128)
+++ trunk/libcommons-jxpath-java/debian/libcommons-jxpath-java.poms 2013-08-07 23:50:22 UTC (rev 17129)
@@ -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
Added: trunk/libcommons-jxpath-java/debian/maven.ignoreRules
===================================================================
--- trunk/libcommons-jxpath-java/debian/maven.ignoreRules (rev 0)
+++ trunk/libcommons-jxpath-java/debian/maven.ignoreRules 2013-08-07 23:50:22 UTC (rev 17129)
@@ -0,0 +1,2 @@
+xml-apis xml-apis * * * *
+xerces xercesImpl * * * *
Added: trunk/libcommons-jxpath-java/debian/maven.rules
===================================================================
--- trunk/libcommons-jxpath-java/debian/maven.rules (rev 0)
+++ trunk/libcommons-jxpath-java/debian/maven.rules 2013-08-07 23:50:22 UTC (rev 17129)
@@ -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/ * *
Modified: trunk/libcommons-jxpath-java/debian/patches/01_build_xml.patch
===================================================================
--- trunk/libcommons-jxpath-java/debian/patches/01_build_xml.patch 2013-08-07 07:14:40 UTC (rev 17128)
+++ trunk/libcommons-jxpath-java/debian/patches/01_build_xml.patch 2013-08-07 23:50:22 UTC (rev 17129)
@@ -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 @@
Modified: trunk/libcommons-jxpath-java/debian/rules
===================================================================
--- trunk/libcommons-jxpath-java/debian/rules 2013-08-07 07:14:40 UTC (rev 17128)
+++ trunk/libcommons-jxpath-java/debian/rules 2013-08-07 23:50:22 UTC (rev 17129)
@@ -9,15 +9,12 @@
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
More information about the pkg-java-commits
mailing list