This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository tomcat7.
commit 08d322581a15f21efb7a48dac53c6be72772d015 Author: Emmanuel Bourg <[email protected]> Date: Wed May 27 09:44:35 2015 +0200 Moved override_dh_auto_clean under override_dh_install --- debian/rules | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/debian/rules b/debian/rules index 1a4e554..61708de 100755 --- a/debian/rules +++ b/debian/rules @@ -39,15 +39,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/tomcat7.postrm - mh_clean - override_dh_install-indep: dh_install -i --exclude=.bat --exclude=Thumbs.db dh_installman -ptomcat7-user debian/tomcat7-instance-create.1 @@ -132,7 +123,7 @@ override_dh_install-indep: mh_installjar -plibservlet3.0-java -l -s \ debian/javaxpoms/el-api.pom \ output/build/lib/el-api.jar - rm -r debian/poms + rm -rf \ debian/tomcat7/usr/share/tomcat7/webapps/default_root/.svn \ debian/tomcat7/usr/share/tomcat7/webapps/default_root/META-INF/.svn @@ -145,5 +136,14 @@ override_dh_install-indep: && sed "s/\@ROOT_WEBAPP_MD5SUM\@/$$rwmd5sum/" debian/tomcat7.postrm.in > debian/tomcat7.postrm 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/tomcat7.postrm debian/poms + mh_clean + get-orig-source: -uscan --download-version $(VERSION) --force-download --rename -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat7.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
