[tomcat8] 07/16: Moved override_dh_auto_clean under override_dh_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 57a75d76388e25a00b612e741abc453fc58a53cc
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu May 7 11:57:23 2015 +0200

    Moved override_dh_auto_clean under override_dh_install
---
 debian/rules | 19 +++++++++----------
 1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/debian/rules b/debian/rules
index 95a101a..d2b25f4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,15 +37,6 @@ ifeq (,$(findstring nocheck, $(DEB_BUILD_OPTIONS)))
 	$(ANT_INVOKE) test
 endif
 
-override_dh_auto_clean:
-	dh_auto_clean
-	-$(ANT_INVOKE) clean
-	rm -rf "output/"
-	rm -rf webapps/examples/WEB-INF/lib/*.jar
-	rm -f modules/jdbc-pool/output/resources/MANIFEST.MF
-	rm -f debian/tomcat8.postrm
-	mh_clean
-
 override_dh_install-indep:
 	dh_install -i --exclude=.bat --exclude=Thumbs.db
 	dh_installman -ptomcat8-user debian/tomcat8-instance-create.1
@@ -62,7 +53,6 @@ override_dh_install-indep:
 	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
 	
-	rm -r debian/poms
 	rm -rf \
            debian/tomcat8/usr/share/tomcat8/webapps/default_root/.svn \
 	   debian/tomcat8/usr/share/tomcat8/webapps/default_root/META-INF/.svn
@@ -77,5 +67,14 @@ override_dh_install-indep:
 	
 	jh_manifest
 
+override_dh_auto_clean:
+	dh_auto_clean
+	-$(ANT_INVOKE) clean
+	rm -rf "output/"
+	rm -rf webapps/examples/WEB-INF/lib/*.jar
+	rm -f modules/jdbc-pool/output/resources/MANIFEST.MF
+	rm -rf debian/tomcat8.postrm debian/poms
+	mh_clean
+
 get-orig-source:
 	-uscan --force-download --rename

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