[tomcat8] 01/02: Install the Maven artifacts for tomcat-storeconfig

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch experimental
in repository tomcat8.

commit c5f9922c76bfc8bc0bf3a15efdb3446ec94097dc
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Wed Nov 30 16:49:17 2016 +0100

    Install the Maven artifacts for tomcat-storeconfig
---
 debian/changelog            | 1 +
 debian/libtomcat8-java.poms | 1 +
 debian/rules                | 6 ------
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 6e46cf0..c3ad1bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ tomcat8 (8.5.8-2) UNRELEASED; urgency=medium
 
   * Team upload.
   * Set the proper permissions for /etc/tomcat8/jaspic-providers.xml
+  * Install the Maven artifacts for tomcat-storeconfig
 
  -- Emmanuel Bourg <ebourg at apache.org>  Wed, 30 Nov 2016 16:35:02 +0100
 
diff --git a/debian/libtomcat8-java.poms b/debian/libtomcat8-java.poms
index cf1d253..af2037e 100644
--- a/debian/libtomcat8-java.poms
+++ b/debian/libtomcat8-java.poms
@@ -16,6 +16,7 @@ debian/poms/tomcat-jni.pom             --java-lib --usj-name=tomcat8-jni
 debian/poms/tomcat-jsp-api.pom         --java-lib --usj-name=tomcat8-jsp-api         --artifact=output/build/lib/jsp-api.jar
 debian/poms/tomcat-juli.pom            --java-lib --usj-name=tomcat8-juli            --artifact=output/build/bin/tomcat-juli.jar
 debian/poms/tomcat-servlet-api.pom     --java-lib --usj-name=tomcat8-servlet-api     --artifact=output/build/lib/servlet-api.jar
+debian/poms/tomcat-storeconfig.pom     --java-lib --usj-name=tomcat8-storeconfig     --artifact=output/build/lib/catalina-storeconfig.jar
 debian/poms/tomcat-tribes.pom          --java-lib --usj-name=tomcat8-tribes          --artifact=output/build/lib/catalina-tribes.jar
 debian/poms/tomcat-util.pom            --java-lib --usj-name=tomcat8-util            --artifact=output/build/lib/tomcat-util.jar
 debian/poms/tomcat-util-scan.pom       --java-lib --usj-name=tomcat8-util-scan       --artifact=output/build/lib/tomcat-util-scan.jar
diff --git a/debian/rules b/debian/rules
index 6c437ba..f4d17c0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,6 @@
 
 JAVA_HOME := /usr/lib/jvm/default-java
 
-BLDLIB    := output/build/lib
 VERSION   := $(shell dpkg-parsechangelog --show-field Version | sed 's/-[^-]*$$//' | sed 's/~/-/')
 DATE      := $(shell dpkg-parsechangelog --show-field Date)
 ANT       := ant -propertyfile debian/ant.properties \
@@ -45,11 +44,6 @@ override_dh_install-indep:
 	perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/$(VERSION)/' debian/poms/*.pom
 	mh_install
 	
-	# Install catalina-storeconfig.jar (no pom available)
-	mv $(BLDLIB)/catalina-storeconfig.jar $(BLDLIB)/tomcat8-catalina-storeconfig-$(VERSION).jar
-	dh_install -plibtomcat8-java $(BLDLIB)/tomcat8-catalina-storeconfig-$(VERSION).jar      usr/share/java
-	dh_link -plibtomcat8-java    usr/share/java/tomcat8-catalina-storeconfig-$(VERSION).jar usr/share/java/tomcat8-catalina-storeconfig.jar
-	
 	# update the checksum for the root webapp
 	unset rwmd5sum \
 		&& rwmd5sum=`cat debian/default_root/index.html debian/default_root/META-INF/context.xml | md5sum - 2>/dev/null | cut -d " " -f1` \

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