Andreas Tille pushed to branch master at Debian Java Maintainers / f2j
Commits: 226a9d11 by Andreas Tille at 2020-08-12T08:45:47+02:00 routine-update: Standards-Version: 4.5.0 - - - - - 00544c17 by Andreas Tille at 2020-08-12T08:45:47+02:00 routine-update: debhelper-compat 13 - - - - - acfede35 by Andreas Tille at 2020-08-12T08:45:51+02:00 routine-update: Add salsa-ci file - - - - - db4a14af by Andreas Tille at 2020-08-12T08:45:51+02:00 routine-update: Rules-Requires-Root: no - - - - - 42043925 by Andreas Tille at 2020-08-12T08:45:52+02:00 Trim trailing whitespace. Changes-By: lintian-brush Fixes: lintian: trailing-whitespace See-also: https://lintian.debian.org/tags/trailing-whitespace.html - - - - - fa634211 by Andreas Tille at 2020-08-12T08:58:47+02:00 Description: Fix build issue with gcc-10 - - - - - 7 changed files: - debian/changelog - − debian/compat - debian/control - + debian/patches/gcc-10_multiple_definition.patch - debian/patches/series - debian/rules - + debian/salsa-ci.yml Changes: ===================================== debian/changelog ===================================== @@ -1,3 +1,15 @@ +f2j (0.8.1+dfsg-5) UNRELEASED; urgency=medium + + * Standards-Version: 4.5.0 (routine-update) + * debhelper-compat 13 (routine-update) + * Add salsa-ci file (routine-update) + * Rules-Requires-Root: no (routine-update) + * Trim trailing whitespace. + * Description: Fix build issue with gcc-10 + Closes: #957190 + + -- Andreas Tille <[email protected]> Wed, 12 Aug 2020 08:45:47 +0200 + f2j (0.8.1+dfsg-4) unstable; urgency=medium * debhelper 12 ===================================== debian/compat deleted ===================================== @@ -1 +0,0 @@ -12 ===================================== debian/control ===================================== @@ -4,14 +4,15 @@ Uploaders: Olivier Sallou <[email protected]>, Andreas Tille <[email protected]> Section: java Priority: optional -Build-Depends: debhelper (>= 12~), +Build-Depends: debhelper-compat (= 13), default-jdk, bison, javahelper -Standards-Version: 4.3.0 +Standards-Version: 4.5.0 Vcs-Browser: https://salsa.debian.org/java-team/f2j Vcs-Git: https://salsa.debian.org/java-team/f2j.git Homepage: http://sourceforge.net/projects/f2j/ +Rules-Requires-Root: no Package: f2j Architecture: any ===================================== debian/patches/gcc-10_multiple_definition.patch ===================================== @@ -0,0 +1,16 @@ +Author: Andreas Tille <[email protected]> +Last-Update: Wed, 12 Aug 2020 08:45:47 +0200 +Bug-Debian: https://bugs.debian.org/957190 +Description: Fix build issue with gcc-10 + +--- a/src/opcodes.h ++++ b/src/opcodes.h +@@ -47,7 +47,7 @@ extern char * append_descriptor[MAX_RETU + extern char * toString_descriptor[MAX_RETURNS+1]; + + /* descriptors for the ArraySpec class */ +-char * array_spec_descriptor[MAX_RETURNS+1]; ++extern char * array_spec_descriptor[MAX_RETURNS+1]; + + /* descriptors of PrintStream's print() and println() methods */ + extern char * println_descriptor[MAX_RETURNS+1]; ===================================== debian/patches/series ===================================== @@ -4,3 +4,4 @@ remove_non-free_parts.patch replace_printfformat.patch spelling.patch hardening.patch +gcc-10_multiple_definition.patch ===================================== debian/rules ===================================== @@ -19,4 +19,3 @@ override_dh_auto_configure: cp -a libbytecode/bytecode.h libbytecode/bytecode.h.save dh_auto_configure mv libbytecode/bytecode.h.save libbytecode/bytecode.h - ===================================== debian/salsa-ci.yml ===================================== @@ -0,0 +1,4 @@ +--- +include: + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml + - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml View it on GitLab: https://salsa.debian.org/java-team/f2j/-/compare/61bf3d6155f99fb1ac3fc678af0322485ad59dff...fa634211dbef57ba6fda8121c3a565bafa73beed -- View it on GitLab: https://salsa.debian.org/java-team/f2j/-/compare/61bf3d6155f99fb1ac3fc678af0322485ad59dff...fa634211dbef57ba6fda8121c3a565bafa73beed 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

