[velocity-tools] 24/26: Install the jar artifact for org.apache.velocity:velocity-tools No longer install velocity-tools-generic.jar (never used)

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository velocity-tools.

commit 531f9424f143d6456ba593d1d7155a7c5f9c06ce
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Nov 16 16:11:59 2015 +0100

    Install the jar artifact for org.apache.velocity:velocity-tools
    No longer install velocity-tools-generic.jar (never used)
---
 debian/changelog | 2 ++
 debian/rules     | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 758a73c..02ff27c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 velocity-tools (2.0-4) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Install the jar artifact for org.apache.velocity:velocity-tools
+  * No longer install velocity-tools-generic.jar (never used)
   * Switch to debhelper level 9
   * Removed the missing dependencies from the velocity-tools pom
   * Removed the dependency on libservlet2.5-java from libvelocity-tools-java
diff --git a/debian/rules b/debian/rules
index 654967d..d99d9c9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -19,9 +19,11 @@ API_DOCS             := docs/javadoc/*
 binary-post-install/lib$(DEB_SOURCE_PACKAGE)-java::
 	# Generic JAR
 	mh_installpoms -plib$(DEB_SOURCE_PACKAGE)-java
-	mh_installjar -plib$(DEB_SOURCE_PACKAGE)-java -l pom.xml -n$(DEB_SOURCE_PACKAGE)-generic dist/$(DEB_SOURCE_PACKAGE)-generic-$(DEB_UPSTREAM_VERSION).jar
+	mh_installjar  -plib$(DEB_SOURCE_PACKAGE)-java -l pom.xml dist/$(DEB_SOURCE_PACKAGE)-view-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/velocity-tools-view.jar
+
 	# View JAR
-	mh_installjar -plib$(DEB_SOURCE_PACKAGE)-java -l debian/velocity-tools-view.pom -n$(DEB_SOURCE_PACKAGE)-view dist/$(DEB_SOURCE_PACKAGE)-view-$(DEB_UPSTREAM_VERSION).jar
+	dh_link -plib$(DEB_SOURCE_PACKAGE)-java /usr/share/java/velocity-tools-view.jar /usr/share/maven-repo/velocity-tools/velocity-tools-view/debian/velocity-tools-view-debian.jar
+	dh_link -plib$(DEB_SOURCE_PACKAGE)-java /usr/share/java/velocity-tools-view.jar /usr/share/maven-repo/velocity-tools/velocity-tools-view/$(DEB_UPSTREAM_VERSION)/velocity-tools-view-$(DEB_UPSTREAM_VERSION).jar
 
 clean::
 	-rm -rf debian/tmp

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/velocity-tools.git