[gap-float] 04/04: Imported Debian patch 0.8.0+ds-1
Jerome Benoit
calculus-guest at moszumanska.debian.org
Sat Nov 11 15:25:42 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 bdaa56a5723c711aba01edc51b885b582cad6741
Author: Jerome Benoit <calculus at rezozer.net>
Date: Sat Nov 11 19:18:49 2017 +0400
Imported Debian patch 0.8.0+ds-1
---
debian/changelog | 15 ++-
debian/compat | 2 +-
debian/control | 8 +-
debian/patches/debianization.patch | 43 +++++---
debian/patches/series | 1 -
.../patches/upstream-autotoolization-cleanup.patch | 113 +++------------------
.../patches/upstream-fix-autotoolization-tst.patch | 27 -----
debian/rules | 2 +-
8 files changed, 60 insertions(+), 151 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index ea7d42b..feab923 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,13 +1,22 @@
-gap-float (0.8.0+ds-0) UNRELEASED; urgency=medium
+gap-float (0.8.0+ds-1) unstable; urgency=medium
* New upstream minor release.
* Debianization:
- debian/copyright:
- Files-Excluded field, refresh;
- debian/watch, harden;
- - debian/rules, refresh.
+ - debian/control:
+ - debhelper, bump to 10;
+ - Standards Version, bump to 4.1.1 (no change);
+ - Depends field, bump to gap 4r8p8;
+ - debian/patches/*:
+ - d/p/upstream-fix-autotoolization-tst.patch, integrated;
+ - d/p/upstream-autotoolization-cleanup.patch, refresh;
+ - debian/rules:
+ - debhelper, bump to 10;
+ - refresh.
- -- Jerome Benoit <calculus at rezozer.net> Sat, 11 Nov 2017 09:46:22 +0000
+ -- Jerome Benoit <calculus at rezozer.net> Sat, 11 Nov 2017 15:15:54 +0000
gap-float (0.7.6+ds-3) unstable; urgency=medium
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 27fb6fe..b163451 100644
--- a/debian/control
+++ b/debian/control
@@ -4,12 +4,12 @@ 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), quilt, autotools-dev, libtool, dh-autoreconf, autoconf-archive,
- gap (>=4r8p7), gap-dev (>=4r8p7), gap-gapdoc,
+ debhelper (>= 10), quilt, libtool, autoconf-archive,
+ gap (>=4r8p8), gap-dev (>=4r8p8), gap-gapdoc,
libgmp-dev, libmpfr-dev, libmpc-dev, libmpfi-dev, libfplll-dev (>=5.1),
# libcxsc-dev,
texlive-latex-recommended, texlive-fonts-recommended, texlive-latex-extra
-Standards-Version: 4.0.0
+Standards-Version: 4.1.1
Homepage: http://www.gap-system.org/Packages/float.html
Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/gap-float.git
Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/gap-float.git/
@@ -17,7 +17,7 @@ Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/gap-float.g
Package: gap-float
Provides: gap-pkg-float
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, gap (>=4r8p7)
+Depends: ${misc:Depends}, ${shlibs:Depends}, gap (>=4r8p8)
Description: multi-precision floating-point computation for GAP
GAP is a system for computational discrete algebra with particular
emphasis on computational group theory, but which has already proved
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index ae3a6f4..46e8cde 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -2,7 +2,7 @@ Description: debianization
Meant to maintain a minimal debian/rules, to fix warnings,
to address Debian specific stuff in general.
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2016-10-14
+Last-Update: 2017-11-11
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,17 +38,30 @@ Last-Update: 2016-10-14
float_la_SOURCES += mpfr.c
--- a/tst/testall.g
+++ b/tst/testall.g
-@@ -12,9 +12,9 @@
- Test(Filename(dirs,"arithmetic.tst"),rec(compareFunction:="uptowhitespace"));
- field := MPC_PSEUDOFIELD;
- Test(Filename(dirs,"polynomials.tst"),rec(compareFunction:="uptowhitespace"));
--SetFloats(CXSC);
--Test(Filename(dirs,"arithmetic.tst"),rec(compareFunction:="uptowhitespace"));
--field := CXSC_PSEUDOFIELD;
--Test(Filename(dirs,"polynomials.tst"),rec(compareFunction:="uptowhitespace"));
-+##SetFloats(CXSC);
-+##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"));
+@@ -35,16 +35,16 @@
+ Print("#I WARNING: skipping tests for MPC\n");
+ fi;
+
+-if IsBound(CXSC_INT) then
+- Print("#I testing CXSC...\n");
+- SetFloats(CXSC);
+- success := success and Test(Filename(dirs,"arithmetic.tst"));
+-
+- field := CXSC_PSEUDOFIELD;
+- success := success and Test(Filename(dirs,"polynomials.tst"));
+-else
+- Print("#I WARNING: skipping tests for CXSC\n");
+-fi;
++##if IsBound(CXSC_INT) then
++## Print("#I testing CXSC...\n");
++## SetFloats(CXSC);
++## success := success and Test(Filename(dirs,"arithmetic.tst"));
++##
++## field := CXSC_PSEUDOFIELD;
++## success := success and Test(Filename(dirs,"polynomials.tst"));
++##else
++## Print("#I WARNING: skipping tests for CXSC\n");
++##fi;
+
+ if IsBound(@FPLLL) then
+ Print("#I testing FPLLL...\n");
diff --git a/debian/patches/series b/debian/patches/series
index 4ce27a9..f8105f1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-upstream-fix-autotoolization-tst.patch
upstream-fix-gapdoc-bib.patch
upstream-autotoolization-cleanup.patch
upstream-update-m4_ac_find_gap_m4.patch
diff --git a/debian/patches/upstream-autotoolization-cleanup.patch b/debian/patches/upstream-autotoolization-cleanup.patch
index 46015fb..9a58e20 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: 2017-05-16
+Last-Update: 2017-11-11
--- a/configure.ac
+++ b/configure.ac
@@ -10,11 +10,11 @@ Last-Update: 2017-05-16
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.6],[laurent.bartholdi at gmail.com])
++AC_INIT([float],[0.8.0],[laurent.bartholdi at gmail.com])
AC_CONFIG_SRCDIR([src/float.c])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
-@@ -76,9 +76,9 @@
+@@ -58,9 +58,9 @@
################################################################
# generate files
@@ -27,7 +27,7 @@ Last-Update: 2017-05-16
##CONFIG_STATUS=bin/$GAPARCH/config.status
##
##AC_CONFIG_FILES([$GAP_MAKEFILE:Makefile.in])
-@@ -90,5 +90,7 @@
+@@ -72,5 +72,7 @@
AC_CONFIG_FILES([
Makefile
src/Makefile
@@ -47,7 +47,7 @@ Last-Update: 2017-05-16
EXTRA_DIST = \
--- a/Makefile.am
+++ b/Makefile.am
-@@ -14,115 +14,20 @@
+@@ -14,30 +14,20 @@
#AM_DISTCHECK_CONFIGURE_FLAGS =
@@ -58,116 +58,31 @@ Last-Update: 2017-05-16
+pkgdatadir = @datadir@/gap/pkg/@PACKAGE@
-VERSION:=$(shell grep '^Version :=' PackageInfo.g | cut -f2 -d'"')
+-
+-LOCALBIN=bin/@GAPARCH@
+-
+-EXTERN=$(CURDIR)/bin/@GAPARCH@/extern
+pkgdata_DATA = \
+ PackageInfo.g \
+ init.g \
+ read.g
--LOCALBIN=bin/@GAPARCH@
+-Changelog:
+- gitlog-to-changelog > $@
+EXTRA_DIST = \
+ $(pkgdata_DATA)
--EXTERN=$(CURDIR)/bin/@GAPARCH@/extern
-+export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner
-
--MPFRLIB=extern/mpfr-3.1.5
--MPFILIB=extern/mpfi-1.5.1
--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.5/mpfr-3.1.5.tar.bz2)
--
--$(MPFILIB).tar.bz2:
-- @echo "I can't find $@, so I'm going to download it"
-- mkdir -p extern
-- (cd extern; $(WGET) @WGET_NOCERTIFICATE@ https://gforge.inria.fr/frs/download.php/30129/mpfi-1.5.1.tar.bz2)
--
--$(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.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-4.tar.gz)
--
--$(FPLLLLIB).tar.gz:
-- @echo "I can't find $@, so I'm going to download it"
-- mkdir -p extern
-- (cd extern; $(WGET) http://xpujol.net/fplll/libfplll-4.0.1.tar.gz)
--
--mpfr: $(MPFRLIB).tar.bz2
-- mkdir -p $(EXTERN)/include $(EXTERN)/lib
-- if ! test -r $(EXTERN)/include/mpfr.h; then \
-- rm -rf $(MPFRLIB) && \
-- tar -x -f $(MPFRLIB).tar.bz2 -j -C extern && \
-- cd $(MPFRLIB) && \
-- ./configure $(WITH_GMP) --prefix=$(EXTERN) && \
-- $(MAKE) install; \
-- fi
--
--mpfi: $(MPFILIB).tar.bz2
-- mkdir -p $(EXTERN)/include $(EXTERN)/lib
-- if ! test -r $(EXTERN)/include/mpfi.h; then \
-- rm -rf $(MPFILIB) && \
-- tar -x -f $(MPFILIB).tar.bz2 -j -C extern && \
-- cd $(MPFILIB) && \
-- ./configure $(WITH_GMP) --prefix=$(EXTERN) && \
-- $(MAKE) install; \
-- fi
--
--mpc: $(MPCLIB).tar.gz
-- mkdir -p $(EXTERN)/include $(EXTERN)/lib
-- if ! test -r $(EXTERN)/include/mpc.h; then \
-- rm -rf $(MPCLIB) && \
-- tar -x -f $(MPCLIB).tar.gz -z -C extern && \
-- cd $(MPCLIB) && \
-- ./configure $(WITH_GMP) --prefix=$(EXTERN) && \
-- $(MAKE) install; \
-- fi
--
--cxsc: $(CXSCLIB).tar.gz
-- mkdir -p $(EXTERN)
-- rm -f $(EXTERN)/cxsc
-- ln -s . $(EXTERN)/cxsc
-- if ! test -r $(EXTERN)/include/real.hpp; then \
-- rm -rf $(CXSCLIB) && \
-- tar -x -f $(CXSCLIB).tar.gz -z -C extern && \
-- cd $(CXSCLIB) && \
-- (echo "yes"; for i in 1 2 3 4 5 6 7 8 9 10; do echo ""; done) | \
-- HOME=$(EXTERN) ./install_cxsc; \
-- fi
--
--fplll: $(FPLLLLIB).tar.gz
-- mkdir -p $(EXTERN)/include $(EXTERN)/lib
-- if ! test -r $(EXTERN)/include/fplll.h; then \
-- rm -rf $(FPLLLLIB) && \
-- tar -x -f $(FPLLLLIB).tar.gz -z -C extern && \
-- cd $(FPLLLLIB) && \
-- ./configure CPPFLAGS="-I$(GMP_ROOT)/include $(CPPFLAGS)" LDFLAGS="-L$(GMP_ROOT)/lib $(LDFLAGS)" $(WITH_GMP) --prefix=$(EXTERN) && \
-- $(MAKE) install; \
-- fi
--
--Changelog:
-- gitlog-to-changelog > $@
--
-doc: doc/float.xml gap/*.gd
- @GAPROOT@/bin/gap.sh -A makedoc.g
--
++export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner
+
-checkblocks:
- grep '<#GAPDoc' PackageInfo.g lib/*d | awk -F'"' '{print $$2}' | sort > @@-blocks
- grep '<#Include' doc/float.xml | awk -F'"' '{print $$2}' | sort > @@-in
- comm -3 @@-blocks @@-in
- @rm @@-blocks @@-in
-
--all: @MAKE_LIBTARGETS@ all-recursive
+-all: all-recursive
- mkdir -p bin/@GAPARCH@
- cp src/.libs/float.so bin/@GAPARCH@/
+VERSION:=$(shell grep '^Version :=' PackageInfo.g | cut -f2 -d'"')
diff --git a/debian/patches/upstream-fix-autotoolization-tst.patch b/debian/patches/upstream-fix-autotoolization-tst.patch
deleted file mode 100644
index d830484..0000000
--- a/debian/patches/upstream-fix-autotoolization-tst.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-Description: fix automake machinery for tst
-Origin: vendor, Debian
-Author: Jerome Benoit <calculus at rezozer.net>
-Forwarded: https://github.com/gap-packages/float/pull/21
-Last-Update: 2017-06-02
-
---- a/tst/Makefile.am
-+++ b/tst/Makefile.am
-@@ -2,7 +2,7 @@
- ##
- #W tst/Makefile.am Laurent Bartholdi
- ##
--#Y Copyright (C) 2014, Laurent Bartholdi
-+#Y Copyright (C) 2014-2017, Laurent Bartholdi
- ##
- #############################################################################
-
-@@ -11,7 +11,8 @@
- tst_DATA = \
- testall.g \
- arithmetic.tst \
-- polynomials.tst
-+ polynomials.tst \
-+ fplll.tst
-
- EXTRA_DIST = \
- $(tst_DATA)
diff --git a/debian/rules b/debian/rules
index def8543..486e41b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,7 @@ default:
@uscan --no-conf --dehs --report || true
%:
- dh $@ --with autoreconf
+ dh $@
override_dh_auto_configure:
dh_auto_configure -- \
--
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