[tomcat8] 11/14: Install the new jar catalina-storeconfig.jar

[Emmanuel Bourg]

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

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

commit c68322a9fafbf209ac4d536d53344704c5052fcb
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Sep 13 16:32:03 2013 +0200

    Install the new jar catalina-storeconfig.jar
---
 debian/changelog |    4 ++--
 debian/rules     |    6 ++++++
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 275b8ec..a30ba91 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,11 +3,11 @@ tomcat8 (8.0.0~RC1-1) UNRELEASED; urgency=low
   * Team upload.
   * New upstream release
     - Updated the version of the Servlet, JSP and EL APIs
-    - Switch to Java 7
+    - Switched to Java 7
     - Updated the watch file to match the Tomcat 8 releases
     - Refreshed the patches
     - Updated debian/copyright
-    - Installed the new jars (spdy, jni, websocket and websocket-api)
+    - Installed the new jars (spdy, jni, websocket, websocket-api, storeconfig)
   * Marked libtomcat8-java as conflicting with libtomcat7-java
   * Use XZ compression for the upstream tarball
   * Replaced Sun Microsystems with Oracle
diff --git a/debian/rules b/debian/rules
index 27175b9..2bf3a52 100755
--- a/debian/rules
+++ b/debian/rules
@@ -136,6 +136,12 @@ binary-indep: build install
 		dh_link -ptomcat8-common     usr/share/java/tomcat8-$$i-$(T_VER).jar usr/share/tomcat8/lib/tomcat-$$i.jar; \
 	done
 	
+	# Install catalina-storeconfig.jar
+	mv $(BLDLIB)/catalina-storeconfig.jar $(BLDLIB)/tomcat8-catalina-storeconfig-$(T_VER).jar
+	dh_install -plibtomcat8-java $(BLDLIB)/tomcat8-catalina-storeconfig-$(T_VER).jar      usr/share/java
+	dh_link -plibtomcat8-java    usr/share/java/tomcat8-catalina-storeconfig-$(T_VER).jar usr/share/java/tomcat8-catalina-storeconfig.jar
+	dh_link -plibtomcat8-java    usr/share/java/tomcat8-catalina-storeconfig-$(T_VER).jar usr/share/tomcat8/lib/catalina-storeconfig.jar
+	
 	# Install catalina-ant.jar
 	mv $(BLDLIB)/catalina-ant.jar $(BLDLIB)/tomcat8-catalina-ant-$(T_VER).jar
 	dh_install -plibtomcat8-java $(BLDLIB)/tomcat8-catalina-ant-$(T_VER).jar      usr/share/java

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