This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository commons-jcs.
commit f81ec48792347a616c20f2169e999c5a93d63bf1 Author: Bas Couwenberg <[email protected]> Date: Sun May 31 21:30:29 2015 +0200 Add explicit dependency on velocity. --- debian/control | 1 + debian/maven.rules | 1 + debian/patches/series | 1 + debian/patches/velocity-dependency.patch | 34 ++++++++++++++++++++++++++++++++ 4 files changed, 37 insertions(+) diff --git a/debian/control b/debian/control index 8ae5c36..f5c7d10 100644 --- a/debian/control +++ b/debian/control @@ -27,6 +27,7 @@ Build-Depends-Indep: ant, libmaven-source-plugin-java, libservlet2.5-java, libvelocity-tools-java, + velocity, default-jdk-doc, libcommons-dbcp-java-doc, libcommons-logging-java-doc, diff --git a/debian/maven.rules b/debian/maven.rules index 3e66532..cce3675 100644 --- a/debian/maven.rules +++ b/debian/maven.rules @@ -17,4 +17,5 @@ s/ant/org.apache.ant/ * * s/.*/debian/ * * s/org.apache.tomcat/javax.el/ el-api jar s/.*/2.1/ * * s/org.apache.tomcat/javax.servlet/ jsp-api jar s/.*/2.1/ * * s/org.apache.tomcat/javax.servlet/ servlet-api jar s/.*/2.5/ * * +org.apache.velocity velocity * s/.*/debian/ * * s/org.apache.velocity/velocity-tools/ s/velocity-tools/velocity-tools-view/ * * * * diff --git a/debian/patches/series b/debian/patches/series new file mode 100644 index 0000000..53909c7 --- /dev/null +++ b/debian/patches/series @@ -0,0 +1 @@ +velocity-dependency.patch diff --git a/debian/patches/velocity-dependency.patch b/debian/patches/velocity-dependency.patch new file mode 100644 index 0000000..65781ac --- /dev/null +++ b/debian/patches/velocity-dependency.patch @@ -0,0 +1,34 @@ +Description: Add explicit dependency on velocity. +Author: Bas Couwenberg <[email protected]> + +--- a/commons-jcs-core/pom.xml ++++ b/commons-jcs-core/pom.xml +@@ -99,6 +99,12 @@ + + <dependency> + <groupId>org.apache.velocity</groupId> ++ <artifactId>velocity</artifactId> ++ <optional>true</optional> ++ </dependency> ++ ++ <dependency> ++ <groupId>org.apache.velocity</groupId> + <artifactId>velocity-tools</artifactId> + <optional>true</optional> + </dependency> +--- a/pom.xml ++++ b/pom.xml +@@ -495,6 +495,13 @@ + + <dependency> + <groupId>org.apache.velocity</groupId> ++ <artifactId>velocity</artifactId> ++ <version>1.7</version> ++ <optional>true</optional> ++ </dependency> ++ ++ <dependency> ++ <groupId>org.apache.velocity</groupId> + <artifactId>velocity-tools</artifactId> + <version>2.0</version> + <optional>true</optional> -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/commons-jcs.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
