Control: tags 825709 + pending Dear maintainer,
I've prepared an NMU for ace (versioned as 6.3.3+dfsg-1.1) and
uploaded it.
You can find a debdiff of the upload attached.
Regards.
--
regards,
Mattia Rizzolo
GPG Key: 66AE 2B4A FCCF 3F52 DA18 4D18 4B04 3FCD B944 4540 .''`.
more about me: https://mapreri.org : :' :
Launchpad user: https://launchpad.net/~mapreri `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia `-
diffstat for ace-6.3.3+dfsg ace-6.3.3+dfsg changelog | 7 +++++++ patches/fix-kfreebsd-ftbfs | 18 ++++++++++++++++++ patches/series | 1 + 3 files changed, 26 insertions(+) diff -Nru ace-6.3.3+dfsg/debian/changelog ace-6.3.3+dfsg/debian/changelog --- ace-6.3.3+dfsg/debian/changelog 2015-11-15 10:30:58.000000000 +0000 +++ ace-6.3.3+dfsg/debian/changelog 2016-07-01 05:43:37.000000000 +0000 @@ -1,3 +1,10 @@ +ace (6.3.3+dfsg-1.1) unstable; urgency=medium + + * Non-maintainer upload. + * Fix FTBFS in kfreebsd. Closes: #825709 + + -- Mattia Rizzolo <[email protected]> Fri, 01 Jul 2016 05:43:35 +0000 + ace (6.3.3+dfsg-1) unstable; urgency=medium [ Pau Garcia i Quiles ] diff -Nru ace-6.3.3+dfsg/debian/patches/fix-kfreebsd-ftbfs ace-6.3.3+dfsg/debian/patches/fix-kfreebsd-ftbfs --- ace-6.3.3+dfsg/debian/patches/fix-kfreebsd-ftbfs 1970-01-01 00:00:00.000000000 +0000 +++ ace-6.3.3+dfsg/debian/patches/fix-kfreebsd-ftbfs 2016-07-01 05:42:45.000000000 +0000 @@ -0,0 +1,18 @@ +Description: fix FTBFS in kfreebsd + These lines were apparently dropped somewhere between 6.2.8 and 6.3.2 +Author: Mattia Rizzolo <[email protected]> +Bug-Debian: https://bugs.debian.org/825709 + +--- a/ace/OS_NS_stdlib.h ++++ b/ace/OS_NS_stdlib.h +@@ -46,6 +46,10 @@ + } + #endif /* ACE_WIN32 && _MSC_VER */ + ++#if defined (atop) ++# undef atop ++#endif ++ + /* + * We inline and undef some functions that may be implemented + * as macros on some platforms. This way macro definitions will diff -Nru ace-6.3.3+dfsg/debian/patches/series ace-6.3.3+dfsg/debian/patches/series --- ace-6.3.3+dfsg/debian/patches/series 2015-11-15 10:20:45.000000000 +0000 +++ ace-6.3.3+dfsg/debian/patches/series 2016-07-01 05:42:58.000000000 +0000 @@ -4,3 +4,4 @@ 91-patch-dg-basedir.diff 92-default-ACE_ROOT.diff 93-no-sslv3.diff +fix-kfreebsd-ftbfs
signature.asc
Description: PGP signature
