[SCM] tomcat7: Servlet and JSP engine branch, master, updated. debian/7.0.28-1-4-g9554a02

[tony mancill]

The following commit has been merged in the master branch:
commit 9554a026e44dca565621886ec9e58705b22a427b
Author: tony mancill <tmancill at debian.org>
Date:   Tue Jul 10 17:32:46 2012 -0700

    fix build re: postrm - #681160

diff --git a/debian/changelog b/debian/changelog
index d2d653a..a421f1a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
 tomcat7 (7.0.28-2) UNRELEASED; urgency=low
 
+  [ Jakub Adam ]
   * Ensure webapps/examples/WEB-INF/lib exists before files are
     copied there.
   * Fix FTBFS when user home dir doesn't exist (Closes: #680844).
 
- -- Jakub Adam <jakub.adam at ktknet.cz>  Tue, 10 Jul 2012 20:37:49 +0200
+  [ tony mancill ]
+  * Fix build to generate postrm from postrm.in (Closes: #681160)
+
+ -- tony mancill <tmancill at debian.org>  Tue, 10 Jul 2012 17:29:30 -0700
 
 tomcat7 (7.0.28-1) unstable; urgency=low
 
diff --git a/debian/rules b/debian/rules
index 85f42b0..72689b9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -76,6 +76,7 @@ clean:
 	rm -rf "output/"
 	rm -rf webapps/examples/WEB-INF/lib/*.jar
 	rm -f build-stamp modules/jdbc-pool/output/resources/MANIFEST.MF
+	rm -f debian/tomcat7.postrm
 	dh_clean
 	mh_clean
 
@@ -164,7 +165,7 @@ binary-indep: build install
 	# update the checksum for the root webapp
 	unset rwmd5sum \
 		&& rwmd5sum=`cat $(RWFILES) | md5sum - 2>/dev/null | cut -d " " -f1` \
-		&& sed -i "s/\@ROOT_WEBAPP_MD5SUM\@/$$rwmd5sum/" debian/tomcat7.postrm
+		&& sed "s/\@ROOT_WEBAPP_MD5SUM\@/$$rwmd5sum/" debian/tomcat7.postrm.in > debian/tomcat7.postrm
 	jh_manifest
 	dh_compress
 	dh_fixperms
diff --git a/debian/tomcat7.postrm b/debian/tomcat7.postrm.in
similarity index 100%
rename from debian/tomcat7.postrm
rename to debian/tomcat7.postrm.in

-- 
tomcat7: Servlet and JSP engine