[Git][java-team/tomcat7][jessie] Import Debian changes 7.0.56-3+really7.0.88-2

[Markus Koschany]

Markus Koschany pushed to branch jessie at Debian Java Maintainers / tomcat7


Commits:
a047fce9 by Markus Koschany at 2018-07-01T17:04:56+02:00
Import Debian changes 7.0.56-3+really7.0.88-2

tomcat7 (7.0.56-3+really7.0.88-2) jessie-security; urgency=high

  * Non-maintainer upload by the LTS team.
  * Fix incorrect version number in debian/rules that would cause an OSGi
    exception. (Closes: #902670)

- - - - -


2 changed files:

- debian/changelog
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,17 @@
+tomcat7 (7.0.56-3+really7.0.88-2) jessie-security; urgency=high
+
+  * Non-maintainer upload by the LTS team.
+  * Fix incorrect version number in debian/rules that would cause an OSGi
+    exception. (Closes: #902670)
+
+ -- Markus Koschany <apo at debian.org>  Sun, 01 Jul 2018 16:17:52 +0200
+
 tomcat7 (7.0.56-3+really7.0.88-1) jessie-security; urgency=high
 
   * Team upload.
   * New upstream version 7.0.88.
     - Fix CVE-2017-12616, CVE-2017-7674, CVE-2018-1304, CVE-2018-1305 and
-      CVE-2018-8014.
+      CVE-2018-8014. (Closes: #802312, #898935)
   * Install the missing WebSocket jars in /usr/share/tomcat7/lib/
     (Closes: #787220)
   * Remove debian/keystores and use the latest upstream keystores instead.


=====================================
debian/rules
=====================================
--- a/debian/rules
+++ b/debian/rules
@@ -42,7 +42,7 @@ ANT_ARGS := -Dcompile.debug=true \
 	-Deasymock.jar=/usr/share/java/easymock.jar \
 	-Dcglib.jar=/usr/share/java/cglib3.jar \
 	-Dobjenesis.jar=/usr/share/java/objenesis.jar \
-	-Dversion=$(T_VER) \
+	-Dversion="7.0.88" \
     -Dversion.major="$(T_VER_MAJOR)" \
     -Dversion.minor="$(T_VER_MINOR)" \
     -Dversion.build="$(T_VER_BUILD)" \



View it on GitLab: https://salsa.debian.org/java-team/tomcat7/commit/a047fce91ad072635b44da4bb3c996c794edab2d

-- 
View it on GitLab: https://salsa.debian.org/java-team/tomcat7/commit/a047fce91ad072635b44da4bb3c996c794edab2d
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20180701/f5eb6fa7/attachment.html>