[tomcat7] 06/07: apply patch to add distro name to error pages

[Tony Mancill]

This is an automated email from the git hooks/post-receive script.

tmancill pushed a commit to branch master
in repository tomcat7.

commit 1661b9c5452dcaee7af4da5418e8526a738fb430
Author: tony mancill <tmancill at debian.org>
Date:   Tue Dec 24 16:46:24 2013 +0000

    apply patch to add distro name to error pages
---
 debian/control                                     |  5 +++--
 .../0019-add-distribution-to-error-page.patch      | 23 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 debian/rules                                       |  4 ++++
 4 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/debian/control b/debian/control
index 2ec58f1..38f4cea 100644
--- a/debian/control
+++ b/debian/control
@@ -16,7 +16,8 @@ Build-Depends-Indep: maven-repo-helper,
  javahelper,
  junit4,
  libjstl1.1-java,
- libjakarta-taglibs-standard-java
+ libjakarta-taglibs-standard-java,
+ lsb-release
 Standards-Version: 3.9.5
 Vcs-Git: git://anonscm.debian.org/pkg-java/tomcat7.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-java/tomcat7.git
@@ -24,7 +25,7 @@ Homepage: http://tomcat.apache.org
 
 Package: tomcat7-common
 Architecture: all
-Depends: libtomcat7-java (>= ${source:Version}), ${misc:Depends},
+Depends: libtomcat7-java (>= ${source:Version}), ${misc:Depends}, 
  default-jre-headless | java6-runtime-headless | java6-runtime | java-6-runtime
 Description: Servlet and JSP engine -- common files
  Apache Tomcat implements the Java Servlet and the JavaServer Pages (JSP)
diff --git a/debian/patches/0019-add-distribution-to-error-page.patch b/debian/patches/0019-add-distribution-to-error-page.patch
new file mode 100644
index 0000000..685a145
--- /dev/null
+++ b/debian/patches/0019-add-distribution-to-error-page.patch
@@ -0,0 +1,23 @@
+--- a/java/org/apache/catalina/util/ServerInfo.properties	2013-11-18 09:42:08.877938000 +0000
++++ b/java/org/apache/catalina/util/ServerInfo.properties	2013-11-18 16:28:22.546386103 +0000
+@@ -13,6 +13,6 @@
+ # See the License for the specific language governing permissions and
+ # limitations under the License.
+ 
+-server.info=Apache Tomcat/@VERSION@
++server.info=Apache Tomcat/@VERSION@ (@TOMCAT7_DISTRIBUTION@)
+ server.number=@VERSION_NUMBER@
+-server.built=@VERSION_BUILT@
+\ No newline at end of file
++server.built=@VERSION_BUILT@
+
+--- a/build.xml	2013-11-18 16:24:56.000000000 +0000
++++ b/build.xml	2013-11-18 16:38:33.094386103 +0000
+@@ -198,6 +198,7 @@
+     <filter token="YEAR" value="${year}"/>
+     <filter token="VERSION" value="${version}"/>
+     <filter token="VERSION_NUMBER" value="${version.number}"/>
++    <filter token="TOMCAT7_DISTRIBUTION" value="${distribution.name}"/>
+     <filter token="VERSION_MAJOR" value="${version.major}"/>
+     <filter token="VERSION_MAJOR_MINOR" value="${version.major.minor}"/>
+     <filter token="VERSION_BUILT" value="${today} ${tstamp}"/>
diff --git a/debian/patches/series b/debian/patches/series
index 10772b4..ea1e9e8 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -12,3 +12,4 @@
 0015_disable_test_TestCometProcessor.patch
 0017-use-jdbc-pool-default.patch
 0018-fix-manager-webapp.patch
+0019-add-distribution-to-error-page.patch
diff --git a/debian/rules b/debian/rules
index 91a071b..a949c01 100755
--- a/debian/rules
+++ b/debian/rules
@@ -29,6 +29,9 @@ T_VER_BUILD := $(shell echo $(T_VER) | cut -d'.' -f3)
 RWLOC := debian/default_root
 RWFILES := $(RWLOC)/index.html $(RWLOC)/META-INF/context.xml
 
+# Add distribution.name as system property to grab it when showing version
+TOMCAT7_DISTRIBUTION := "$(shell lsb_release -si)"
+
 ANT_ARGS := -Dcompile.debug=true \
 	-Dant.build.javac.source=1.6 \
 	-Dant.build.javac.target=1.6 \
@@ -40,6 +43,7 @@ ANT_ARGS := -Dcompile.debug=true \
     -Dversion.minor="$(T_VER_MINOR)" \
     -Dversion.build="$(T_VER_BUILD)" \
     -Dversion.patch="0" \
+    -Ddistribution.name=$(TOMCAT7_DISTRIBUTION) \
     -Dversion.suffix="" 
 
 ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/tomcat7.git