Timo Aaltonen pushed to branch master at Debian Java Maintainers / tomcat9
Commits: ede816f3 by Timo Aaltonen at 2020-08-06T18:59:08+03:00 control: Bump build-dep on bnd, drop bnd compat and re-export patches. (Closes: #964433) - - - - - c2eabfae by Timo Aaltonen at 2020-08-06T18:59:28+03:00 releasing package tomcat9 version 9.0.37-3 - - - - - 5 changed files: - debian/changelog - debian/control - − debian/patches/0028-bnd-compatibility.patch - − debian/patches/0029-fix-regression-in-bz64540.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,10 @@ +tomcat9 (9.0.37-3) unstable; urgency=medium + + * control: Bump build-dep on bnd, drop bnd compat and re-export patches. + (Closes: #964433) + + -- Timo Aaltonen <tjaal...@debian.org> Thu, 06 Aug 2020 18:59:11 +0300 + tomcat9 (9.0.37-2) unstable; urgency=medium * d/p/0029-fix-regression-in-bz64540.patch: Re-export util.net.jsse ===================================== debian/control ===================================== @@ -7,7 +7,7 @@ Uploaders: Emmanuel Bourg <ebo...@apache.org> Build-Depends: ant-optional, - bnd, + bnd (>= 5.0.1), debhelper-compat (= 12), default-jdk, javahelper, ===================================== debian/patches/0028-bnd-compatibility.patch deleted ===================================== @@ -1,21 +0,0 @@ -Description: Fixes the compatibility with the version of bnd in Debian -Author: Emmanuel Bourg <ebo...@apache.org> -Forwarded: not-needed ---- a/res/bnd/build-defaults.bnd -+++ b/res/bnd/build-defaults.bnd -@@ -13,7 +13,7 @@ - # See the License for the specific language governing permissions and - # limitations under the License. - --Bundle-Version: ${version_cleanup;${version}} -+Bundle-Version: ${version} - - Specification-Title: Apache Tomcat - Specification-Version: ${version.major.minor} -@@ -28,4 +28,4 @@ - -includeresource.notice: META-INF/NOTICE;literal="${replace;${cat;../META-INF/default.notice};@YEAR@;${year}}\n" - -includeresource.license: {META-INF/LICENSE=../META-INF/default.license} - ---noclassforname: true -\ No newline at end of file -+-noclassforname: true ===================================== debian/patches/0029-fix-regression-in-bz64540.patch deleted ===================================== @@ -1,35 +0,0 @@ - -commit 13664621a2b4c9af09641a69438b2cf411238ca4 -Author: Mark Thomas <ma...@apache.org> -AuthorDate: Tue Jul 21 10:04:19 2020 +0100 - - Fix regression in fix for BZ 64540. - - Export additional packages, ---- - res/bnd/tomcat-coyote.jar.tmp.bnd | 6 +++--- - webapps/docs/changelog.xml | 10 ++++++++++ - 2 files changed, 13 insertions(+), 3 deletions(-) - ---- a/res/bnd/tomcat-coyote.jar.tmp.bnd -+++ b/res/bnd/tomcat-coyote.jar.tmp.bnd -@@ -33,13 +33,14 @@ Export-Package: \ - org.apache.tomcat.util.http.parser,\ - org.apache.tomcat.util.log,\ - org.apache.tomcat.util.modeler,\ -+ org.apache.tomcat.util.modeler.modules,\ - org.apache.tomcat.util.net,\ -+ org.apache.tomcat.util.net.jsse,\ - org.apache.tomcat.util.net.openssl,\ - org.apache.tomcat.util.net.openssl.ciphers - - -includepackage: \ - org.apache.tomcat.util.bcel,\ - org.apache.tomcat.util.http.fileupload.impl,\ -- org.apache.tomcat.util.http.fileupload.util.mime,\ -- org.apache.tomcat.util.modeler.modules,\ -- org.apache.tomcat.util.net.jsse -\ No newline at end of file -+ org.apache.tomcat.util.http.fileupload.util.mime -+ -\ No newline at end of file ===================================== debian/patches/series ===================================== @@ -11,5 +11,3 @@ 0025-invalid-configuration-exit-status.patch 0026-easymock4-compatibility.patch 0027-java11-compilation.patch -0028-bnd-compatibility.patch -0029-fix-regression-in-bz64540.patch View it on GitLab: https://salsa.debian.org/java-team/tomcat9/-/compare/1edeb31cf3ceb95bfe5b203e56ad0002c08839ac...c2eabfaed4a5106dc829b3a48526d1fa72948249 -- View it on GitLab: https://salsa.debian.org/java-team/tomcat9/-/compare/1edeb31cf3ceb95bfe5b203e56ad0002c08839ac...c2eabfaed4a5106dc829b3a48526d1fa72948249 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list pkg-java-comm...@alioth-lists.debian.net https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits