diff -Nru ries-2018.04.11/debian/changelog ries-2018.04.11+ds1/debian/changelog --- ries-2018.04.11/debian/changelog 2018-08-22 21:55:47.000000000 +0000 +++ ries-2018.04.11+ds1/debian/changelog 2018-08-27 21:34:43.000000000 +0000 @@ -1,9 +1,22 @@ -ries (2018.04.11-1ubuntu1) cosmic; urgency=medium +ries (2018.04.11+ds1-1) unstable; urgency=low - * debian/patches/library-link-order.patch: Ensure libraries linked are - listed after objects using them. + * New version + + GNUmakefile: Replace wrong LDFLAGS usage with LDLIBS. + Make compilation with -Wl,--as-needed work. Closes: #906991 + Thanks to Steve Langasek for reporting the bug :) - -- Steve Langasek Wed, 22 Aug 2018 21:55:47 +0000 + * Add patches for the manpage + + Fix spelling mistakes + + Set the manpages section to 1 (rather than 1L) + + * Make git-buildpackage commit xz-compressed upstream tarballs to pristine-tar + * debian/copyright + + Add comment explaining the situation + + Update the copyright years and ownership + * Comply with policy version 4.2.1 + + Set Rules-Requires-Root to no + + -- Nicolas Braud-Santoni Mon, 27 Aug 2018 22:34:43 +0100 ries (2018.04.11-1) unstable; urgency=medium diff -Nru ries-2018.04.11/debian/control ries-2018.04.11+ds1/debian/control --- ries-2018.04.11/debian/control 2018-08-22 21:55:47.000000000 +0000 +++ ries-2018.04.11+ds1/debian/control 2018-08-27 21:34:43.000000000 +0000 @@ -1,10 +1,10 @@ Source: ries -Maintainer: Ubuntu Developers -XSBC-Original-Maintainer: Nicolas Braud-Santoni +Maintainer: Nicolas Braud-Santoni Section: math Priority: optional Build-Depends: debhelper (>= 11) -Standards-Version: 4.1.4 +Standards-Version: 4.2.1 +Rules-Requires-Root: no Homepage: https://mrob.com/pub/ries/ Vcs-Browser: https://salsa.debian.org/debian/ries Vcs-Git: https://salsa.debian.org/debian/ries.git diff -Nru ries-2018.04.11/debian/copyright ries-2018.04.11+ds1/debian/copyright --- ries-2018.04.11/debian/copyright 2018-04-30 11:54:51.000000000 +0000 +++ ries-2018.04.11+ds1/debian/copyright 2018-08-27 21:34:43.000000000 +0000 @@ -1,17 +1,22 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: ries Source: https://mrob.com/pub/ries/ +Comment: + The upstream tarball and git branch, along with the GNUmakefile, were produced + as part of the Debian packaging: upstream only publishes the source as a .c.txt + file (and .1.txt), unversioned, on their homepage. + Files: debian/* GNUmakefile Copyright: Copyright (c) 2018 Nicolas Braud-Santoni License: GPL-3+ Files: ries.c -Copyright: Copyright (C) 2000-2017 Robert P. Munafo +Copyright: Copyright (C) 2000-2018 Robert P. Munafo License: GPL-3+ Files: ries.1 -Copyright: Copyright (C) 2000-2017 Robert P. Munafo +Copyright: Copyright (C) 2000-2018 Robert P. Munafo License: GFDL-NIV-1.3+ Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or diff -Nru ries-2018.04.11/debian/gbp.conf ries-2018.04.11+ds1/debian/gbp.conf --- ries-2018.04.11/debian/gbp.conf 1970-01-01 00:00:00.000000000 +0000 +++ ries-2018.04.11+ds1/debian/gbp.conf 2018-08-27 21:34:43.000000000 +0000 @@ -0,0 +1,3 @@ +[buildpackage] +pristine-tar-commit = True +compression = xz diff -Nru ries-2018.04.11/debian/patches/Fix-spelling-mistakes-in-manpage.patch ries-2018.04.11+ds1/debian/patches/Fix-spelling-mistakes-in-manpage.patch --- ries-2018.04.11/debian/patches/Fix-spelling-mistakes-in-manpage.patch 1970-01-01 00:00:00.000000000 +0000 +++ ries-2018.04.11+ds1/debian/patches/Fix-spelling-mistakes-in-manpage.patch 2018-08-27 21:34:43.000000000 +0000 @@ -0,0 +1,44 @@ +Subject: Fix spelling mistakes in manpage + +--- + ries.1 | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/ries.1 b/ries.1 +index 17c7da7..1073c43 100644 +Origin: vendor +From: Nicolas Braud-Santoni +Reviewed-by: Nicolas Braud-Santoni +Last-Update: 2018-08-27 +Forwarded: <20180827212502.gmczbfwyhji7kokp@bogus> +Applied-Upstream: no + +--- a/ries.1 ++++ b/ries.1 +@@ -737,7 +737,7 @@ small as 8x10^-5 times the expression's value. In calculating any + possible answers, \fBries\fR would allow ``\fIx\fR^2'' because the + ratio between d/d\fIx\fR \fIx\fR^2 and \fIx\fR^2 is about 1.62e-4, + which is big enough to surpass the margin. However, any answers +-involving ``sqrt(\fIx\fR)'' would be rejected beause the ratio between ++involving ``sqrt(\fIx\fR)'' would be rejected because the ratio between + d/d\fIx\fR sqrt(\fIx\fR) and sqrt(\fIx\fR) is only 4.05e-5: + + .ta 1.2iC 2.2iC 3.4iC 4.4iC +@@ -795,7 +795,7 @@ in which both sides of the equal sign are less than 3. Similarly, + + .IP \fB--max-match-distance\fR\ \fIvalue\fR + Specify the maximum distance between your given target value \fIT\fR +-and the roots \fIx\fR of any reported equations. This sets a minumum ++and the roots \fIx\fR of any reported equations. This sets a minimum + level of accuracy, overriding the default, which is 1% of the + size of your target value. For example, the command \FCries 2.5063\FT + will use a threshold that is 1% of 2.5063, or about 0.025. It +@@ -890,7 +890,7 @@ Among these results (after solving for \fIx\fR) are the ancient + approximations 19/6 and 22/7, and the more modern curiosity + \fIe\fR^\fIpi\fR \o"~=" 20 + \fIpi\fR (which is called + ``\fIGelfond's constant\fR''). Other interesting results can be found +-by omitting symbols with \fB-N\fR or by using restriced classes. For ++by omitting symbols with \fB-N\fR or by using restricted classes. For + example \fBries 3.1415926 -NSCTlLfEevp --min-match-distance 1e-8\fR + (excluding most of the scientific functions) gives the fraction + approximation 355/113 in the form ``1/(\fIx\fR-3)-1 = 1/4^2+6''; and diff -Nru ries-2018.04.11/debian/patches/Fix-the-section-of-the-manpage.patch ries-2018.04.11+ds1/debian/patches/Fix-the-section-of-the-manpage.patch --- ries-2018.04.11/debian/patches/Fix-the-section-of-the-manpage.patch 1970-01-01 00:00:00.000000000 +0000 +++ ries-2018.04.11+ds1/debian/patches/Fix-the-section-of-the-manpage.patch 2018-08-27 21:34:43.000000000 +0000 @@ -0,0 +1,23 @@ +Subject: Fix the section of the manpage + +--- + ries.1 | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/ries.1 b/ries.1 +index 1073c43..1574a5f 100644 +Origin: vendor +From: Nicolas Braud-Santoni +Reviewed-by: Nicolas Braud-Santoni +Last-Update: 2018-08-27 +Forwarded: <20180827212502.gmczbfwyhji7kokp@bogus> +Applied-Upstream: no + +--- a/ries.1 ++++ b/ries.1 +@@ -1,4 +1,4 @@ +-.TH RIES 1L "Manual version: 2018 Mar 01" \" -*- nroff -*- ++.TH RIES 1 "Manual version: 2018 Mar 01" \" -*- nroff -*- + .\" + .\" This manpage uses the groff font family escape, as documented here: + .\" diff -Nru ries-2018.04.11/debian/patches/library-link-order.patch ries-2018.04.11+ds1/debian/patches/library-link-order.patch --- ries-2018.04.11/debian/patches/library-link-order.patch 2018-08-22 21:54:05.000000000 +0000 +++ ries-2018.04.11+ds1/debian/patches/library-link-order.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,21 +0,0 @@ -Description: Ensure libraries linked are listed after objects using them - The Ubuntu toolchain uses -Wl,--as-needed by default, which causes - libraries to be dropped from the final binary if they aren't used. For - portability, make sure that libraries are always listed on the linker - commandline /after/ the objects that reference them. -Author: Steve Langasek -Last-Modified: 2018-08-22 - -Index: ries-2018.04.11/GNUmakefile -=================================================================== ---- ries-2018.04.11.orig/GNUmakefile -+++ ries-2018.04.11/GNUmakefile -@@ -2,7 +2,7 @@ - # Licensed under the GNU Public License, version 3 or later - - CFLAGS?=-g -O2 -fstack-protector-strong -D_FORTIFY_SOURCE=2 --LDFLAGS+= -lm -+LDLIBS+= -lm - - ries: ries.o - diff -Nru ries-2018.04.11/debian/patches/series ries-2018.04.11+ds1/debian/patches/series --- ries-2018.04.11/debian/patches/series 2018-08-22 21:15:08.000000000 +0000 +++ ries-2018.04.11+ds1/debian/patches/series 2018-08-27 21:34:43.000000000 +0000 @@ -1 +1,2 @@ -library-link-order.patch +Fix-spelling-mistakes-in-manpage.patch +Fix-the-section-of-the-manpage.patch diff -Nru ries-2018.04.11/GNUmakefile ries-2018.04.11+ds1/GNUmakefile --- ries-2018.04.11/GNUmakefile 2018-04-30 11:50:08.000000000 +0000 +++ ries-2018.04.11+ds1/GNUmakefile 2018-08-26 18:55:00.000000000 +0000 @@ -2,7 +2,7 @@ # Licensed under the GNU Public License, version 3 or later CFLAGS?=-g -O2 -fstack-protector-strong -D_FORTIFY_SOURCE=2 -LDFLAGS+= -lm +LDLIBS+= -lm ries: ries.o