From fb35692c1ca033193115811a392a74cee79956b1 Mon Sep 17 00:00:00 2001
From: Manuel Rego Casasnovas <mrego@igalia.com>
Date: Mon, 20 Dec 2010 18:16:17 +0100
Subject: [PATCH] Fixed Debian package in order to work with last versions of
 Tomcat.

In Tomcat 6 "/etc/tomcat6/context.xml" doesn't have a new line in the last one and this was causing troubles adding NavalPlan configuration.

FEA: ItEr66S03CommunityMaterialItEr65S04
---
 debian/navalplan.postinst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/navalplan.postinst b/debian/navalplan.postinst
index 02b875fad..9b06a002f 100644
--- a/debian/navalplan.postinst
+++ b/debian/navalplan.postinst
@@ -27,6 +27,7 @@ then
 	#
 	saved_ifs=${IFS}
 	IFS=$'\n'
+	{ cat /etc/tomcat6/context.xml; echo; } |
 	while read -r line ; do
 		if [[ ${line} = *\</Context\>* ]] ; then
 			cat <<-EOF
@@ -41,8 +42,7 @@ then
 			EOF
 		fi
 		echo "${line}"
-	done < /etc/tomcat6/context.xml \
-	     > /etc/tomcat6/context.xml.new
+	done > /etc/tomcat6/context.xml.new
 	IFS=${saved_ifs}
 
 	mv /etc/tomcat6/context.xml.new \