[Pkg-freeipa-devel] dogtag-pki: Changes to 'master'

[Timo Aaltonen]

 debian/changelog |    1 +
 debian/rules     |   24 ++++++++++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)

New commits:
commit 240d0c2bc3ab596b2ae6beb97200a05fb14d7139
Author: Timo Aaltonen <tjaalton at debian.org>
Date:   Sat Sep 5 06:24:17 2015 +0300

    rules: Symlink jars under subsystem WEB-INF.

diff --git a/debian/changelog b/debian/changelog
index ececad6..650665e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,6 +22,7 @@ dogtag-pki (10.2.6-1) UNRELEASED; urgency=medium
   * use-tomcat8.diff: Patch initscript includes to use tomcat 8.
   * *.links: Link to tomcat8 policy.d.
   * debian-support.diff: Don't try to manage rc3.d/* symlinks.
+  * rules: Symlink jars under subsystem WEB-INF.
 
  -- Timo Aaltonen <tjaalton at debian.org>  Thu, 02 Apr 2015 15:45:06 +0300
 
diff --git a/debian/rules b/debian/rules
index 6deef5a..4b0caee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -98,12 +98,24 @@ override_dh_auto_install:
 	find $(CURDIR)/debian/tmp/usr/share/pki -name '*.pl' -exec chmod 755 '{}' ';'
 	find $(CURDIR)/debian/tmp/lib/systemd -exec chmod 644 '{}' ';'
 
-	# Create symlinks for TPS web application
-	mkdir -p $(CURDIR)/debian/tmp/usr/share/pki/tps/webapps/tps/WEB-INF/lib
-	for i in pki-nsutil.jar pki-cmsutil.jar pki-certsrv.jar pki-cms.jar pki-cmscore.jar \
-		pki-cmsbundle.jar pki-tps.jar; do \
-		ln -s /usr/share/pki/$$i $(CURDIR)/debian/tmp/usr/share/pki/tps/webapps/tps/WEB-INF/lib/$$i \
-	; done
+	# Create symlinks for subsystem libraries
+	for subsys in ca kra ocsp tks tps; do \
+		mkdir -p $(CURDIR)/debian/tmp/usr/share/pki/$$subsys/webapps/$$subsys/WEB-INF/lib ;\
+		ln -s /usr/share/java/pki/pki-nsutil.jar \
+			$(CURDIR)/debian/tmp/usr/share/pki/$$subsys/webapps/$$subsys/WEB-INF/lib ;\
+		ln -s /usr/share/java/pki/pki-cmsutil.jar \
+			$(CURDIR)/debian/tmp/usr/share/pki/$$subsys/webapps/$$subsys/WEB-INF/lib ;\
+		ln -s /usr/share/java/pki/pki-certsrv.jar \
+			$(CURDIR)/debian/tmp/usr/share/pki/$$subsys/webapps/$$subsys/WEB-INF/lib ;\
+		ln -s /usr/share/java/pki/pki-cms.jar \
+			$(CURDIR)/debian/tmp/usr/share/pki/$$subsys/webapps/$$subsys/WEB-INF/lib ;\
+		ln -s /usr/share/java/pki/pki-cmscore.jar \
+			$(CURDIR)/debian/tmp/usr/share/pki/$$subsys/webapps/$$subsys/WEB-INF/lib ;\
+		ln -s /usr/share/java/pki/pki-cmsbundle.jar \
+			$(CURDIR)/debian/tmp/usr/share/pki/$$subsys/webapps/$$subsys/WEB-INF/lib ;\
+		ln -s /usr/share/java/pki/pki-$$subsys.jar \
+			$(CURDIR)/debian/tmp/usr/share/pki/$$subsys/webapps/$$subsys/WEB-INF/lib ;\
+	done
 
 override_dh_installinit:
 	dh_installinit -ppki-server --name=pki-tomcatd --error-handler=invoke_failure