-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Older patch I sent was calculating the distribution in real time. With this patch, distribution is filled at build time. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.14 (GNU/Linux) Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/
iQEcBAEBAgAGBQJSndLMAAoJEHui+4jWFHJLtEcH/3l9Thj5bScdIwlnITALz9lq cb9bKAQ6P4Yx/vz3XQNX1YM27IJs1z376jYzadyCMRWFdrioV05n1Bp2ucv0shC+ G78NuQ0N9aAk440u0eWH712iwpnMaLHDkjWmBfJTsmliXGf5bhPbI/CSy5aee/eT a+dtr6bnf/oIyZEQz/xiCKBBFhkoHeStX8x77PDg4erOa77AodEJ3WNyCjCR4gKk LhCP8iA+rtDMPdXdOGhi2tdlaAYo+SOaD3tS8QhhczgtxKtoqXjg90dIfYR72Y9n xHaNO0YZWjrePpSKAcKR+k7nE/iLt1q1tgrK2HUsOsQ7+xLSIn+CAjaK1vrHc2U= =3a/Y -----END PGP SIGNATURE-----
diff -Nru tomcat7-7.0.42/debian/control tomcat7-7.0.42/debian/control
--- tomcat7-7.0.42/debian/control 2013-12-03 12:38:51.000000000 +0000
+++ tomcat7-7.0.42/debian/control 2013-12-03 12:31:52.000000000 +0000
@@ -7,7 +7,7 @@
tony mancill <tmanc...@debian.org>,
Jakub Adam <jakub.a...@ktknet.cz>
Build-Depends: default-jdk, ant-optional, debhelper (>= 9), po-debconf, libhamcrest-java (>= 1.3)
-Build-Depends-Indep: maven-repo-helper, libecj-java, javahelper,
+Build-Depends-Indep: maven-repo-helper, libecj-java, javahelper, lsb-release,
junit4, libjstl1.1-java, libjakarta-taglibs-standard-java
Standards-Version: 3.9.4
Vcs-Git: git://anonscm.debian.org/pkg-java/tomcat7.git
@@ -16,7 +16,7 @@
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 -Nru tomcat7-7.0.42/debian/patches/fix-distribution.patch tomcat7-7.0.42/debian/patches/fix-distribution.patch
--- tomcat7-7.0.42/debian/patches/fix-distribution.patch 1970-01-01 00:00:00.000000000 +0000
+++ tomcat7-7.0.42/debian/patches/fix-distribution.patch 2013-12-03 12:31:52.000000000 +0000
@@ -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 -Nru tomcat7-7.0.42/debian/patches/series tomcat7-7.0.42/debian/patches/series
--- tomcat7-7.0.42/debian/patches/series 2013-12-03 12:38:51.000000000 +0000
+++ tomcat7-7.0.42/debian/patches/series 2013-12-03 12:31:52.000000000 +0000
@@ -11,3 +11,4 @@
0014-JDTCompiler.patch
0015_disable_test_TestCometProcessor.patch
0017-use-jdbc-pool-default.patch
+fix-distribution.patch
diff -Nru tomcat7-7.0.42/debian/rules tomcat7-7.0.42/debian/rules
--- tomcat7-7.0.42/debian/rules 2013-12-03 12:38:51.000000000 +0000
+++ tomcat7-7.0.42/debian/rules 2013-12-03 12:31:52.000000000 +0000
@@ -29,6 +29,9 @@
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 @@
-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)))
tomcat7_add_distribution.patch.sig
Description: PGP signature
