This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository plexus-velocity.
commit e7326878e51a90274a8a21481e68c7b914dbc007 Author: Emmanuel Bourg <[email protected]> Date: Tue Aug 6 08:56:50 2013 +0000 New upstream release (1.1.8) Switched the build dependency on Commons Collections to 3.x Updated Standards-Version to 3.9.4 (no changes) Removed Michael Koch from the uploaders (Closes: #654128) Use canonical URLs for the Vcs-* fields debian/copyright: Updated the Format URI --- debian/changelog | 12 ++++++++++++ debian/control | 12 ++++++------ debian/copyright | 2 +- debian/libplexus-velocity-java.poms | 14 ++++++++------ debian/maven.cleanIgnoreRules | 16 ---------------- debian/maven.ignoreRules | 15 --------------- debian/maven.publishedRules | 19 +------------------ debian/maven.rules | 20 ++------------------ 8 files changed, 30 insertions(+), 80 deletions(-) diff --git a/debian/changelog b/debian/changelog index b683019..52f35e4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +plexus-velocity (1.1.8-1) unstable; urgency=low + + * New upstream release + * Switched the build dependency on Commons Collections to 3.x + * debian/control: + - Updated Standards-Version to 3.9.4 (no changes) + - Removed Michael Koch from the uploaders (Closes: #654128) + - Use canonical URLs for the Vcs-* fields + * debian/copyright: Updated the Format URI + + -- Emmanuel Bourg <[email protected]> Tue, 06 Aug 2013 10:56:03 +0200 + plexus-velocity (1.1.7-5) unstable; urgency=low * Team upload. diff --git a/debian/control b/debian/control index 63f93e6..89c7b5b 100644 --- a/debian/control +++ b/debian/control @@ -2,14 +2,14 @@ Source: plexus-velocity Section: java Priority: optional Maintainer: Debian Java Maintainers <[email protected]> -Uploaders: Michael Koch <[email protected]>, Ludovic Claude <[email protected]> +Uploaders: Ludovic Claude <[email protected]>, Emmanuel Bourg <[email protected]> Build-Depends: debhelper (>= 7), cdbs, default-jdk, maven-debian-helper (>= 1.4) -Build-Depends-Indep: libcommons-collections-java, libplexus-container-default-java, default-jdk-doc, - libcommons-collections-java-doc, libplexus-container-default-java-doc, +Build-Depends-Indep: libcommons-collections3-java, libplexus-container-default-java, default-jdk-doc, + libcommons-collections3-java-doc, libplexus-container-default-java-doc, libmaven-javadoc-plugin-java -Standards-Version: 3.9.1 -Vcs-Svn: svn://svn.debian.org/svn/pkg-java/trunk/plexus-velocity -Vcs-Browser: http://svn.debian.org/wsvn/pkg-java/trunk/plexus-velocity +Standards-Version: 3.9.4 +Vcs-Svn: svn://anonscm.debian.org/pkg-java/trunk/plexus-velocity +Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-java/trunk/plexus-velocity Homepage: http://plexus.codehaus.org/plexus-components/plexus-velocity/ Package: libplexus-velocity-java diff --git a/debian/copyright b/debian/copyright index 9766b80..6a6bd22 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,4 +1,4 @@ -Format: http://dep.debian.net/deps/dep5/ +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: Plexus Velocity Component Source: http://plexus.codehaus.org/plexus-components/plexus-velocity/ diff --git a/debian/libplexus-velocity-java.poms b/debian/libplexus-velocity-java.poms index 31a0ccf..5ad70f2 100644 --- a/debian/libplexus-velocity-java.poms +++ b/debian/libplexus-velocity-java.poms @@ -2,7 +2,9 @@ # Format of this file is: # <path to pom file> [option]* # where option can be: -# --ignore: ignore this POM or +# --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 @@ -11,16 +13,16 @@ # --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 +# 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. +# --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. -# --ignore-pom: don't install the POM with mh_install or mh_installpoms. To use with POM files that are created -# temporarily for certain artifacts such as Javadoc jars. +# --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 diff --git a/debian/maven.cleanIgnoreRules b/debian/maven.cleanIgnoreRules index b47b61d..8b13789 100644 --- a/debian/maven.cleanIgnoreRules +++ b/debian/maven.cleanIgnoreRules @@ -1,17 +1 @@ -# Maven clean ignore rules - ignore some Maven dependencies and plugins -# during the clean phase of a Maven build -# Format of this file is: -# [group] [artifact] [type] [version] [classifier] [scope] -# where each element can be either -# - the exact string, for example org.apache for the group, or 3.1 -# for the version. In this case, the element is simply matched -# and left as it is -# - * (the star character, alone). In this case, anything will -# match and be left as it is. For example, using * on the -# position of the artifact field will match any artifact id -# All elements much match before a rule can be applied -# Example rule: match jar with groupid= junit, artifactid= junit -# and version starting with 3., this dependency is then removed -# from the POM before mvn clean is called -# junit junit jar s/3\\..*/3.x/ diff --git a/debian/maven.ignoreRules b/debian/maven.ignoreRules index 0088a40..8b13789 100644 --- a/debian/maven.ignoreRules +++ b/debian/maven.ignoreRules @@ -1,16 +1 @@ -# Maven ignore rules - ignore some Maven dependencies and plugins -# Format of this file is: -# [group] [artifact] [type] [version] [classifier] [scope] -# where each element can be either -# - the exact string, for example org.apache for the group, or 3.1 -# for the version. In this case, the element is simply matched -# and left as it is -# - * (the star character, alone). In this case, anything will -# match and be left as it is. For example, using * on the -# position of the artifact field will match any artifact id -# All elements much match before a rule can be applied -# Example rule: match jar with groupid= junit, artifactid= junit -# and version starting with 3., this dependency is then removed -# from the POM -# junit junit jar s/3\\..*/3.x/ diff --git a/debian/maven.publishedRules b/debian/maven.publishedRules index 822f087..9acbc22 100644 --- a/debian/maven.publishedRules +++ b/debian/maven.publishedRules @@ -1,19 +1,2 @@ -# Maven published rules - additional rules to publish, to help -# the packaging work of Debian maintainers using mh_make -# Format of this file is: -# [group] [artifact] [type] [version] [classifier] [scope] -# where each element can be either -# - the exact string, for example org.apache for the group, or 3.1 -# for the version. In this case, the element is simply matched -# and left as it is -# - * (the star character, alone). In this case, anything will -# match and be left as it is. For example, using * on the -# position of the artifact field will match any artifact id -# - a regular expression of the form s/match/replace/ -# in this case, elements that match are transformed using -# the regex rule. -# All elements much match before a rule can be applied -# Example rule: match jar with groupid= junit, artifactid= junit -# and version starting with 3., replacing the version with 3.x -# junit junit jar s/3\\..*/3.x/ +org.codehaus.plexus plexus-velocity jar s/.*/debian/ * * diff --git a/debian/maven.rules b/debian/maven.rules index f1a05a7..20b7c42 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,22 +1,6 @@ -# Maven rules - transform Maven dependencies and plugins -# Format of this file is: -# [group] [artifact] [type] [version] [classifier] [scope] -# where each element can be either -# - the exact string, for example org.apache for the group, or 3.1 -# for the version. In this case, the element is simply matched -# and left as it is -# - * (the star character, alone). In this case, anything will -# match and be left as it is. For example, using * on the -# position of the artifact field will match any artifact id -# - a regular expression of the form s/match/replace/ -# in this case, elements that match are transformed using -# the regex rule. -# All elements much match before a rule can be applied -# Example rule: match jar with groupid= junit, artifactid= junit -# and version starting with 3., replacing the version with 3.x -# junit junit jar s/3\\..*/3.x/ +org.apache.velocity velocity jar s/.*/debian/ * * org.codehaus.plexus plexus-container-default jar s/1\.0-alpha.*/1.0-alpha/ * * org.codehaus.plexus plexus-velocity jar s/.*/debian/ * * -commons-collections commons-collections * s/2\..*/2.x/ * * +commons-collections commons-collections * s/3\..*/3.x/ * * s/velocity/org.apache.velocity/ * * s/.*/debian/ * * -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/plexus-velocity.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
