[sollya] 01/01: Imported Debian patch 6.0+ds-3: FTBFS fix release
Jerome Benoit
calculus-guest at moszumanska.debian.org
Sat Aug 26 08:18:19 UTC 2017
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository sollya.
commit e230c9f37303010eb59db7e00a7fb15c08a4b219
Author: Jerome Benoit <calculus at rezozer.net>
Date: Sat Aug 26 12:01:59 2017 +0400
Imported Debian patch 6.0+ds-3: FTBFS fix release
---
debian/changelog | 13 +
debian/compat | 2 +-
debian/control | 4 +-
debian/patches/series | 1 +
debian/patches/upstream-fix-test-bug_872561.patch | 352 ++++++++++++++++++++++
debian/source/include-binaries | 1 +
debian/source/lintian-overrides | 3 -
debian/upstream/signing-key.pgp | Bin 0 -> 1271 bytes
debian/watch | 7 +-
9 files changed, 374 insertions(+), 9 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 6336de7..d167629 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+sollya (6.0+ds-3) unstable; urgency=medium
+
+ * FTBFS fix release (Closes: #872561), fix false positive, thanks
+ to the upstream team for promptly providing a fix.
+ * Debianization:
+ - debian/control:
+ - debhelper, bump to 10;
+ - Standards Version, bump to 4.1.0 (add gpg-signature check support);
+ - debian/patches/:
+ - d/p/upstream-fix-test-bug_872561.patch , imported from upstream git.
+
+ -- Jerome Benoit <calculus at rezozer.net> Sat, 26 Aug 2017 08:04:40 +0000
+
sollya (6.0+ds-2) unstable; urgency=medium
* Debianization:
diff --git a/debian/compat b/debian/compat
index ec63514..f599e28 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+10
diff --git a/debian/control b/debian/control
index 59d3c83..9b1227e 100644
--- a/debian/control
+++ b/debian/control
@@ -4,8 +4,8 @@ Priority: optional
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Jerome Benoit <calculus at rezozer.net>
Build-Depends:
- debhelper (>= 9),
- autotools-dev, gnulib, dh-autoreconf, libtool, help2man,
+ debhelper (>= 10),
+ gnulib, libtool, help2man,
flex, bison,
libgmp-dev, libmpfr-dev, libmpfi-dev, libfplll-dev (>= 5.1), libxml2-dev
Build-Depends-Indep:
diff --git a/debian/patches/series b/debian/patches/series
index 085dae4..40e8ecd 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
+upstream-fix-test-bug_872561.patch
upstream-harden-autotoolization-dist.patch
debianization.patch
diff --git a/debian/patches/upstream-fix-test-bug_872561.patch b/debian/patches/upstream-fix-test-bug_872561.patch
new file mode 100644
index 0000000..35a381a
--- /dev/null
+++ b/debian/patches/upstream-fix-test-bug_872561.patch
@@ -0,0 +1,352 @@
+Description: FTBFS fix #872561: harden tests: library constants and functions
+ Made tests for library constants and library functions more robust
+ Jerome Benoit discovered false positives while testing sollya on armhf
+ architecture for Debian. Indeed, I do not completely understand the logic
+ behind the tests (it seems to me that we were testing twice the same thing
+ with stupid6 and stupid7). Anyway, the code was intended to give a pointer
+ to a random place in the memory by considering stupid6 + 17 and stupid7 - 17,
+ and it appears that we might (by chance) end up on the address of a true
+ function, whence the false positive. I made the code more robust by using
+ a freshly allocated pointer, which is the technique already used for another
+ test.
+Origin: upstream
+Author: Sylvain Chevillard <sylvain.chevillard at ens-lyon.org>
+Last-Update: 2017-08-24
+
+diff --git a/tests-lib/tbuild_function_libraryconstant.c b/tests-lib/tbuild_function_libraryconstant.c
+index cb12888f..bf05c91d 100644
+--- a/tests-lib/tbuild_function_libraryconstant.c
++++ b/tests-lib/tbuild_function_libraryconstant.c
+@@ -39,20 +39,8 @@ void stupid5(mpfr_t res, mp_prec_t prec) {
+ return;
+ }
+
+-void stupid6(mpfr_t res, mp_prec_t prec) {
+- (void)prec; /* Avoiding "unused parameter" warning */
+- mpfr_set_ui(res, 0, GMP_RNDN);
+- return;
+-}
+-
+-void stupid7(mpfr_t res, mp_prec_t prec) {
+- (void)prec; /* Avoiding "unused parameter" warning */
+- mpfr_set_ui(res, 0, GMP_RNDN);
+- return;
+-}
+-
+ int main(void) {
+- sollya_obj_t f[15];
++ sollya_obj_t f[14];
+ int i;
+ void *ptr;
+ char str[256];
+@@ -126,33 +114,27 @@ int main(void) {
+ sollya_lib_printf("%b (expecting a)\n", f[10]);
+
+ /* Pointer to non-valid functions, together with NULL/illicit as second argument */
+- f[11] = sollya_lib_build_function_libraryconstant(NULL, (void (*)(mpfr_t, mp_prec_t)) (((char *) stupid6)+((int) 17)));
++ ptr = malloc(1);
++ f[11] = sollya_lib_build_function_libraryconstant(NULL, (void (*)(mpfr_t, mp_prec_t))(ptr));
+ sollya_lib_sprintf(str, "%b", f[11]);
+- sollya_lib_sprintf(str2, "const_%p", (void (*)(mpfr_t, mp_prec_t)) (((char *) stupid6)+((int) 17)));
++ sollya_lib_sprintf(str2, "const_%p", ptr);
+ if (strcmp(str, str2)==0) sollya_lib_printf("Testing NULL/invalid ptr combination: OK\n");
+ else sollya_lib_printf("Testing NULL/invalid ptr combination: *NOT* OK: %b versus %s\n", f[11], str2);
+
+-
+- f[12] = sollya_lib_build_function_libraryconstant(NULL, (void (*)(mpfr_t, mp_prec_t)) (((char *) stupid7)-((int) 17)));
++ f[12] = sollya_lib_build_function_libraryconstant("", (void (*)(mpfr_t, mp_prec_t))(&x));
+ sollya_lib_sprintf(str, "%b", f[12]);
+- sollya_lib_sprintf(str2, "const_%p", (void (*)(mpfr_t, mp_prec_t)) (((char *) stupid7)-((int) 17)));
+- if (strcmp(str, str2)==0) sollya_lib_printf("Testing NULL/invalid ptr combination: OK\n");
+- else sollya_lib_printf("Testing NULL/invalid ptr combination: *NOT* OK: %b versus %s\n", f[12], str2);
+-
+- f[13] = sollya_lib_build_function_libraryconstant("", (void (*)(mpfr_t, mp_prec_t))(&x));
+- sollya_lib_sprintf(str, "%b", f[13]);
+ sollya_lib_sprintf(str2, "const_%p", &x);
+ if (strcmp(str, str2)==0) sollya_lib_printf("Testing NULL/invalid ptr combination: OK\n");
+- else sollya_lib_printf("Testing NULL/invalid ptr combination: *NOT* OK: %b versus %s\n", f[13], str2);
++ else sollya_lib_printf("Testing NULL/invalid ptr combination: *NOT* OK: %b versus %s\n", f[12], str2);
+
+ ptr = malloc(1);
+- f[14] = sollya_lib_build_function_libraryconstant("*]%", (void (*)(mpfr_t, mp_prec_t))(ptr));
+- sollya_lib_sprintf(str, "%b", f[14]);
++ f[13] = sollya_lib_build_function_libraryconstant("*]%", (void (*)(mpfr_t, mp_prec_t))(ptr));
++ sollya_lib_sprintf(str, "%b", f[13]);
+ sollya_lib_sprintf(str2, "const_%p", ptr);
+ if (strcmp(str, str2)==0) sollya_lib_printf("Testing NULL/invalid ptr combination: OK\n");
+- else sollya_lib_printf("Testing NULL/invalid ptr combination: *NOT* OK: %b versus %s\n", f[14], str2);
++ else sollya_lib_printf("Testing NULL/invalid ptr combination: *NOT* OK: %b versus %s\n", f[13], str2);
+
+- for(i=0;i<=14;i++) sollya_lib_clear_obj(f[i]);
++ for(i=0;i<=13;i++) sollya_lib_clear_obj(f[i]);
+ free(ptr);
+ mpfr_clear(x);
+ mpfr_clear(y);
+diff --git a/tests-lib/tbuild_function_libraryconstant.reference b/tests-lib/tbuild_function_libraryconstant.reference
+index 3db80992..ae0fb046 100644
+--- a/tests-lib/tbuild_function_libraryconstant.reference
++++ b/tests-lib/tbuild_function_libraryconstant.reference
+@@ -19,4 +19,3 @@ a (expecting a)
+ Testing NULL/invalid ptr combination: OK
+ Testing NULL/invalid ptr combination: OK
+ Testing NULL/invalid ptr combination: OK
+-Testing NULL/invalid ptr combination: OK
+diff --git a/tests-lib/tbuild_function_libraryfunction.c b/tests-lib/tbuild_function_libraryfunction.c
+index 55cdbc7a..cd2713dd 100644
+--- a/tests-lib/tbuild_function_libraryfunction.c
++++ b/tests-lib/tbuild_function_libraryfunction.c
+@@ -115,23 +115,9 @@ int stupid5(mpfi_t result, mpfi_t x, int n) {
+ return 0;
+ }
+
+-int stupid6(mpfi_t result, mpfi_t x, int n) {
+- (void)x; /* Avoiding "unused parameter" warning */
+- (void)n; /* Avoiding "unused parameter" warning */
+- mpfi_set_ui(result, 0);
+- return 0;
+-}
+-
+-int stupid7(mpfi_t result, mpfi_t x, int n) {
+- (void)x; /* Avoiding "unused parameter" warning */
+- (void)n; /* Avoiding "unused parameter" warning */
+- mpfi_set_ui(result, 0);
+- return 0;
+-}
+-
+
+ int main(void) {
+- sollya_obj_t f[15];
++ sollya_obj_t f[14];
+ mpfr_t x,y;
+ int i;
+ void *ptr;
+@@ -209,32 +195,28 @@ int main(void) {
+ sollya_lib_printf("%b (expecting a)\n", f[10]);
+
+ /* Pointer to non-valid functions, together with NULL/illicit as second argument */
+- f[11] = sollya_lib_build_function_libraryfunction(SOLLYA_X_, NULL, (int (*)(mpfi_t, mpfi_t, int)) (((char *) stupid6)+((int) 17)));
++ ptr = malloc(1);
++ f[11] = sollya_lib_build_function_libraryfunction(SOLLYA_X_, NULL, (int (*)(mpfi_t, mpfi_t, int))(ptr));
+ sollya_lib_sprintf(str, "%b", f[11]);
+- sollya_lib_sprintf(str2, "func_%p", (int (*)(mpfi_t, mpfi_t, int)) (((char *) stupid6)+((int) 17)));
++ sollya_lib_sprintf(str2, "func_%p", ptr);
+ if (strcmp(str, str2)==0) sollya_lib_printf("Testing NULL/invalid ptr combination: OK\n");
+ else sollya_lib_printf("Testing NULL/invalid ptr combination: *NOT* OK: %b versus %s\n", f[11], str2);
+
+- f[12] = sollya_lib_build_function_libraryfunction(SOLLYA_X_, NULL, (int (*)(mpfi_t, mpfi_t, int)) (((char *) stupid7)-((int) 17)));
++ f[12] = sollya_lib_build_function_libraryfunction(SOLLYA_X_, "", (int (*)(mpfi_t, mpfi_t, int))(&x));
+ sollya_lib_sprintf(str, "%b", f[12]);
+- sollya_lib_sprintf(str2, "func_%p", (int (*)(mpfi_t, mpfi_t, int)) (((char *) stupid7)-((int) 17)));
++ sollya_lib_sprintf(str2, "func_%p", &x);
+ if (strcmp(str, str2)==0) sollya_lib_printf("Testing NULL/invalid ptr combination: OK\n");
+ else sollya_lib_printf("Testing NULL/invalid ptr combination: *NOT* OK: %b versus %s\n", f[12], str2);
+
+- f[13] = sollya_lib_build_function_libraryfunction(SOLLYA_X_, "", (int (*)(mpfi_t, mpfi_t, int))(&x));
++ ptr = malloc(1);
++ f[13] = sollya_lib_build_function_libraryfunction(SOLLYA_X_, "*]%", (int (*)(mpfi_t, mpfi_t, int))(ptr));
+ sollya_lib_sprintf(str, "%b", f[13]);
+- sollya_lib_sprintf(str2, "func_%p", &x);
++ sollya_lib_sprintf(str2, "func_%p", ptr);
+ if (strcmp(str, str2)==0) sollya_lib_printf("Testing NULL/invalid ptr combination: OK\n");
+ else sollya_lib_printf("Testing NULL/invalid ptr combination: *NOT* OK: %b versus %s\n", f[13], str2);
+
+- ptr = malloc(1);
+- f[14] = sollya_lib_build_function_libraryfunction(SOLLYA_X_, "*]%", (int (*)(mpfi_t, mpfi_t, int))(ptr));
+- sollya_lib_sprintf(str, "%b", f[14]);
+- sollya_lib_sprintf(str2, "func_%p", ptr);
+- if (strcmp(str, str2)==0) sollya_lib_printf("Testing NULL/invalid ptr combination: OK\n");
+- else sollya_lib_printf("Testing NULL/invalid ptr combination: *NOT* OK: %b versus %s\n", f[14], str2);
+
+- for(i=0;i<=14;i++) sollya_lib_clear_obj(f[i]);
++ for(i=0;i<=13;i++) sollya_lib_clear_obj(f[i]);
+ mpfr_clear(x);
+ mpfr_clear(y);
+ free(ptr);
+diff --git a/tests-lib/tbuild_function_libraryfunction.reference b/tests-lib/tbuild_function_libraryfunction.reference
+index a800b7eb..424fe1c9 100644
+--- a/tests-lib/tbuild_function_libraryfunction.reference
++++ b/tests-lib/tbuild_function_libraryfunction.reference
+@@ -18,4 +18,3 @@ a (expecting a)
+ Testing NULL/invalid ptr combination: OK
+ Testing NULL/invalid ptr combination: OK
+ Testing NULL/invalid ptr combination: OK
+-Testing NULL/invalid ptr combination: OK
+diff --git a/tests-lib/tlibraryconstant.c b/tests-lib/tlibraryconstant.c
+index 72d804f0..e304d145 100644
+--- a/tests-lib/tlibraryconstant.c
++++ b/tests-lib/tlibraryconstant.c
+@@ -39,20 +39,9 @@ void stupid5(mpfr_t res, mp_prec_t prec) {
+ return;
+ }
+
+-void stupid6(mpfr_t res, mp_prec_t prec) {
+- (void)prec; /* Avoiding "unused parameter" warning */
+- mpfr_set_ui(res, 0, GMP_RNDN);
+- return;
+-}
+-
+-void stupid7(mpfr_t res, mp_prec_t prec) {
+- (void)prec; /* Avoiding "unused parameter" warning */
+- mpfr_set_ui(res, 0, GMP_RNDN);
+- return;
+-}
+
+ int main(void) {
+- sollya_obj_t f[15];
++ sollya_obj_t f[14];
+ int i;
+ void *ptr;
+ char str[256];
+@@ -126,33 +115,27 @@ int main(void) {
+ sollya_lib_printf("%b (expecting a)\n", f[10]);
+
+ /* Pointer to non-valid functions, together with NULL/illicit as second argument */
+- f[11] = sollya_lib_libraryconstant(NULL, (void (*)(mpfr_t, mp_prec_t)) (((char *) stupid6)+((int) 17)));
++ ptr = malloc(1);
++ f[11] = sollya_lib_libraryconstant(NULL, (void (*)(mpfr_t, mp_prec_t))(ptr));
+ sollya_lib_sprintf(str, "%b", f[11]);
+- sollya_lib_sprintf(str2, "const_%p", (void (*)(mpfr_t, mp_prec_t)) (((char *) stupid6)+((int) 17)));
++ sollya_lib_sprintf(str2, "const_%p", ptr);
+ if (strcmp(str, str2)==0) sollya_lib_printf("Testing NULL/invalid ptr combination: OK\n");
+ else sollya_lib_printf("Testing NULL/invalid ptr combination: *NOT* OK: %b versus %s\n", f[11], str2);
+
+-
+- f[12] = sollya_lib_libraryconstant(NULL, (void (*)(mpfr_t, mp_prec_t)) (((char *) stupid7)-((int) 17)));
++ f[12] = sollya_lib_libraryconstant("", (void (*)(mpfr_t, mp_prec_t))(&x));
+ sollya_lib_sprintf(str, "%b", f[12]);
+- sollya_lib_sprintf(str2, "const_%p", (void (*)(mpfr_t, mp_prec_t)) (((char *) stupid7)-((int) 17)));
+- if (strcmp(str, str2)==0) sollya_lib_printf("Testing NULL/invalid ptr combination: OK\n");
+- else sollya_lib_printf("Testing NULL/invalid ptr combination: *NOT* OK: %b versus %s\n", f[12], str2);
+-
+- f[13] = sollya_lib_libraryconstant("", (void (*)(mpfr_t, mp_prec_t))(&x));
+- sollya_lib_sprintf(str, "%b", f[13]);
+ sollya_lib_sprintf(str2, "const_%p", &x);
+ if (strcmp(str, str2)==0) sollya_lib_printf("Testing NULL/invalid ptr combination: OK\n");
+- else sollya_lib_printf("Testing NULL/invalid ptr combination: *NOT* OK: %b versus %s\n", f[13], str2);
++ else sollya_lib_printf("Testing NULL/invalid ptr combination: *NOT* OK: %b versus %s\n", f[12], str2);
+
+ ptr = malloc(1);
+- f[14] = sollya_lib_libraryconstant("*]%", (void (*)(mpfr_t, mp_prec_t))(ptr));
+- sollya_lib_sprintf(str, "%b", f[14]);
++ f[13] = sollya_lib_libraryconstant("*]%", (void (*)(mpfr_t, mp_prec_t))(ptr));
++ sollya_lib_sprintf(str, "%b", f[13]);
+ sollya_lib_sprintf(str2, "const_%p", ptr);
+ if (strcmp(str, str2)==0) sollya_lib_printf("Testing NULL/invalid ptr combination: OK\n");
+- else sollya_lib_printf("Testing NULL/invalid ptr combination: *NOT* OK: %b versus %s\n", f[14], str2);
++ else sollya_lib_printf("Testing NULL/invalid ptr combination: *NOT* OK: %b versus %s\n", f[13], str2);
+
+- for(i=0;i<=14;i++) sollya_lib_clear_obj(f[i]);
++ for(i=0;i<=13;i++) sollya_lib_clear_obj(f[i]);
+ free(ptr);
+ mpfr_clear(x);
+ mpfr_clear(y);
+diff --git a/tests-lib/tlibraryconstant.reference b/tests-lib/tlibraryconstant.reference
+index 3db80992..ae0fb046 100644
+--- a/tests-lib/tlibraryconstant.reference
++++ b/tests-lib/tlibraryconstant.reference
+@@ -19,4 +19,3 @@ a (expecting a)
+ Testing NULL/invalid ptr combination: OK
+ Testing NULL/invalid ptr combination: OK
+ Testing NULL/invalid ptr combination: OK
+-Testing NULL/invalid ptr combination: OK
+diff --git a/tests-lib/tlibraryfunction.c b/tests-lib/tlibraryfunction.c
+index d1701c1c..1cbd65b5 100644
+--- a/tests-lib/tlibraryfunction.c
++++ b/tests-lib/tlibraryfunction.c
+@@ -118,27 +118,13 @@ int stupid5(mpfi_t result, mpfi_t x, int n) {
+ int stupid6(mpfi_t result, mpfi_t x, int n) {
+ (void)x; /* Avoiding "unused parameter" warning */
+ (void)n; /* Avoiding "unused parameter" warning */
+- mpfi_set_ui(result, 0);
+- return 0;
+-}
+-
+-int stupid7(mpfi_t result, mpfi_t x, int n) {
+- (void)x; /* Avoiding "unused parameter" warning */
+- (void)n; /* Avoiding "unused parameter" warning */
+- mpfi_set_ui(result, 0);
+- return 0;
+-}
+-
+-int stupid8(mpfi_t result, mpfi_t x, int n) {
+- (void)x; /* Avoiding "unused parameter" warning */
+- (void)n; /* Avoiding "unused parameter" warning */
+ mpfi_set_ui(result, 3);
+ return 0;
+ }
+
+
+ int main(void) {
+- sollya_obj_t f[18];
++ sollya_obj_t f[17];
+ mpfr_t x,y;
+ int i;
+ void *ptr;
+@@ -215,39 +201,34 @@ int main(void) {
+ sollya_lib_printf("%b (expecting a)\n", f[10]);
+
+ /* Pointer to non-valid functions, together with NULL/illicit as second argument */
+- f[11] = sollya_lib_libraryfunction(f[0], NULL, (int (*)(mpfi_t, mpfi_t, int)) (((char *) stupid6)+((int) 17)));
++ ptr = malloc(1);
++ f[11] = sollya_lib_libraryfunction(f[0], NULL, (int (*)(mpfi_t, mpfi_t, int))(ptr));
+ sollya_lib_sprintf(str, "%b", f[11]);
+- sollya_lib_sprintf(str2, "func_%p", (int (*)(mpfi_t, mpfi_t, int)) (((char *) stupid6)+((int) 17)));
++ sollya_lib_sprintf(str2, "func_%p", (int (*)(mpfi_t, mpfi_t, int))(ptr));
+ if (strcmp(str, str2)==0) sollya_lib_printf("Testing NULL/invalid ptr combination: OK\n");
+ else sollya_lib_printf("Testing NULL/invalid ptr combination: *NOT* OK: %b versus %s\n", f[11], str2);
+
+- f[12] = sollya_lib_libraryfunction(f[0], NULL, (int (*)(mpfi_t, mpfi_t, int)) (((char *) stupid7)-((int) 17)));
++ f[12] = sollya_lib_libraryfunction(f[0], "", (int (*)(mpfi_t, mpfi_t, int))(&x));
+ sollya_lib_sprintf(str, "%b", f[12]);
+- sollya_lib_sprintf(str2, "func_%p", (int (*)(mpfi_t, mpfi_t, int)) (((char *) stupid7)-((int) 17)));
+- if (strcmp(str, str2)==0) sollya_lib_printf("Testing NULL/invalid ptr combination: OK\n");
+- else sollya_lib_printf("Testing NULL/invalid ptr combination: *NOT* OK: %b versus %s\n", f[12], str2);
+-
+- f[13] = sollya_lib_libraryfunction(f[0], "", (int (*)(mpfi_t, mpfi_t, int))(&x));
+- sollya_lib_sprintf(str, "%b", f[13]);
+ sollya_lib_sprintf(str2, "func_%p", &x);
+ if (strcmp(str, str2)==0) sollya_lib_printf("Testing NULL/invalid ptr combination: OK\n");
+- else sollya_lib_printf("Testing NULL/invalid ptr combination: *NOT* OK: %b versus %s\n", f[13], str2);
++ else sollya_lib_printf("Testing NULL/invalid ptr combination: *NOT* OK: %b versus %s\n", f[12], str2);
+
+ ptr = malloc(1);
+- f[14] = sollya_lib_libraryfunction(f[0], "*]%", (int (*)(mpfi_t, mpfi_t, int))(ptr));
+- sollya_lib_sprintf(str, "%b", f[14]);
++ f[13] = sollya_lib_libraryfunction(f[0], "*]%", (int (*)(mpfi_t, mpfi_t, int))(ptr));
++ sollya_lib_sprintf(str, "%b", f[13]);
+ sollya_lib_sprintf(str2, "func_%p", ptr);
+ if (strcmp(str, str2)==0) sollya_lib_printf("Testing NULL/invalid ptr combination: OK\n");
+- else sollya_lib_printf("Testing NULL/invalid ptr combination: *NOT* OK: %b versus %s\n", f[14], str2);
++ else sollya_lib_printf("Testing NULL/invalid ptr combination: *NOT* OK: %b versus %s\n", f[13], str2);
+
+ /* Called on an interval, should return the interval, and the function should still being alive */
+- f[15] = sollya_lib_parse_string("[1,2]");
+- f[16] = sollya_lib_libraryfunction(f[15], "foo", stupid8);
+- sollya_lib_printf("%b (expecting [3;3])\n", f[16]);
+- f[17] = sollya_lib_parse_string("diff(foo(sin(_x_)))");
+- sollya_lib_printf("%b (expecting (diff(foo))(sin(_x_)) * cos(_x_))\n", f[17]);
++ f[14] = sollya_lib_parse_string("[1,2]");
++ f[15] = sollya_lib_libraryfunction(f[14], "foo", stupid6);
++ sollya_lib_printf("%b (expecting [3;3])\n", f[15]);
++ f[16] = sollya_lib_parse_string("diff(foo(sin(_x_)))");
++ sollya_lib_printf("%b (expecting (diff(foo))(sin(_x_)) * cos(_x_))\n", f[16]);
+
+- for(i=0;i<=17;i++) sollya_lib_clear_obj(f[i]);
++ for(i=0;i<=16;i++) sollya_lib_clear_obj(f[i]);
+ mpfr_clear(x);
+ mpfr_clear(y);
+ free(ptr);
+diff --git a/tests-lib/tlibraryfunction.reference b/tests-lib/tlibraryfunction.reference
+index 71aa6bd2..cff93c93 100644
+--- a/tests-lib/tlibraryfunction.reference
++++ b/tests-lib/tlibraryfunction.reference
+@@ -18,6 +18,5 @@ a (expecting a)
+ Testing NULL/invalid ptr combination: OK
+ Testing NULL/invalid ptr combination: OK
+ Testing NULL/invalid ptr combination: OK
+-Testing NULL/invalid ptr combination: OK
+ [3;3] (expecting [3;3])
+ (diff(foo))(sin(_x_)) * cos(_x_) (expecting (diff(foo))(sin(_x_)) * cos(_x_))
+--
+2.11.0
+
diff --git a/debian/source/include-binaries b/debian/source/include-binaries
new file mode 100644
index 0000000..a610508
--- /dev/null
+++ b/debian/source/include-binaries
@@ -0,0 +1 @@
+debian/upstream/signing-key.pgp
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
deleted file mode 100644
index 21a7f96..0000000
--- a/debian/source/lintian-overrides
+++ /dev/null
@@ -1,3 +0,0 @@
-# Upstream source ball is not (yet) signed: request to the upstream team
-# was sent -- Jerome Benoit <calculus at rrezozer.net>
-debian-watch-may-check-gpg-signature
diff --git a/debian/upstream/signing-key.pgp b/debian/upstream/signing-key.pgp
new file mode 100644
index 0000000..78450a4
Binary files /dev/null and b/debian/upstream/signing-key.pgp differ
diff --git a/debian/watch b/debian/watch
index 948e4b0..8d3e57c 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,5 @@
version=4
-opts=repack,dversionmangle=s/\+ds$//,repacksuffix=+ds \
-https://gforge.inria.fr/frs/?group_id=1015 \
- (?:|.*/)sollya(?:[_\-]v?|)(\d[^\s/]*)\.(?:tar\.xz|tar\.bz2|tar\.gz)
+opts=repack,dversionmangle=s/\+ds$//,repacksuffix=+ds,pgpmode=next \
+https://gforge.inria.fr/frs/?group_id=1015 (?:|.*/)@PACKAGE@@ANY_VERSION@@ARCHIVE_EXT@ debian
+opts=pgpmode=previous \
+https://gforge.inria.fr/frs/?group_id=1015 (?:|.*/)@PACKAGE@@ANY_VERSION@@SIGNATURE_EXT@ previous
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/sollya.git
More information about the debian-science-commits
mailing list