Upgrade fplll and fpylll

grhkm21 · Oct 17, 2017 · 2b0b4ab · 2b0b4ab
1 parent a2e82e1
commit 2b0b4ab
Show file tree

Hide file tree

Showing 18 changed files with 18 additions and 395 deletions.
diff --git a/COPYING.txt b/COPYING.txt
@@ -54,6 +54,7 @@ extcode                     GPLv2+
 fflas_ffpack                LGPLv2.1+
 flint                       GPLv2+
 flintqs                     GPLv2+
+fplll                       LGPLv2.1+
 freetype                    FreeType License (similar to BSD; see below)
 gap                         GPLv2+
 gcc                         GPLv3+
@@ -72,7 +73,6 @@ jinja2                      Modified BSD
 jmol                        LGPLv2.1+
 jsonschema                  MIT License
 lcalc                       GPLv2+
-libfplll                    LGPLv2.1+
 libgap                      GPLv3+
 libpng                      Custom, very similar to zlib
 linbox                      LGPLv2.1+

diff --git a/build/pkgs/libfplll/SPKG.txt → build/pkgs/fplll/SPKG.txt b/build/pkgs/libfplll/SPKG.txt → build/pkgs/fplll/SPKG.txt
@@ -2,7 +2,9 @@
 
 == Description ==
 
-fplll contains implementations of several lattice algorithms. The implementation relies on floating-point orthogonalization, and LLL is central to the code, hence the name.
+fplll contains implementations of several lattice algorithms. The
+implementation relies on floating-point orthogonalization, and LLL is
+central to the code, hence the name.
 
 Website: https://github.com/fplll/fplll
 

diff --git a/build/pkgs/fplll/checksums.ini b/build/pkgs/fplll/checksums.ini
@@ -0,0 +1,4 @@
+tarball=fplll-VERSION.tar.gz
+sha1=2c4ac07b0c60cb83df12f42c788b86e7b094eaa8
+md5=d4ddbaa1b74508441de0790a4660502c
+cksum=2577588673
diff --git a/build/pkgs/libfplll/dependencies → build/pkgs/fplll/dependencies b/build/pkgs/libfplll/dependencies → build/pkgs/fplll/dependencies
diff --git a/build/pkgs/fplll/package-version.txt b/build/pkgs/fplll/package-version.txt
@@ -0,0 +1 @@
+5.2.0
diff --git a/build/pkgs/libfplll/spkg-check → build/pkgs/fplll/spkg-check b/build/pkgs/libfplll/spkg-check → build/pkgs/fplll/spkg-check
diff --git a/build/pkgs/libfplll/spkg-install → build/pkgs/fplll/spkg-install b/build/pkgs/libfplll/spkg-install → build/pkgs/fplll/spkg-install
@@ -70,6 +70,6 @@ if [ $? -ne 0 ]; then
 fi
 
 
-# Pretend that the "fplll" package is not installed. This is needed to
-# support renaming libfplll -> fplll in the future.
-rm -f "$SAGE_SPKG_INST/"fplll-*
+# Pretend that the "libfplll" package is not installed. This is needed to
+# support renaming libfplll -> fplll done on Trac #24042
+rm -f "$SAGE_SPKG_INST/"libfplll-*
diff --git a/build/pkgs/libfplll/type → build/pkgs/fplll/type b/build/pkgs/libfplll/type → build/pkgs/fplll/type
diff --git a/build/pkgs/fpylll/checksums.ini b/build/pkgs/fpylll/checksums.ini
@@ -1,4 +1,4 @@
 tarball=fpylll-VERSION.tar.gz
-sha1=b680356c142f290ee8010a1d40590e0d31acf1bc
-md5=bd01c1bc85fa56537ff8575a9debe273
-cksum=2204491672
+sha1=ad8d7ac9d02d9bfa894bc7eb9ea2f41d870bed51
+md5=8402e0e3e10ec5e11aef5dc8c6769464
+cksum=1292939418
diff --git a/build/pkgs/fpylll/dependencies b/build/pkgs/fpylll/dependencies
@@ -1,4 +1,4 @@
-$(PYTHON) cython cysignals numpy libfplll
+$(PYTHON) cython cysignals numpy fplll
 
 ----------
 All lines of this file are ignored except the first.

diff --git a/build/pkgs/fpylll/package-version.txt b/build/pkgs/fpylll/package-version.txt
@@ -1 +1 @@
-0.2.4dev.p0
+0.3.0dev
diff --git a/build/pkgs/fpylll/patches/cygwin-long-double.patch b/build/pkgs/fpylll/patches/cygwin-long-double.patch
diff --git a/build/pkgs/libfplll/checksums.ini b/build/pkgs/libfplll/checksums.ini
diff --git a/build/pkgs/libfplll/package-version.txt b/build/pkgs/libfplll/package-version.txt
diff --git a/build/pkgs/libfplll/patches/01-tests-long-double.patch b/build/pkgs/libfplll/patches/01-tests-long-double.patch
diff --git a/build/pkgs/libfplll/patches/02-test-prunner.patch b/build/pkgs/libfplll/patches/02-test-prunner.patch