[tomcat8] 13/16: Simplified the call to mh_install

[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 c614400a33362ee0d5416e9a0cb34cc6a847e9a6
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu May 7 13:03:12 2015 +0200

    Simplified the call to mh_install
---
 debian/changelog | 1 +
 debian/rules     | 5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index eee1680..3f57174 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -13,6 +13,7 @@ tomcat8 (8.0.22-2) UNRELEASED; urgency=medium
     - Let dh_fixperms set the permissions instead of calling chmod +x
     - Use debian/tomcat8-user.manpages instead of calling dh_installman
     - Updated the copyright year in the Javadoc
+    - Simplified the call to mh_install
 
  -- Emmanuel Bourg <ebourg at apache.org>  Thu, 07 May 2015 08:34:56 +0200
 
diff --git a/debian/rules b/debian/rules
index 6788904..27960b9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,12 +36,11 @@ endif
 override_dh_install-indep:
 	dh_install -i --exclude=.bat --exclude=Thumbs.db
 	
+	# Prepare and install the Maven artifacts
 	mkdir -p debian/poms
 	cp res/maven/*.pom debian/poms
 	perl -p -i -e 's/\@MAVEN.DEPLOY.VERSION\@/$(VERSION)/' debian/poms/*.pom
-	
-	mh_install -plibservlet3.1-java
-	mh_install -plibtomcat8-java
+	mh_install
 	
 	# Install catalina-storeconfig.jar (no pom available)
 	mv $(BLDLIB)/catalina-storeconfig.jar $(BLDLIB)/tomcat8-catalina-storeconfig-$(VERSION).jar

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