[SCM] tomcat7: Servlet and JSP engine branch, master, updated. debian/7.0.26-3-1-g7ac1753

[tony mancill]

The following commit has been merged in the master branch:
commit 7ac17531d71b6f7989b481d3132359c7364f3a6d
Author: tony mancill <tmancill at debian.org>
Date:   Mon May 28 18:46:16 2012 -0700

    md5sums for root webapp now calculated during the build; update copyright year in javadoc

diff --git a/debian/changelog b/debian/changelog
index 2861b9a..c5324b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tomcat7 (7.0.26-4) UNRELEASED; urgency=low
+
+  * Address regression leaving ROOT webapp files after purge.  
+    (Closes: #670440)
+  * Update copyright year in javadoc to 2012.
+
+ -- tony mancill <tmancill at debian.org>  Mon, 28 May 2012 18:45:07 -0700
+
 tomcat7 (7.0.26-3) unstable; urgency=low
 
   * Team upload.
diff --git a/debian/rules b/debian/rules
index 321bdf3..a85de30 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,6 +25,10 @@ T_VER_MAJOR := $(shell echo $(T_VER) | cut -d'.' -f1)
 T_VER_MINOR := $(shell echo $(T_VER) | cut -d'.' -f2)
 T_VER_BUILD := $(shell echo $(T_VER) | cut -d'.' -f3)
 
+# root webapp file locations (during the build)
+RWLOC := debian/default_root
+RWFILES := $(RWLOC)/index.html $(RWLOC)/META-INF/context.xml
+
 ANT_ARGS := -Dcompile.debug=true \
 	-Dant.build.javac.source=1.5 \
 	-Dant.build.javac.target=1.5 \
@@ -54,7 +58,7 @@ build-stamp:
 	javadoc -subpackages "javax.servlet" -d "output/api" \
 		-sourcepath "java" -author -version -breakiterator \
 		-windowtitle "Tomcat API Documentation" -doctitle "Tomcat API" \
-		-bottom "Copyright © 2000-2011 Apache Software Foundation. All Rights Reserved."
+		-bottom "Copyright © 2000-2012 Apache Software Foundation. All Rights Reserved."
 	touch build-stamp
 
 clean:
@@ -148,6 +152,10 @@ binary-indep: build install
 	chmod a+x debian/tomcat7-common/usr/share/tomcat7/bin/*.sh
 	chmod a+x debian/tomcat7-user/usr/bin/tomcat7-instance-create
 	chmod a+x debian/tomcat7-user/usr/share/tomcat7/skel/bin/*.sh
+	# 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
 	jh_manifest
 	dh_compress
 	dh_fixperms
diff --git a/debian/tomcat7.postrm b/debian/tomcat7.postrm
index b69cca1..1d451c3 100644
--- a/debian/tomcat7.postrm
+++ b/debian/tomcat7.postrm
@@ -14,7 +14,7 @@ case "$1" in
         RWLOC="/var/lib/tomcat7/webapps/ROOT"
         RWFILES="$RWLOC/index.html $RWLOC/META-INF/context.xml"
         if [ "`(cat $RWFILES | md5sum -) 2>/dev/null | cut -d ' ' -f 1`" \
-                            = "5fd8a7021414f40e1b7ed98a6bd4478b" ] ; then
+                            = "@ROOT_WEBAPP_MD5SUM@" ] ; then
             rm $RWFILES
             rmdir --ignore-fail-on-non-empty \
                 /var/lib/tomcat7/webapps/ROOT/META-INF \

-- 
tomcat7: Servlet and JSP engine