diff -Nru grace-5.1.25/debian/changelog grace-5.1.25/debian/changelog --- grace-5.1.25/debian/changelog 2024-04-01 05:53:36.000000000 +0000 +++ grace-5.1.25/debian/changelog 2024-03-14 02:11:39.000000000 +0000 @@ -1,26 +1,15 @@ -grace (1:5.1.25-13build4) noble; urgency=medium +grace (1:5.1.25-14) unstable; urgency=medium - * No-change rebuild for CVE-2024-3094 + * d/patches/configure-implicit-declarations.diff: Patch configure script + to compile all tests with new default CFLAGS in dpkg 1.22.6. Thanks to + Lucas Nussbaum for the report, and Ryan Carsten Schmidt and Macports + contributors for background and their own patch. (Closes: #1066669) + * Assorted housekeeping: + - d/control: Bump Standards-Version to 4.6.2, no changes required. + - d/copyright: Update years. + - d/grace.lintian-overrides: Restore embedded-library override. - -- William Grant Mon, 01 Apr 2024 16:53:36 +1100 - -grace (1:5.1.25-13build3) noble; urgency=medium - - * No-change rebuild against libxt6t64 - - -- Steve Langasek Sat, 09 Mar 2024 00:49:22 +0000 - -grace (1:5.1.25-13build2) noble; urgency=medium - - * No-change rebuild against libtirpc3t64 - - -- Steve Langasek Thu, 29 Feb 2024 09:24:06 +0000 - -grace (1:5.1.25-13build1) noble; urgency=medium - - * No-change rebuild against libpng16-16t64 - - -- Steve Langasek Thu, 29 Feb 2024 06:47:28 +0000 + -- Nicholas Breen Wed, 13 Mar 2024 19:11:39 -0700 grace (1:5.1.25-13) unstable; urgency=medium diff -Nru grace-5.1.25/debian/control grace-5.1.25/debian/control --- grace-5.1.25/debian/control 2024-02-29 06:47:28.000000000 +0000 +++ grace-5.1.25/debian/control 2024-03-14 01:38:49.000000000 +0000 @@ -1,9 +1,8 @@ Source: grace Section: math Priority: optional -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Nicholas Breen -Standards-Version: 4.6.1 +Maintainer: Nicholas Breen +Standards-Version: 4.6.2 Build-Depends: debhelper-compat (= 13), fontconfig, gfortran | fortran-compiler, diff -Nru grace-5.1.25/debian/copyright grace-5.1.25/debian/copyright --- grace-5.1.25/debian/copyright 2022-08-29 04:27:48.000000000 +0000 +++ grace-5.1.25/debian/copyright 2024-03-14 01:38:21.000000000 +0000 @@ -234,6 +234,6 @@ Copyright: Copyright 1997-1998 Enrique Zanardi Copyright 1999-2009 Torsten Werner Copyright 2005-2008 Ionut Georgescu - Copyright 2010-2022 Nicholas Breen + Copyright 2010-2024 Nicholas Breen License: GPL-2+ diff -Nru grace-5.1.25/debian/grace.lintian-overrides grace-5.1.25/debian/grace.lintian-overrides --- grace-5.1.25/debian/grace.lintian-overrides 2022-08-30 00:52:45.000000000 +0000 +++ grace-5.1.25/debian/grace.lintian-overrides 2024-03-14 01:11:15.000000000 +0000 @@ -1,5 +1,7 @@ # This directory is shipped empty, but populated by the update-grace-fonts script in the postinst. grace: package-contains-empty-directory [usr/share/grace/fonts/type1/] +# T1lib. Embedding it is ugly, but it's marginally better than nothing. Overriding error as standalone t1lib is no longer in the archive. +grace: embedded-library t1lib [usr/bin/xmgrace] # False positive. The script does some odd checks for the location of a non-packaged build, but then falls back to respecting $PATH. grace: bin-sbin-mismatch # Abbreviation for longitude. diff -Nru grace-5.1.25/debian/patches/configure-implicit-declarations.diff grace-5.1.25/debian/patches/configure-implicit-declarations.diff --- grace-5.1.25/debian/patches/configure-implicit-declarations.diff 1970-01-01 00:00:00.000000000 +0000 +++ grace-5.1.25/debian/patches/configure-implicit-declarations.diff 2024-03-14 01:45:17.000000000 +0000 @@ -0,0 +1,66 @@ +Description: Configure with -Werror=implicit-function-declaration + New flags in dpkg 1.22.6 trigger errors on various parts of the configure + script. This adds explicit declarations; please see the Macports bug for + useful context and problem-solving. Patch is lightly modified from their + version. +Origin: other, https://github.com/macports/macports-ports/blob/8e5162b8e36511d287b5e7ee70470c7dd1242a9e/x11/grace/files/implicit.patch +Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=1066669 +Bug-Macports: https://trac.macports.org/ticket/61261 +Last-Update: 2024-03-13 +--- +This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ +Index: grace/configure +=================================================================== +--- grace.orig/configure ++++ grace/configure +@@ -4931,6 +4931,7 @@ else + /* end confdefs.h. */ + + #include ++#include + #include + + #define LOG2EA 0.44269504088896340735992 +@@ -8309,6 +8310,7 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#include + #include + #include + int main(void) { +@@ -8395,6 +8397,7 @@ else + /* end confdefs.h. */ + + #include ++#include + #include + int main(void) { + int vinc; +@@ -8479,6 +8482,7 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#include + #include + #include + int main(void) { +@@ -8566,6 +8570,8 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#include ++#include + #include + int main(void) { + char *vinc; +@@ -9516,7 +9522,9 @@ else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext + /* end confdefs.h. */ + ++#include + #include ++void XmRegisterConverters(void); + int main(void) { + int vlibn, vincn; + vincn = XmVersion; diff -Nru grace-5.1.25/debian/patches/series grace-5.1.25/debian/patches/series --- grace-5.1.25/debian/patches/series 2022-08-29 03:30:57.000000000 +0000 +++ grace-5.1.25/debian/patches/series 2024-03-14 01:16:54.000000000 +0000 @@ -12,3 +12,4 @@ font-extension-t1.diff documentation-national-encoding.diff grconvert-tirpc.diff +configure-implicit-declarations.diff