Mathieu Malaterre pushed to branch master at Debian Java Maintainers / epubcheck
Commits: 7092bfa1 by YOKOTA Hiroshi at 2022-02-20T20:32:25+09:00 Specify stack size to avoid java.lang.StackOverflowError (Closes: #999900) - - - - - 51c50906 by YOKOTA Hiroshi at 2022-03-12T17:39:39+01:00 Rework patch series for `git-buildpackage` Add 0002-remove_deps.patch: Rename to add patch number Add 0001-classpath.patch: Rename to add patch number Drop classpath.patch: Rename to add patch number Drop remove_deps.patch: Rename to add patch number - - - - - 96f8580b by Mathieu Malaterre at 2022-03-12T17:47:08+01:00 d/changelog: Upload 4.2.6-2 to unstable - - - - - 5 changed files: - debian/changelog - debian/patches/classpath.patch → debian/patches/0001-classpath.patch - debian/patches/remove_deps.patch → debian/patches/0002-remove_deps.patch - + debian/patches/0003-Specify-stack-size-to-avoid-java.lang.StackOverflowE.patch - debian/patches/series Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,11 @@ +epubcheck (4.2.6-2) unstable; urgency=medium + + [ YOKOTA Hiroshi ] + * Specify stack size to avoid java.lang.StackOverflowError (Closes: #999900) + * Rework patch series for `git-buildpackage` + + -- Mathieu Malaterre <[email protected]> Sat, 12 Mar 2022 17:46:50 +0100 + epubcheck (4.2.6-1) unstable; urgency=medium * d/control: Update to correct team maintenance group ===================================== debian/patches/classpath.patch → debian/patches/0001-classpath.patch ===================================== @@ -1,9 +1,16 @@ -Description: Set classpath for Debian systems +From: Eugene Zhukov <[email protected]> +Date: Tue, 27 Nov 2018 11:02:44 +0200 +Subject: Set classpath for Debian systems -Index: epubcheck/pom.xml -=================================================================== ---- epubcheck.orig/pom.xml -+++ epubcheck/pom.xml +Forwarded: not-needed +--- + pom.xml | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pom.xml b/pom.xml +index c94378b..2697900 100644 +--- a/pom.xml ++++ b/pom.xml @@ -458,7 +458,6 @@ <artifactId>maven-jar-plugin</artifactId> <version>3.0.2</version> ===================================== debian/patches/remove_deps.patch → debian/patches/0002-remove_deps.patch ===================================== @@ -1,39 +1,20 @@ -Description: <short summary of the patch> - TODO: Put a short summary on the line above and replace this paragraph - with a longer explanation of this change. Complete the meta-information - with other relevant fields (see below for details). To make it easier, the - information below has been extracted from the changelog. Adjust it or drop - it. - . - epubcheck (4.2.6-1) UNRELEASED; urgency=medium - . - * d/control: Update to correct team maintenance group - * d/control: Update uploaders list. Thank you Eugene. Closes: #987146 - * d/control: Add missing Depends on `default-jre`. Closes: #999608 - * d/watch: Update location of epubcheck - * d/control: Add missing Rules-Requires-Root: no - * d/control: Bump Std-Vers to 4.6.0 no changes needed - * d/control: Add missing Dependencies - * New upstream version 4.2.6 +From: Mathieu Malaterre <[email protected]> +Date: Thu, 27 Jan 2022 11:16:28 +0100 +Subject: Remove extra dependencies for test suite + Author: Mathieu Malaterre <[email protected]> Bug-Debian: https://bugs.debian.org/987146 Bug-Debian: https://bugs.debian.org/999608 - ---- -The information above should follow the Patch Tagging Guidelines, please -checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here -are templates for supplementary fields that you might want to add: - -Origin: <vendor|upstream|other>, <url of original patch> -Bug: <url in upstream bugtracker> -Bug-Debian: https://bugs.debian.org/<bugnumber> -Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber> -Forwarded: <no|not-needed|url proving that it has been forwarded> -Reviewed-By: <name and email of someone who approved the patch> Last-Update: 2022-01-27 +Forwarded: not-needed +--- + pom.xml | 1022 +++++++++++++++++++++++++++------------------------------------ + 1 file changed, 429 insertions(+), 593 deletions(-) ---- epubcheck-4.2.6.orig/pom.xml -+++ epubcheck-4.2.6/pom.xml +diff --git a/pom.xml b/pom.xml +index 2697900..131e424 100644 +--- a/pom.xml ++++ b/pom.xml @@ -1,598 +1,434 @@ <?xml version="1.0" encoding="UTF-8"?> <project xmlns="http://maven.apache.org/POM/4.0.0"; xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"; xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd";> ===================================== debian/patches/0003-Specify-stack-size-to-avoid-java.lang.StackOverflowE.patch ===================================== @@ -0,0 +1,34 @@ +From: YOKOTA Hiroshi <[email protected]> +Date: Wed, 9 Feb 2022 00:45:30 +0900 +Subject: Specify stack size to avoid java.lang.StackOverflowError (Closes: + #999900) + +Forwarded: not-needed +Bug-Debian: https://bugs.debian.org/999900 + +i386 platform uses smaller stack size. +This breaks epubcheck on large ePub. + +Add "-Xss1024k" to use 1024kb stack. + +"jarwrapper" accepts "Debian-Java-Parameters" property in JAR manifest to +add own Java run-time options. + +See also: +https://github.com/w3c/epubcheck/wiki/Running#javalangstackoverflowerror +--- + pom.xml | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/pom.xml b/pom.xml +index 131e424..66f48e0 100644 +--- a/pom.xml ++++ b/pom.xml +@@ -367,6 +367,7 @@ + <manifestEntries> + <project-url>${project.url}</project-url> + <scm-location>${project.scm.developerConnection}</scm-location> ++ <Debian-Java-Parameters>-Xss1024k</Debian-Java-Parameters> + </manifestEntries> + </archive> + </configuration> ===================================== debian/patches/series ===================================== @@ -1,2 +1,3 @@ -classpath.patch -remove_deps.patch +0001-classpath.patch +0002-remove_deps.patch +0003-Specify-stack-size-to-avoid-java.lang.StackOverflowE.patch View it on GitLab: https://salsa.debian.org/java-team/epubcheck/-/compare/e683449fc7193a70a04746825fbaff7318433b2f...96f8580be82c082bcebc708ec33be2dba02189b6 -- View it on GitLab: https://salsa.debian.org/java-team/epubcheck/-/compare/e683449fc7193a70a04746825fbaff7318433b2f...96f8580be82c082bcebc708ec33be2dba02189b6 You're receiving this email because of your account on salsa.debian.org.
_______________________________________________ pkg-java-commits mailing list [email protected] https://alioth-lists.debian.net/cgi-bin/mailman/listinfo/pkg-java-commits
