[commons-jcs] 22/27: Fixed the dependency on velocity-tools

[Emmanuel Bourg]

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 488ff242eda814c86fcfca531e9a99a08d62e943
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Nov 16 17:12:52 2015 +0100

    Fixed the dependency on velocity-tools
---
 debian/control                           |  2 +-
 debian/maven.rules                       |  2 --
 debian/patches/series                    |  1 -
 debian/patches/velocity-dependency.patch | 34 --------------------------------
 4 files changed, 1 insertion(+), 38 deletions(-)

diff --git a/debian/control b/debian/control
index 3d4bd2b..f9f688d 100644
--- a/debian/control
+++ b/debian/control
@@ -29,7 +29,7 @@ Build-Depends-Indep: ant,
                      libmaven-install-plugin-java,
                      libmaven-javadoc-plugin-java,
                      libservlet3.1-java,
-                     libvelocity-tools-java,
+                     libvelocity-tools-java (>= 2.0-4~),
                      velocity
 Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-java/libcommons-jcs-java.git
diff --git a/debian/maven.rules b/debian/maven.rules
index c0632ba..e65d6ff 100644
--- a/debian/maven.rules
+++ b/debian/maven.rules
@@ -16,8 +16,6 @@ s/hsqldb/org.hsqldb/ hsqldb * s/.*/debian/ * *
 log4j log4j * s/1\.2\..*/1.2.x/ * *
 s/ant/org.apache.ant/ * * s/.*/debian/ * *
 javax.servlet s/servlet-api/javax.servlet-api/ * s/.*/3.1/ * *
-org.apache.velocity  velocity * s/.*/debian/ * *
-s/org.apache.velocity/velocity-tools/ s/velocity-tools/velocity-tools-view/ * * * *
 s/org.apache.geronimo.specs/javax.enterprise/ s/geronimo-jcdi_1.0_spec/cdi-api/ * s/.*/debian/ * *
 org.apache.geronimo.specs s/geronimo-interceptor_1.1_spec/geronimo-interceptor_3.0_spec/ * s/.*/debian/ * *
 s/org.apache.geronimo.specs/javax.inject/ s/geronimo-atinject_1.0_spec/javax.inject/ * s/.*/debian/ * *
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 53909c7..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-velocity-dependency.patch
diff --git a/debian/patches/velocity-dependency.patch b/debian/patches/velocity-dependency.patch
deleted file mode 100644
index 65781ac..0000000
--- a/debian/patches/velocity-dependency.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: Add explicit dependency on velocity.
-Author: Bas Couwenberg <sebastic at debian.org>
-
---- 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