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

[Jakub Adam]

The following commit has been merged in the master branch:
commit c7364868733edaaad526f97c1e440f7d2f854127
Author: Jakub Adam <jakub.adam at ktknet.cz>
Date:   Tue Jul 10 20:12:44 2012 +0200

    Fix FTBFS when user home dir doesn't exist

diff --git a/debian/changelog b/debian/changelog
index e9ad547..d2d653a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ tomcat7 (7.0.28-2) UNRELEASED; urgency=low
 
   * 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
 
diff --git a/debian/patches/0013-dont-crash-without-user-home.patch b/debian/patches/0013-dont-crash-without-user-home.patch
new file mode 100644
index 0000000..7bca2dc
--- /dev/null
+++ b/debian/patches/0013-dont-crash-without-user-home.patch
@@ -0,0 +1,21 @@
+From: Jakub Adam <jakub.adam at ktknet.cz>
+Date: Mon, 9 Jul 2012 20:53:38 +0000
+Subject: 0013-dont-crash-without-user-home
+
+---
+ build.xml |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/build.xml b/build.xml
+index 14340db..14d1e71 100644
+--- a/build.xml
++++ b/build.xml
+@@ -425,7 +425,7 @@
+     <!-- Property that determines if manifests need updating -->
+     <uptodate property="manifests.uptodate"
+         targetfile="${tomcat.manifests}/default.manifest" >
+-      <srcfiles file="${user.home}/build.properties" />
++      <srcfiles file="${user.home}/build.properties" erroronmissingdir="false" />
+       <srcfiles file="${basedir}/build.properties" />
+       <srcfiles file="${basedir}/build.properties.default" />
+       <srcfiles file="${basedir}/build.xml" />
diff --git a/debian/patches/series b/debian/patches/series
index ea51de7..f5047dc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,3 +8,4 @@
 0010-debianize-build-xml.patch
 0011-fix-classpath-lintian-warnings.patch
 0012-java7-compat.patch
+0013-dont-crash-without-user-home.patch

-- 
tomcat7: Servlet and JSP engine