[gap-float] 03/03: Imported Debian patch 0.7.6+ds-1
Jerome Benoit
calculus-guest at moszumanska.debian.org
Fri May 26 11:03:53 UTC 2017
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository gap-float.
commit 7b48aaaef4e8adef971d07af559c939741987d07
Author: Jerome Benoit <calculus at rezozer.net>
Date: Fri May 26 14:58:18 2017 +0400
Imported Debian patch 0.7.6+ds-1
---
debian/changelog | 14 ++
debian/copyright | 4 +-
debian/patches/debianization.patch | 4 +-
debian/patches/series | 2 -
.../patches/upstream-autotoolization-cleanup.patch | 19 +--
.../patches/upstream-migration-fplll-4_to_5.patch | 141 ---------------------
.../patches/upstream-upgrade-tst-testall_g.patch | 34 -----
7 files changed, 29 insertions(+), 189 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9bfb7f7..7e09939 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+gap-float (0.7.6+ds-1) unstable; urgency=medium
+
+ * New upstream release.
+ * Debianization:
+ - debian/patches/*:
+ - d/p/upstream-migration-fplll-4_to_5.patch, inegrated upstream;
+ - d/p/upstream-upgrade-tst-testall_g.patch, idem;
+ - d/p/upstream-autotoolization-cleanup.patch, refresh;
+ - d/p/debianization.patch, update;
+ - debian/copyright:
+ - refresh.
+
+ -- Jerome Benoit <calculus at rezozer.net> Fri, 26 May 2017 10:57:37 +0000
+
gap-float (0.7.4+ds-3) unstable; urgency=medium
* Upload to unstable.
diff --git a/debian/copyright b/debian/copyright
index 04c2b30..29afab8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -40,12 +40,12 @@ Files-Excluded:
Files: *
Copyright:
- 2007-2016 Laurent Bartholdi <laurent.bartholdi at gmail.com>
+ 2007-2017 Laurent Bartholdi <laurent.bartholdi at gmail.com>
License: GPL-3+
Files: debian/*
Copyright:
- 2014-2016 Jerome Benoit <calculus at rezozer.net>
+ 2014-2017 Jerome Benoit <calculus at rezozer.net>
License: GPL-3+
License: GPL-3+
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index 6580a14..ae3a6f4 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -38,7 +38,7 @@ Last-Update: 2016-10-14
float_la_SOURCES += mpfr.c
--- a/tst/testall.g
+++ b/tst/testall.g
-@@ -12,7 +12,7 @@
+@@ -12,9 +12,9 @@
Test(Filename(dirs,"arithmetic.tst"),rec(compareFunction:="uptowhitespace"));
field := MPC_PSEUDOFIELD;
Test(Filename(dirs,"polynomials.tst"),rec(compareFunction:="uptowhitespace"));
@@ -50,3 +50,5 @@ Last-Update: 2016-10-14
+##Test(Filename(dirs,"arithmetic.tst"),rec(compareFunction:="uptowhitespace"));
+##field := CXSC_PSEUDOFIELD;
+##Test(Filename(dirs,"polynomials.tst"),rec(compareFunction:="uptowhitespace"));
+
+ Test(Filename(dirs,"fplll.tst"),rec(compareFunction:="uptowhitespace"));
diff --git a/debian/patches/series b/debian/patches/series
index 77de806..f8105f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,4 @@
-upstream-migration-fplll-4_to_5.patch
upstream-fix-gapdoc-bib.patch
-upstream-upgrade-tst-testall_g.patch
upstream-autotoolization-cleanup.patch
upstream-update-m4_ac_find_gap_m4.patch
debianization.patch
diff --git a/debian/patches/upstream-autotoolization-cleanup.patch b/debian/patches/upstream-autotoolization-cleanup.patch
index d9baf7c..46015fb 100644
--- a/debian/patches/upstream-autotoolization-cleanup.patch
+++ b/debian/patches/upstream-autotoolization-cleanup.patch
@@ -1,7 +1,7 @@
Description: cleanup autotools machinery
Origin: vendor, Debian
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2016-10-14
+Last-Update: 2017-05-16
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ Last-Update: 2016-10-14
AC_PREREQ(2.65)
LT_PREREQ([2.4.2])
-AC_INIT([float],[0.5.18],[laurent.bartholdi at gmail.com])
-+AC_INIT([float],[0.7.4],[laurent.bartholdi at gmail.com])
++AC_INIT([float],[0.7.6],[laurent.bartholdi at gmail.com])
AC_CONFIG_SRCDIR([src/float.c])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
@@ -47,7 +47,7 @@ Last-Update: 2016-10-14
EXTRA_DIST = \
--- a/Makefile.am
+++ b/Makefile.am
-@@ -14,114 +14,20 @@
+@@ -14,115 +14,20 @@
#AM_DISTCHECK_CONFIGURE_FLAGS =
@@ -70,17 +70,18 @@ Last-Update: 2016-10-14
-EXTERN=$(CURDIR)/bin/@GAPARCH@/extern
+export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner
--MPFRLIB=extern/mpfr-3.1.2
+-MPFRLIB=extern/mpfr-3.1.5
-MPFILIB=extern/mpfi-1.5.1
--MPCLIB=extern/mpc-1.0.1
--CXSCLIB=extern/cxsc-2-5-3
+-MPCLIB=extern/mpc-1.0.3
+-CXSCLIB=extern/cxsc-2-5-4
-FPLLLLIB=extern/libfplll-4.0.1
+-# latest version: https://github.com/fplll/fplll/releases/download/5.0.3/fplll-5.0.3.tar.gz
-WGET=@WGET@
-
-$(MPFRLIB).tar.bz2:
- @echo "I can't find $@, so I'm going to download it"
- mkdir -p extern
-- (cd extern; $(WGET) http://www.mpfr.org/mpfr-3.1.2/mpfr-3.1.2.tar.bz2)
+- (cd extern; $(WGET) http://www.mpfr.org/mpfr-3.1.5/mpfr-3.1.5.tar.bz2)
-
-$(MPFILIB).tar.bz2:
- @echo "I can't find $@, so I'm going to download it"
@@ -90,12 +91,12 @@ Last-Update: 2016-10-14
-$(MPCLIB).tar.gz:
- @echo "I can't find $@, so I'm going to download it"
- mkdir -p extern
-- (cd extern; $(WGET) http://www.multiprecision.org/mpc/download/mpc-1.0.1.tar.gz)
+- (cd extern; $(WGET) http://www.multiprecision.org/mpc/download/mpc-1.0.3.tar.gz)
-
-$(CXSCLIB).tar.gz:
- @echo "I can't find $@, so I'm going to download it"
- mkdir -p extern
-- (cd extern; $(WGET) http://www2.math.uni-wuppertal.de/~xsc/xsc/cxsc/cxsc-2-5-3.tar.gz)
+- (cd extern; $(WGET) http://www2.math.uni-wuppertal.de/~xsc/xsc/cxsc/cxsc-2-5-4.tar.gz)
-
-$(FPLLLLIB).tar.gz:
- @echo "I can't find $@, so I'm going to download it"
diff --git a/debian/patches/upstream-migration-fplll-4_to_5.patch b/debian/patches/upstream-migration-fplll-4_to_5.patch
deleted file mode 100644
index e74b668..0000000
--- a/debian/patches/upstream-migration-fplll-4_to_5.patch
+++ /dev/null
@@ -1,141 +0,0 @@
-Description: migration: fplll 4 -> 5
- Attempt to migrate from fplll 4 to fplll 5;
- meant to be submitted to the upstream maintainer.
-Origin: vendor, Debian
-Forwarded: https://github.com/gap-packages/float/pull/13
-Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2016-10-15
-
---- a/m4/ac_check_fplll.m4
-+++ b/m4/ac_check_fplll.m4
-@@ -76,8 +76,10 @@
- LDFLAGS="$LDFLAGS $FPLLL_LDFLAGS $MPFR_CFLAGS"
- LIBS="$LIBS -lfplll -lgmp"
- AC_MSG_CHECKING([for lllReduction in -lfplll])
--AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <fplll.h>],
-- [ZZ_mat<mpz_t> M(3,3); lllReduction(M, 0.99, 0.51, LM_WRAPPER);])],[AC_MSG_RESULT([yes])],[temp_status=false; AC_MSG_RESULT([no])])
-+AC_LINK_IFELSE([AC_LANG_PROGRAM([#include <fplll.h>],[
-+ZZ_mat<mpz_t> M(3,3);
-+lll_reduction(M, 0.99, 0.51, LM_WRAPPER);
-+])],[AC_MSG_RESULT([yes])],[temp_status=false; AC_MSG_RESULT([no])])
- AC_LANG_POP([C++])
-
- if test "$temp_status" = false; then
---- a/src/fplll.C
-+++ b/src/fplll.C
-@@ -4,7 +4,7 @@
- *
- * @(#)$id: fr_dll.c,v 1.18 2010/10/26 05:19:40 gap exp $
- *
-- * Copyright (c) 2012, Laurent Bartholdi
-+ * Copyright (c) 2012-2016, Laurent Bartholdi
- *
- ****************************************************************************
- *
-@@ -30,6 +30,10 @@
- }
- #include <fplll.h>
-
-+#ifndef FPLLL_VERSION
-+#error obsolete fplll library
-+#endif
-+
- typedef Obj (*ObjFunc)(); // I never could get the () and * right
-
- template <class Z> void SET_INTOBJ(Z_NR<Z> &v, Obj z);
-@@ -38,8 +42,13 @@
- template<> void SET_INTOBJ(Z_NR<mpz_t> &v, Obj z) {
- if (IS_INTOBJ(z))
- v = INT_INTOBJ(z);
-- else
-- mpz_set(v.getData(), mpz_MPZ(MPZ_LONGINT(z)));
-+ else {
-+ mpz_t zz;
-+ mpz_init(zz);
-+ mpz_set(zz, mpz_MPZ(MPZ_LONGINT(z)));
-+ v = zz;
-+ mpz_clear(zz);
-+ }
- }
-
- template<> void SET_INTOBJ(Z_NR<long> &v, Obj z) {
-@@ -57,13 +66,18 @@
- }
-
- template<> Obj GET_INTOBJ(Z_NR<mpz_t> &v) {
-- return INT_mpz(v.getData());
-+ mpz_t z;
-+ mpz_init2 (z, 8*sizeof(long)+1);
-+ v.get_mpz(z);
-+ Obj o = INT_mpz(z);
-+ mpz_clear(z);
-+ return o;
- }
-
- template<> Obj GET_INTOBJ(Z_NR<long> &v) {
- mpz_t z;
- mpz_init2 (z, 8*sizeof(long)+1);
-- mpz_set_si(z,v.getData());
-+ mpz_set_si(z,v.get_si());
- Obj o = INT_mpz(z);
- mpz_clear(z);
- return o;
-@@ -72,7 +86,7 @@
- template<> Obj GET_INTOBJ(Z_NR<double> &v) {
- mpz_t z;
- mpz_init2 (z, 8*sizeof(double)+1);
-- mpz_set_d(z,v.getData());
-+ mpz_set_d(z,v.get_d());
- Obj o = INT_mpz(z);
- mpz_clear(z);
- return o;
-@@ -86,6 +100,7 @@
- }
-
- // in principle, the following 2 methods are not needed. However, mac's llvm-g++ requires them.
-+#if 0
- #ifdef __APPLE__
- void SET_Z(Integer &s, const Z_NR<double> &t)
- {
-@@ -97,12 +112,13 @@
- s = t.getData();
- }
- #endif
-+#endif
-
- template<class Z> Obj dofplll(Obj gapmat, Obj lllargs, Obj svpargs)
- {
- if (!IS_PLIST(gapmat)) return INTOBJ_INT(-1);
- Int numrows = LEN_PLIST(gapmat), numcols = -1;
--
-+
- for (int i = 1; i <= numrows; i++) {
- Obj row = ELM_PLIST(gapmat,i);
- if (numcols == -1)
-@@ -159,7 +175,7 @@
- if (IS_INTOBJ(v)) flags = INT_INTOBJ(v);
- else if (v != Fail) return INTOBJ_INT(-26);
- }
-- int result = lllReduction(mat, delta, eta, method, floatType, precision, flags);
-+ int result = lll_reduction(mat, delta, eta, method, floatType, precision, flags);
-
- if (result != RED_SUCCESS)
- return INTOBJ_INT(10*result+1);
-@@ -190,7 +206,7 @@
- for (int j = 0; j < numcols; j++)
- SET_Z(svpmat[i][j],mat[i][j]);
-
-- int result = shortestVector(svpmat, sol, method, flags);
-+ int result = shortest_vector(svpmat, sol, method, flags);
-
- if (result != RED_SUCCESS)
- return INTOBJ_INT(10*result+2);
-@@ -244,7 +260,7 @@
- }
- }
-
--static StructGVarFunc GVarFuncs [] = {
-+static StructGVarFunc GVarFuncs [] = {
- { "@FPLLL", 4, "mat, intType, lllargs, svpargs", (ObjFunc) FPLLL, "fplll.C:FPLLL" },
- { 0 }
- };
diff --git a/debian/patches/upstream-upgrade-tst-testall_g.patch b/debian/patches/upstream-upgrade-tst-testall_g.patch
deleted file mode 100644
index 955858c..0000000
--- a/debian/patches/upstream-upgrade-tst-testall_g.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-Description: upgrade: testall GAP test file
- Blind upgrade of the GAP test file tst/testall.g as suggested
- by the emitted messages; meant to silence GAP and eventually
- to be submitted to the upstream maintainer.
-Origin: vendor, Debian
-Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2016-04-29
-
---- a/tst/testall.g
-+++ b/tst/testall.g
-@@ -3,16 +3,16 @@
- dirs := DirectoriesPackageLibrary("float","tst");
-
- SetFloats(IEEE754FLOAT);
--ReadTest(Filename(dirs,"arithmetic.tst"));
-+Test(Filename(dirs,"arithmetic.tst"),rec(compareFunction:="uptowhitespace"));
- SetFloats(MPFR);
--ReadTest(Filename(dirs,"arithmetic.tst"));
-+Test(Filename(dirs,"arithmetic.tst"),rec(compareFunction:="uptowhitespace"));
- SetFloats(MPFI);
--ReadTest(Filename(dirs,"arithmetic.tst"));
-+Test(Filename(dirs,"arithmetic.tst"),rec(compareFunction:="uptowhitespace"));
- SetFloats(MPC);
--ReadTest(Filename(dirs,"arithmetic.tst"));
-+Test(Filename(dirs,"arithmetic.tst"),rec(compareFunction:="uptowhitespace"));
- field := MPC_PSEUDOFIELD;
--ReadTest(Filename(dirs,"polynomials.tst"));
-+Test(Filename(dirs,"polynomials.tst"),rec(compareFunction:="uptowhitespace"));
- SetFloats(CXSC);
--ReadTest(Filename(dirs,"arithmetic.tst"));
-+Test(Filename(dirs,"arithmetic.tst"),rec(compareFunction:="uptowhitespace"));
- field := CXSC_PSEUDOFIELD;
--ReadTest(Filename(dirs,"polynomials.tst"));
-+Test(Filename(dirs,"polynomials.tst"),rec(compareFunction:="uptowhitespace"));
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gap-float.git
More information about the debian-science-commits
mailing list