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 0bdb0ec84698d3366a6709cec0bef8b378097257 Author: Emmanuel Bourg <[email protected]> Date: Mon Jul 24 23:35:20 2017 +0200 Depend on plexus-container-default1.5 instead of plexus-container-default --- debian/changelog | 6 ++++++ debian/control | 3 +-- debian/maven.rules | 3 ++- debian/patches/01-junit-dependency.patch | 18 ++++++++++++++++++ debian/patches/series | 1 + 5 files changed, 28 insertions(+), 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index bd0fd4a..36f7fa2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +plexus-velocity (1.2-2) UNRELEASED; urgency=medium + + * Depend on plexus-container-default1.5 instead of plexus-container-default + + -- Emmanuel Bourg <[email protected]> Mon, 24 Jul 2017 23:34:37 +0200 + plexus-velocity (1.2-1) unstable; urgency=medium * New upstream release diff --git a/debian/control b/debian/control index 7b923ed..d422a67 100644 --- a/debian/control +++ b/debian/control @@ -14,8 +14,7 @@ Build-Depends-Indep: libcommons-collections3-java, libcommons-collections3-java-doc, libmaven-javadoc-plugin-java, - libplexus-container-default-java, - libplexus-container-default-java-doc + libplexus-container-default1.5-java Standards-Version: 3.9.8 Vcs-Git: https://anonscm.debian.org/git/pkg-java/plexus-velocity.git Vcs-Browser: https://anonscm.debian.org/cgit/pkg-java/plexus-velocity.git diff --git a/debian/maven.rules b/debian/maven.rules index 20b7c42..2c78b4d 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -1,6 +1,7 @@ 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-container-default jar s/.*/1.5.5/ * * org.codehaus.plexus plexus-velocity jar s/.*/debian/ * * commons-collections commons-collections * s/3\..*/3.x/ * * s/velocity/org.apache.velocity/ * * s/.*/debian/ * * +junit junit * s/.*/4.x/ * * diff --git a/debian/patches/01-junit-dependency.patch b/debian/patches/01-junit-dependency.patch new file mode 100644 index 0000000..d33da77 --- /dev/null +++ b/debian/patches/01-junit-dependency.patch @@ -0,0 +1,18 @@ +Description: Adds the junit dependency (no longer provided by plexus-container-default) +Author: Emmanuel Bourg <[email protected]> +Forwarded: no +--- a/pom.xml ++++ b/pom.xml +@@ -60,6 +60,12 @@ + <artifactId>velocity</artifactId> + <version>1.7</version> + </dependency> ++ <dependency> ++ <groupId>junit</groupId> ++ <artifactId>junit</artifactId> ++ <version>4.x</version> ++ <scope>test</scope> ++ </dependency> + </dependencies> + + <build> diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..9efca2d --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +01-junit-dependency.patch -- 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
