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

[Jakub Adam]

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

    Don't look for build.properties in user home dir

diff --git a/debian/patches/0013-dont-crash-without-user-home.patch b/debian/patches/0013-dont-look-for-build-properties-in-user-home.patch
similarity index 69%
rename from debian/patches/0013-dont-crash-without-user-home.patch
rename to debian/patches/0013-dont-look-for-build-properties-in-user-home.patch
index 7bca2dc..805373f 100644
--- a/debian/patches/0013-dont-crash-without-user-home.patch
+++ b/debian/patches/0013-dont-look-for-build-properties-in-user-home.patch
@@ -1,21 +1,20 @@
 From: Jakub Adam <jakub.adam at ktknet.cz>
 Date: Mon, 9 Jul 2012 20:53:38 +0000
-Subject: 0013-dont-crash-without-user-home
+Subject: 0013-dont-look-for-build-properties-in-user-home
 
 ---
- build.xml |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ build.xml |    1 -
+ 1 file changed, 1 deletion(-)
 
 diff --git a/build.xml b/build.xml
-index 14340db..14d1e71 100644
+index 14340db..ae86842 100644
 --- a/build.xml
 +++ b/build.xml
-@@ -425,7 +425,7 @@
+@@ -425,7 +425,6 @@
      <!-- 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 f5047dc..95942d9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -8,4 +8,4 @@
 0010-debianize-build-xml.patch
 0011-fix-classpath-lintian-warnings.patch
 0012-java7-compat.patch
-0013-dont-crash-without-user-home.patch
+0013-dont-look-for-build-properties-in-user-home.patch

-- 
tomcat7: Servlet and JSP engine