Your message dated Tue, 24 Dec 2013 23:34:47 +0000
with message-id <e1vvbut-0002kg...@franck.debian.org>
and subject line Bug#729840: fixed in tomcat7 7.0.47-1
has caused the Debian Bug report #729840,
regarding tomcat7: Show distribution on Tomcat version
to be marked as done.

This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.

(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact ow...@bugs.debian.org
immediately.)


-- 
729840: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=729840
Debian Bug Tracking System
Contact ow...@bugs.debian.org with problems
--- Begin Message ---
Package: tomcat7
Severity: wishlist
Tags: patch

Dear Maintainer,
>From Ubuntu we are updating some packages to show OS distribution 
when showing version of some packages.
Related spec: 
https://blueprints.launchpad.net/ubuntu/+spec/servercloud-s-server-app-banner-updates


-- System Information:
Debian Release: wheezy/sid
  APT prefers trusty-updates
  APT policy: (500, 'trusty-updates'), (500, 'trusty-security'), (500, 
'trusty'), (100, 'trusty-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.8.0-27-generic (SMP w/4 CPU cores)
Locale: LANG=es_ES.UTF-8, LC_CTYPE=es_ES.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
diff -Nru tomcat7-7.0.42/debian/changelog tomcat7-7.0.42/debian/changelog
--- tomcat7-7.0.42/debian/changelog	2013-11-18 08:26:09.000000000 +0000
+++ tomcat7-7.0.42/debian/changelog	2013-11-18 08:30:23.000000000 +0000
@@ -1,3 +1,10 @@
+tomcat7 (7.0.42-2) unstable; urgency=low
+
+  * debian/patches/fix-distribution.patch: show distribution instead of OS name
+  * debian/control: add lsb-release as dependency
+
+ -- Yolanda Robla <yolanda.ro...@canonical.com>  Mon, 18 Nov 2013 08:29:07 +0000
+
 tomcat7 (7.0.42-1) unstable; urgency=low
 
   [ Gianfranco Costamagna ]
diff -Nru tomcat7-7.0.42/debian/control tomcat7-7.0.42/debian/control
--- tomcat7-7.0.42/debian/control	2013-11-18 08:26:09.000000000 +0000
+++ tomcat7-7.0.42/debian/control	2013-11-18 08:30:51.000000000 +0000
@@ -16,7 +16,7 @@
 
 Package: tomcat7-common
 Architecture: all
-Depends: libtomcat7-java (>= ${source:Version}), ${misc:Depends},
+Depends: libtomcat7-java (>= ${source:Version}), ${misc:Depends}, lsb-release,
  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-11-18 08:35:31.000000000 +0000
@@ -0,0 +1,45 @@
+Description:
+ Show distribution name instead of operating system name
+ when showing Tomcat version
+Author: Yolanda Robla <yolanda.ro...@canonical.com>
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+
+Index: tomcat7_new/java/org/apache/catalina/util/ServerInfo.java
+===================================================================
+--- tomcat7_new.orig/java/org/apache/catalina/util/ServerInfo.java      2013-11-11 20:25:23.063895000 +0000
++++ tomcat7_new/java/org/apache/catalina/util/ServerInfo.java   2013-11-11 20:25:23.063895000 +0000
+@@ -21,6 +21,8 @@
+ 
+ import java.io.InputStream;
+ import java.util.Properties;
++import java.util.Scanner;
++import java.io.IOException;
+ 
+ import org.apache.tomcat.util.ExceptionUtils;
+ 
+@@ -112,8 +114,22 @@
+         System.out.println("Server version: " + getServerInfo());
+         System.out.println("Server built:   " + getServerBuilt());
+         System.out.println("Server number:  " + getServerNumber());
+-        System.out.println("OS Name:        " +
+-                           System.getProperty("os.name"));
++
++       String distribution = null;
++       try {
++               Process process = Runtime.getRuntime().exec("lsb_release -si");
++               InputStream is = process.getInputStream();
++               distribution = new Scanner(is, "UTF-8").useDelimiter("\\A").next();
++
++               if (distribution==null)
++               {
++                       distribution = System.getProperty("os.name")+"nodistrib";
++               }
++       } catch(IOException e) {
++               distribution = System.getProperty("os.name")+e.toString();
++       }
++
++        System.out.println("OS Name:        " + distribution);
+         System.out.println("OS Version:     " +
+                            System.getProperty("os.version"));
+         System.out.println("Architecture:   " +
diff -Nru tomcat7-7.0.42/debian/patches/series tomcat7-7.0.42/debian/patches/series
--- tomcat7-7.0.42/debian/patches/series	2013-11-18 08:26:09.000000000 +0000
+++ tomcat7-7.0.42/debian/patches/series	2013-11-18 08:30:34.000000000 +0000
@@ -11,3 +11,4 @@
 0014-JDTCompiler.patch
 0015_disable_test_TestCometProcessor.patch
 0017-use-jdbc-pool-default.patch
+fix-distribution.patch

--- End Message ---
--- Begin Message ---
Source: tomcat7
Source-Version: 7.0.47-1

We believe that the bug you reported is fixed in the latest version of
tomcat7, which is due to be installed in the Debian FTP archive.

A summary of the changes between this version and the previous one is
attached.

Thank you for reporting the bug, which will now be closed.  If you
have further comments please address them to 729...@bugs.debian.org,
and the maintainer will reopen the bug report if appropriate.

Debian distribution maintenance software
pp.
tony mancill <tmanc...@debian.org> (supplier of updated tomcat7 package)

(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing ftpmas...@ftp-master.debian.org)


-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA512

Format: 1.8
Date: Tue, 24 Dec 2013 16:46:34 +0000
Source: tomcat7
Binary: tomcat7-common tomcat7 tomcat7-user libtomcat7-java libservlet3.0-java 
libservlet3.0-java-doc tomcat7-admin tomcat7-examples tomcat7-docs
Architecture: source all
Version: 7.0.47-1
Distribution: unstable
Urgency: low
Maintainer: Debian Java Maintainers 
<pkg-java-maintainers@lists.alioth.debian.org>
Changed-By: tony mancill <tmanc...@debian.org>
Description: 
 libservlet3.0-java - Servlet 3.0 and JSP 2.2 Java API classes
 libservlet3.0-java-doc - Servlet 3.0 and JSP 2.2 Java API documentation
 libtomcat7-java - Servlet and JSP engine -- core libraries
 tomcat7    - Servlet and JSP engine
 tomcat7-admin - Servlet and JSP engine -- admin web applications
 tomcat7-common - Servlet and JSP engine -- common files
 tomcat7-docs - Servlet and JSP engine -- documentation
 tomcat7-examples - Servlet and JSP engine -- example web applications
 tomcat7-user - Servlet and JSP engine -- tools to create user instances
Closes: 729840
Changes: 
 tomcat7 (7.0.47-1) unstable; urgency=low
 .
   [ Gianfranco Costamagna ]
   * Team upload.
   * New upstream release, patch refresh.
   * Renamed patch fix-manager-webapp.path
     to fix-manager-webapp.patch (extension typo).
   * Refresh patches for upstream release.
   * Removed -Djava.net.preferIPv4Stack=true
     from init script (lp: #1088681),
     thanks Hendrik Haddorp.
   * Added webapp manager path patch (lp: #1128067)
     thanks TJ.
 .
   [ tony mancill ]
   * Bump Standards-Version to 3.9.5.
   * Change copyright year in javadocs to 2013.
   * Add patch to include the distribution name in error pages.
     (Closes: #729840)
Checksums-Sha1: 
 123f0eeb3157032ff35a609ae0982b6d67c8474d 2633 tomcat7_7.0.47-1.dsc
 e5f7b087c485f8f09f9632dc99b42252493ef13b 4301547 tomcat7_7.0.47.orig.tar.gz
 565d5652d85019f234efacec1f2ffdd509131309 49242 tomcat7_7.0.47-1.debian.tar.gz
 b4cec22ba416529131cc2614692e1bff7a375460 60094 tomcat7-common_7.0.47-1_all.deb
 133c817ee5b69dce767f129f9820e666bed1f3a8 47586 tomcat7_7.0.47-1_all.deb
 2f43d572fe9e830568b1c6c6228f2505bf534ca3 36196 tomcat7-user_7.0.47-1_all.deb
 a33c175514ea1c5f4aa8002b797b20ebefe80cfd 3638258 
libtomcat7-java_7.0.47-1_all.deb
 1bbd919b5fe91cd82df5501338f6023d58b66834 302560 
libservlet3.0-java_7.0.47-1_all.deb
 ef5860cf897b160c598500e4137cbc27b2fe22a2 203104 
libservlet3.0-java-doc_7.0.47-1_all.deb
 0f32c69ad3ff2020ec405f36988df55117d99cfb 37486 tomcat7-admin_7.0.47-1_all.deb
 bb498a53d08a211e27529a591a646ae25df50a48 190196 
tomcat7-examples_7.0.47-1_all.deb
 01edc06fd4a64af268d94f86d8b39e56373f96ce 581080 tomcat7-docs_7.0.47-1_all.deb
Checksums-Sha256: 
 7dc9bd1abb3378f9bd20f2adb5be4174e8244621345b0b9c261aaaaf07e4cd5a 2633 
tomcat7_7.0.47-1.dsc
 33592663226680c0412a071f8ba32d5c8fe4ae805fec3573177f9edd70b0be3f 4301547 
tomcat7_7.0.47.orig.tar.gz
 65fd426cedc86c350fc217493bec475e8a65fa6675064b926cda74f3246ef0fa 49242 
tomcat7_7.0.47-1.debian.tar.gz
 93cd994a1771ae164dba324f123d0f3ad967a51e57704bfb440ad60675cbb866 60094 
tomcat7-common_7.0.47-1_all.deb
 fd48a3bd92f05ba3d9d03fdbf8eac9479f305b23ae1bffc258dc514116a1baa8 47586 
tomcat7_7.0.47-1_all.deb
 81f6c584bb0588c96ab7ccd243c4a5a2423bf6f67e08180ef3a71d9e90f792fd 36196 
tomcat7-user_7.0.47-1_all.deb
 795d93401a7b1b92f99649407b3899d39b292dd90f73014cab22ffc250752115 3638258 
libtomcat7-java_7.0.47-1_all.deb
 706cac468d534ef5d7077a38030e419caccf4eb6d8a948450d9ec8af9a282f54 302560 
libservlet3.0-java_7.0.47-1_all.deb
 2ebe08a303aa98b4537d7d24103adad264820bf6390f14efc99f5000a959eb87 203104 
libservlet3.0-java-doc_7.0.47-1_all.deb
 2560dba2eee3d81d5fb9894fc8b994b30891c328d16704623e0ff6d4823d46d2 37486 
tomcat7-admin_7.0.47-1_all.deb
 d0e21c3a61d82dc54ba9e94ffa1aa6eaee2b66211673f7df4fca2f7d694673ec 190196 
tomcat7-examples_7.0.47-1_all.deb
 aa2e7a0b42b945721868827e7f04b56a7827e501f53e5fbdc16f9cad61259127 581080 
tomcat7-docs_7.0.47-1_all.deb
Files: 
 ff7af0900bd88f1e45b197853cf87671 2633 java optional tomcat7_7.0.47-1.dsc
 9ad518a36ae20f54a71565369bffd43c 4301547 java optional 
tomcat7_7.0.47.orig.tar.gz
 7bc90797598161787c784288ed9eddff 49242 java optional 
tomcat7_7.0.47-1.debian.tar.gz
 aa4ed8feb058703e912be88bddc09bbb 60094 java optional 
tomcat7-common_7.0.47-1_all.deb
 25374b3e9095d0d17be0430c03338ca9 47586 java optional tomcat7_7.0.47-1_all.deb
 e4012d4b6982eb5a12ca5f6656406319 36196 java optional 
tomcat7-user_7.0.47-1_all.deb
 bd5b8fd6d1dd0061285a2d48e7a406d6 3638258 java optional 
libtomcat7-java_7.0.47-1_all.deb
 d561a6e4920721ad9909d0ecd5d3f5c7 302560 java optional 
libservlet3.0-java_7.0.47-1_all.deb
 614aed9b2cae9b2d98cc9e4f2b14bc56 203104 doc optional 
libservlet3.0-java-doc_7.0.47-1_all.deb
 e6e6f3898d54626d8140866a24df0ffb 37486 java optional 
tomcat7-admin_7.0.47-1_all.deb
 daa7106b0853cdfc7a287c64b27a6d70 190196 java optional 
tomcat7-examples_7.0.47-1_all.deb
 d594349813d0566816c8b027cd1034c0 581080 doc optional 
tomcat7-docs_7.0.47-1_all.deb

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.15 (GNU/Linux)

iQIcBAEBCgAGBQJSuhhoAAoJECHSBYmXSz6WwGQP/2w35secNU9mhfs/Kl2XNF3f
bBvP9FFRrdDKh7JO3sjnhNP4E5c46T5F4SK0yFTNlbWLT6eC6hd4ZjaDGmR/RVjc
lziWr2G5B6e0qbWCFCyIpiMuam8OjB3WSH9qpiYKvVaEnHGVNBkd55/JxckjQ7e8
yjGqw/UFlCElBOlOzmt/8lJgdF75aaPbj0I4dIbCDq4Tnz+eMjZ0uSrBrAdJWSb1
tinhFmOvO0Fs5L4XjCvG/jP2vKvQwGQNfzlMxFhqCX0H/+MfJDmM99//ccDPOfK3
8puAu5/oamsqi4ClxdQgy1ua9KmEmXYJjm15nBHpKBTvfU/Wuwg71O5M9CkCXJM+
qrU8V+Rz6y9kYfZ1uyYZRektLRpcdi7jHEYftkTo+jvY8kfFT6AKY0sdHfNwivl4
X3v/9lC5rhBDSFwnZbQmG8rxPWHYRFJz8RgTRMgsQz5kuxtQZPDH1J8GxVsVdyKb
U1D2ZSZQgMlUiQbSBJFsE3sm8o85soxL/PT/Ju1PmG80T3w4lfGNuM0c1pd5e6Cc
V3egK4aWphtAXTSTE2zeloJjCttNfPk7pN80CvvqJlJzWxlFetTCg4oEvKDsYWHu
H6ZT42yo3ekdXDVVIFNP22R1ds8qHQjaayFr0BNnEuGeg+Ctwv+SfoAIjwtTvNQb
SG509sk0lqROOkzIPt75
=xB1A
-----END PGP SIGNATURE-----

--- End Message ---
__
This is the maintainer address of Debian's Java team
<http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. 
Please use
debian-j...@lists.debian.org for discussions and questions.

Reply via email to