[gap-float] 04/04: Imported Debian patch 0.7.4+ds-1
Jerome Benoit
calculus-guest at moszumanska.debian.org
Fri Oct 14 04:15:22 UTC 2016
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 cd3276ae7bb97de727da30576a9c2dbf015088de
Author: Jerome Benoit <calculus at rezozer.net>
Date: Fri Oct 14 05:02:40 2016 +0100
Imported Debian patch 0.7.4+ds-1
---
debian/changelog | 13 +-
debian/clean | 13 ++
debian/control | 4 +-
debian/gap-float.docs | 2 +
debian/gap-float.install | 2 +
debian/gap-float.lintian-overrides | 6 +-
debian/patches/debianization-documentation.patch | 16 ++
debian/patches/debianization.patch | 14 +-
debian/patches/series | 2 +-
.../patches/upstream-autotoolization-cleanup.patch | 62 +++-----
debian/patches/upstream-autotoolization-doc.patch | 62 --------
debian/patches/upstream-fix-gapdoc-bib.patch | 24 +--
.../upstream-update-m4_ac_find_gap_m4.patch | 172 +--------------------
.../patches/upstream-upgrade-tst-testall_g.patch | 2 +-
debian/rules | 4 +
debian/source/lintian-overrides | 3 +
debian/tests/makecheck.tst | 2 +-
17 files changed, 93 insertions(+), 310 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index d290117..5108a08 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-gap-float (0.7.4+ds-0) UNRELEASE; urgency=medium
+gap-float (0.7.4+ds-1) unstable; urgency=medium
* New upstream release.
* Debianization:
@@ -9,10 +9,17 @@ gap-float (0.7.4+ds-0) UNRELEASE; urgency=medium
- debian/copyright:
- Files-Excluded field, introduce;
- refresh;
+ - debian/patches/*patch:
+ - d/p/upstream-autotoolization-doc.patch, discard;
+ - d/p/debianization-documentation.patch, introduce;
+ - Origin field, correct;
+ - refresh;
- debian/rules:
- - get-orig-source field, add compression scheme.
+ - dh_prep, override to compose documentation;
+ - get-orig-source field, add compression scheme;
+ - refresh.
- -- Jerome Benoit <calculus at rezozer.net> Thu, 13 Oct 2016 04:28:42 +0000
+ -- Jerome Benoit <calculus at rezozer.net> Fri, 14 Oct 2016 04:11:24 +0000
gap-float (0.6.3+ds-3) unstable; urgency=medium
diff --git a/debian/clean b/debian/clean
index ea08cc5..e1f9476 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1 +1,14 @@
+doc/chap*.txt
+doc/chap*.html
+doc/chooser.html
+doc/float.{tex,aux,out,brf,toc,log,bbl,blg,ind,idx,ilg,pnr}
+doc/manual.{six,lab}
+doc/manual.pdf
+doc/lefttoc.css
+doc/manual.{css,js}
+doc/nocolorprompt.css
+doc/ragged.css
+doc/rainbow.js
+doc/times.css
+doc/toggless.{css,js}
doc/mathjax
diff --git a/debian/control b/debian/control
index cbbc139..132ac7f 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.
Uploaders: Jerome Benoit <calculus at rezozer.net>
Build-Depends:
debhelper (>= 9), quilt, autotools-dev, libtool, dh-autoreconf, autoconf-archive,
- gap (>=4r8p4), gap-dev (>=4r8p4), gap-gapdoc,
+ gap (>=4r8p3), gap-dev (>=4r8p3), gap-gapdoc,
libgmp-dev, libmpfr-dev, libmpc-dev, libmpfi-dev, libfplll-dev,
# libcxsc-dev,
texlive-latex-recommended, texlive-fonts-recommended, texlive-latex-extra
@@ -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 (>=4r8p4)
+Depends: ${misc:Depends}, ${shlibs:Depends}, gap (>=4r8p3)
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/gap-float.docs b/debian/gap-float.docs
new file mode 100644
index 0000000..e4cf55f
--- /dev/null
+++ b/debian/gap-float.docs
@@ -0,0 +1,2 @@
+README
+THANKS
diff --git a/debian/gap-float.install b/debian/gap-float.install
index afe8cdf..4247cc5 100644
--- a/debian/gap-float.install
+++ b/debian/gap-float.install
@@ -1,2 +1,4 @@
usr/lib/*/gap/pkg/float/bin/float.so
usr/share/gap/pkg/float/* usr/share/gap/pkg/float
+doc/*.txt doc/*.html doc/manual.lab doc/manual.six doc/manual.pdf usr/share/gap/pkg/float/doc
+doc/mathjax doc/manual.css doc/manual.js usr/share/gap/pkg/float/doc
diff --git a/debian/gap-float.lintian-overrides b/debian/gap-float.lintian-overrides
index 39260df..17a770b 100644
--- a/debian/gap-float.lintian-overrides
+++ b/debian/gap-float.lintian-overrides
@@ -1,2 +1,6 @@
-# the provided SO material is a pluggin which contains some lazy/loosy C++ symbols
+# The upstream source tarball contains no ChangeLog file.
+gap-float: no-upstream-changelog
+
+# The provided SO material is a pluggin which
+# contains some lazy/loosy C++ symbols.
gap-float: hardening-no-bindnow
diff --git a/debian/patches/debianization-documentation.patch b/debian/patches/debianization-documentation.patch
new file mode 100644
index 0000000..a39a160
--- /dev/null
+++ b/debian/patches/debianization-documentation.patch
@@ -0,0 +1,16 @@
+Description: debianization: documentation
+ Meant to address Debian specific requirements and stuff for documentation.
+Origin: vendor, Debian
+Author: Jerome Benoit <calculus at rezozer.net>
+Last-Update: 2016-10-14
+
+--- a/makedoc.g
++++ b/makedoc.g
+@@ -1,3 +1,7 @@
++SetPackagePath("float",".");
++LoadPackage("GAPDoc");
++##LoadPackage("float");
++
+ #if fail = LoadPackage("AutoDoc", ">= 2016.01.21") then
+ # Error("AutoDoc 2016.01.21 or newer is required");
+ #fi;
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index a51317a..6580a14 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -2,25 +2,25 @@ 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: 2014-08-17
+Last-Update: 2016-10-14
--- a/Makefile.am
+++ b/Makefile.am
-@@ -14,7 +14,8 @@
- dist-bzip2 \
+@@ -12,7 +12,8 @@
+ foreign \
std-options
-#AM_DISTCHECK_CONFIGURE_FLAGS =
+AM_DISTCHECK_CONFIGURE_FLAGS ?= \
+ --with-cxsc=no
- SUBDIRS = src lib tst doc
+ SUBDIRS = src lib tst
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -8,14 +8,14 @@
-
- EXTERN=$(CURDIR)/bin/@GAPARCH@/extern
+@@ -10,14 +10,14 @@
+ GMP_CFLAGS=@GMP_CFLAGS@
+ GMP_LDFLAGS=@GMP_LDFLAGS@
-libdir = $(GAPROOT)/pkg/$(PACKAGE)/bin/$(GAPARCH)
+gaplibdir = $(libdir)/gap/pkg/$(PACKAGE)/bin
diff --git a/debian/patches/series b/debian/patches/series
index 850a71c..719eef5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,5 @@ upstream-fix-gapdoc-bib.patch
upstream-upgrade-tst-testall_g.patch
upstream-autotoolization-cleanup.patch
upstream-update-m4_ac_find_gap_m4.patch
-upstream-autotoolization-doc.patch
debianization.patch
+debianization-documentation.patch
diff --git a/debian/patches/upstream-autotoolization-cleanup.patch b/debian/patches/upstream-autotoolization-cleanup.patch
index 3a2fb55..d9baf7c 100644
--- a/debian/patches/upstream-autotoolization-cleanup.patch
+++ b/debian/patches/upstream-autotoolization-cleanup.patch
@@ -1,7 +1,7 @@
Description: cleanup autotools machinery
-Origin: debian
+Origin: vendor, Debian
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2014-08-19
+Last-Update: 2016-10-14
--- a/configure.ac
+++ b/configure.ac
@@ -10,11 +10,11 @@ Last-Update: 2014-08-19
AC_PREREQ(2.65)
LT_PREREQ([2.4.2])
-AC_INIT([float],[0.5.18],[laurent.bartholdi at gmail.com])
-+AC_INIT([float],[0.6.0],[laurent.bartholdi at gmail.com])
++AC_INIT([float],[0.7.4],[laurent.bartholdi at gmail.com])
AC_CONFIG_SRCDIR([src/float.c])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
-@@ -74,9 +74,9 @@
+@@ -76,9 +76,9 @@
################################################################
# generate files
@@ -27,29 +27,36 @@ Last-Update: 2014-08-19
##CONFIG_STATUS=bin/$GAPARCH/config.status
##
##AC_CONFIG_FILES([$GAP_MAKEFILE:Makefile.in])
-@@ -88,6 +88,8 @@
+@@ -90,5 +90,7 @@
AC_CONFIG_FILES([
Makefile
src/Makefile
+ lib/Makefile
+ tst/Makefile
- doc/Makefile
])
AC_OUTPUT
+--- a/lib/Makefile.am
++++ b/lib/Makefile.am
+@@ -16,6 +16,7 @@
+ fplll.gi \
+ cxsc.gi \
+ polynomial.gi \
++ pslq.gi \
+ pickle.g
+
+ EXTRA_DIST = \
--- a/Makefile.am
+++ b/Makefile.am
-@@ -16,135 +16,20 @@
+@@ -14,114 +14,20 @@
#AM_DISTCHECK_CONFIGURE_FLAGS =
--SUBDIRS = src doc
-+SUBDIRS = src lib tst doc
+-SUBDIRS = src
++SUBDIRS = src lib tst
-EXTRA_DIST =
+pkgdatadir = @datadir@/gap/pkg/@PACKAGE@
--export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner
--
-VERSION:=$(shell grep '^Version :=' PackageInfo.g | cut -f2 -d'"')
+pkgdata_DATA = \
+ PackageInfo.g \
@@ -150,18 +157,8 @@ Last-Update: 2014-08-19
-Changelog:
- gitlog-to-changelog > $@
-
--tarball: Changelog doc
-- mkdir float-$(VERSION)
-- COPYFILE_DISABLE=true tar -c -f - --exclude float-$(VERSION) --exclude 'float-*gz*' --exclude '*~' --exclude '.[a-z]*' --exclude '*.l[ao]' --exclude 'stamp-*' --exclude config.log --exclude Makefile --exclude autom4te.cache --exclude bin --exclude extern . | (cd float-$(VERSION); tar xf -)
-- COPYFILE_DISABLE=true tar -c -z -f float-$(VERSION).tar.gz float-$(VERSION)
-- rm -rf float-$(VERSION)
-- gpg --default-key 184873BE --armor --detach-sign --yes float-$(VERSION).tar.gz
-- scp float-$(VERSION).tar.gz* rlaurent.uni-math.gwdg.de:public_html/archive/
--
--doc: doc/chap0.html
--
--doc/chap0.html: doc/float.xml doc/floatbib.xml lib/float.gd
-- echo 'LoadPackage("float"); DOC at FLOAT();' | @GAP_EXEC@ -r -q -T -l ";$(PWDUU)"
+-doc: doc/float.xml gap/*.gd
+- @GAPROOT@/bin/gap.sh -A makedoc.g
-
-checkblocks:
- grep '<#GAPDoc' PackageInfo.g lib/*d | awk -F'"' '{print $$2}' | sort > @@-blocks
@@ -169,28 +166,9 @@ Last-Update: 2014-08-19
- comm -3 @@-blocks @@-in
- @rm @@-blocks @@-in
-
--wwwdir: doc
-- git tag -f $(VERSION)
-- git push origin :refs/tags/$(VERSION)
-- git push --tags
-- cp PackageInfo.g doc/
-- cp README doc/README.float
-- (cd doc; git add *.html manual.pdf manual.css PackageInfo.g README.float; git commit -m 'New html files'; git push github master:gh-pages --force)
-- rm doc/PackageInfo.g doc/README.float
--
-all: @MAKE_LIBTARGETS@ all-recursive
- mkdir -p bin/@GAPARCH@
- cp src/.libs/float.so bin/@GAPARCH@/
+VERSION:=$(shell grep '^Version :=' PackageInfo.g | cut -f2 -d'"')
#E Makefile.am . . . . . . . . . . . . . . . . . . . . . . . . . . . ends here
---- a/lib/Makefile.am
-+++ b/lib/Makefile.am
-@@ -16,6 +16,7 @@
- fplll.gi \
- cxsc.gi \
- polynomial.gi \
-+ pslq.gi \
- pickle.g
-
- EXTRA_DIST = \
diff --git a/debian/patches/upstream-autotoolization-doc.patch b/debian/patches/upstream-autotoolization-doc.patch
deleted file mode 100644
index 9ce46f9..0000000
--- a/debian/patches/upstream-autotoolization-doc.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-Description: documentation autotools machinery enhancement
- Oververride of the upstream documentation autotools machinery
- that avoids the load of the involved GAP package.
-Origin: debian
-Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2014-08-19
-
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -6,23 +6,28 @@
- ##
- #############################################################################
-
--docdir = $(GAPROOT)/pkg/$(PACKAGE)/doc
-+docdir = @datadir@/gap/pkg/@PACKAGE@/doc
-
--all-local: doc
-+doc_DATA = \
-+ chapBib.txt chapInd.txt chap0.txt chap1.txt chap2.txt chap3.txt chap4.txt \
-+ chapBib.html chapInd.html chap0.html chap1.html chap2.html chap3.html chap4.html \
-+ chooser.html \
-+ manual.css manual.js \
-+ manual.six \
-+ manual.pdf \
-+ manual.lab
-
--doc: manual.six
-+$(doc_DATA): float.xml float.bib
-+ cd $(top_srcdir) && cat makedoc.g | $(CGAP) -A -q -T > /dev/null
-
--manual.six: float.xml float.bib
-- cd $(top_srcdir) && echo 'LoadPackage("float"); DOC at FLOAT();' | $(CGAP) -A -q -T
-+clean-local:
-+ rm -f float.tex
-+ rm -f float.aux float.idx float.bbl float.ind float.out float.toc float.pnr float.brf
-+ rm -f float.log float.blg float.ilg
-
- distclean-local:
-- rm -f chap*.txt chap*.html index.html chooser.html
- rm -f lefttoc.css ragged.css times.css toggless.css nocolorprompt.css
- rm -f rainbow.js toggless.js
-- rm -f manual.six manual.css manual.js manual.lab
-- rm -f manual.pdf
-- rm -f float.tex
-- rm -f float.aux float.idx float.bbl float.ind float.out float.toc float.pnr float.brf
-- rm -f float.log float.blg float.ilg
-+ rm -f $(doc_DATA)
-
- #E doc/Makefile.am . . . . . . . . . . . . . . . . . . . . . . . . . ends here
---- /dev/null
-+++ b/makedoc.g
-@@ -0,0 +1,10 @@
-+SetPackagePath("float",".");
-+LoadPackage("GAPDoc");
-+##LoadPackage("float");
-+MakeGAPDocDoc("./doc","float",[
-+ "../lib/float.gd",
-+ "../lib/pslq.gi",
-+ "../PackageInfo.g"
-+ ],"float");;
-+CopyHTMLStyleFiles("doc");
-+GAPDocManualLab("Float");
diff --git a/debian/patches/upstream-fix-gapdoc-bib.patch b/debian/patches/upstream-fix-gapdoc-bib.patch
index cc19e08..9afc681 100644
--- a/debian/patches/upstream-fix-gapdoc-bib.patch
+++ b/debian/patches/upstream-fix-gapdoc-bib.patch
@@ -1,28 +1,8 @@
Description: fix GAPDoc bibliography composition
-Origin: debian
+Origin: vendor, Debian
Author: Jerome Benoit <calculus at rezozer.net>
Last-Update: 2014-09-24
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -12,7 +12,7 @@
-
- doc: manual.six
-
--manual.six: float.xml floatbib.xml
-+manual.six: float.xml float.bib
- cd $(top_srcdir) && echo 'LoadPackage("float"); DOC at FLOAT();' | $(GAP_EXEC) -A -q -T
-
- distclean-local:
-@@ -22,7 +22,7 @@
- rm -f manual.six manual.css manual.js manual.lab
- rm -f manual.pdf
- rm -f float.tex
-- rm -f float.aux float.idx float.bbl float.ind float.out float.toc float.pnr
-+ rm -f float.aux float.idx float.bbl float.ind float.out float.toc float.pnr float.brf
- rm -f float.log float.blg float.ilg
-
- #E doc/Makefile.am . . . . . . . . . . . . . . . . . . . . . . . . . ends here
--- /dev/null
+++ b/doc/float.bib
@@ -0,0 +1,23 @@
@@ -77,7 +57,7 @@ Last-Update: 2014-09-24
-}
--- a/doc/float.xml
+++ b/doc/float.xml
-@@ -209,7 +209,7 @@
+@@ -216,7 +216,7 @@
</Body>
diff --git a/debian/patches/upstream-update-m4_ac_find_gap_m4.patch b/debian/patches/upstream-update-m4_ac_find_gap_m4.patch
index 0593aa6..da47ee0 100644
--- a/debian/patches/upstream-update-m4_ac_find_gap_m4.patch
+++ b/debian/patches/upstream-update-m4_ac_find_gap_m4.patch
@@ -2,168 +2,15 @@ Description: update AC_FIND_GAP m4 macro
Import m4/ac_find_gap.m4 from the gap-io GitHub git repository
and add material to find the GAP command-line interface wrt
the adopted style and customary naminf scheme.
-Origin: debian
+Origin: vendor, Debian
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2014-08-19
+Last-Update: 2016-10-14
--- a/m4/ac_find_gap.m4
+++ b/m4/ac_find_gap.m4
-@@ -6,7 +6,7 @@
- AC_DEFUN([AC_FIND_GAP],
- [
- AC_LANG_PUSH([C])
--
-+
- # Make sure CDPATH is portably set to a sensible value
- CDPATH=${ZSH_VERSION+.}:
-
-@@ -19,31 +19,27 @@
- variable empty for GAP versions < 4.5.])
- if test "x$CONFIGNAME" = "x"; then
- SYSINFO="sysinfo.gap"
-- GAP_MAKEFILE="Makefile"
-- GAP_EXEC="gap.sh"
- AC_MSG_RESULT([none])
- else
- SYSINFO="sysinfo.gap-$CONFIGNAME"
-- GAP_MAKEFILE="Makefile-$CONFIGNAME"
-- GAP_EXEC="gap-$CONFIGNAME.sh"
- AC_MSG_RESULT([$CONFIGNAME])
- fi
-
- ######################################
-- # Find the GAP root directory by
-- # checking for the sysinfo.gap file
-+ # Find the GAP root directory by
-+ # checking for the sysinfo.gap file
- AC_MSG_CHECKING([for GAP root directory])
-- DEFAULT_GAPROOTS="../.. /usr/local/src/gap /usr/local/gap4r5"
--
-+ DEFAULT_GAPROOTS="../.."
-+
- #Allow the user to specify the location of GAP
- #
-- AC_ARG_WITH(gaproot,
-+ AC_ARG_WITH(gaproot,
- [AC_HELP_STRING([--with-gaproot=<path>], [specify root of GAP installation])],
- [DEFAULT_GAPROOTS="$withval"])
--
-+
- havesysinfo=0
- # Otherwise try likely directories
-- for GAPROOT in ${DEFAULT_GAPROOTS}
-+ for GAPROOT in ${DEFAULT_GAPROOTS}
- do
- # Convert the path to absolute
- GAPROOT=`cd $GAPROOT > /dev/null 2>&1 && pwd`
-@@ -52,12 +48,12 @@
- break
- fi
- done
--
-+
- if test "x$havesysinfo" = "x1"; then
- AC_MSG_RESULT([${GAPROOT}])
- else
- AC_MSG_RESULT([Not found])
--
-+
- echo ""
- echo "********************************************************************"
- echo " ERROR"
-@@ -70,13 +66,13 @@
- echo " src/ and bin/."
- echo "********************************************************************"
- echo ""
--
-+
- AC_MSG_ERROR([Unable to find GAP root directory])
- fi
--
-+
- #####################################
- # Now find the architecture
--
-+
- AC_MSG_CHECKING([for GAP architecture])
- GAPARCH="Unknown"
- . $GAPROOT/$SYSINFO
-@@ -84,11 +80,11 @@
- GAPARCH=$GAParch
- fi
-
-- AC_ARG_WITH(gaparch,
-+ AC_ARG_WITH(gaparch,
- [AC_HELP_STRING([--with-gaparch=<path>], [override GAP architecture string])],
- [GAPARCH=$withval])
- AC_MSG_RESULT([${GAPARCH}])
--
-+
- if test "x$GAPARCH" = "xUnknown" -o ! -d $GAPROOT/bin/$GAPARCH ; then
- echo ""
- echo "********************************************************************"
-@@ -102,17 +98,11 @@
- echo " GAP installation."
- echo "********************************************************************"
- echo ""
--
-- AC_MSG_ERROR([Unable to find plausible GAParch information.])
-- fi
-
-- GAPARCH_SYSTEM_GUESS="`$ac_aux_dir/config.guess`-$CC-`echo $GAPARCH | sed 's/.*-//'`"
-- if test "$GAPARCH_SYSTEM_GUESS" != "$GAParch_system"; then
-- echo "********************************************************************"
-- AC_WARN([The guessed target $GAPARCH_SYSTEM_GUESS is not the gap target $GAParch_system. Cross your fingers])
-- echo "********************************************************************"
-+ AC_MSG_ERROR([Unable to find plausible GAParch information.])
- fi
-
-+
- #####################################
- # Now check for the GAP header files
-
-@@ -145,7 +135,7 @@
- echo " in particular the files"
- echo " <gaproot>/sysinfo.gap"
- echo " <gaproot>/src/<includes>"
-- echo " and <gaproot>/bin/<architecture>/bin/config.h."
-+ echo " and <gaproot>/bin/<architecture>/bin/config.h."
- echo " Please make sure that your GAP root directory structure"
- echo " conforms to this layout, or give the correct GAP root using"
- echo " --with-gaproot=<path>"
-@@ -153,31 +143,39 @@
- echo ""
- AC_MSG_ERROR([Unable to find GAP include files in /src subdirectory])
- fi
--
-+
- ARCHPATH=$GAPROOT/bin/$GAPARCH
- GAP_CPPFLAGS="-I$GAPROOT -I$ARCHPATH"
-
- AC_MSG_CHECKING([for GAP's gmp.h location])
- if test -r "$ARCHPATH/extern/gmp/include/gmp.h"; then
- GAP_CPPFLAGS="$GAP_CPPFLAGS -I$ARCHPATH/extern/gmp/include"
-- GMP_ROOT="$ARCHPATH/extern/gmp"
- AC_MSG_RESULT([$ARCHPATH/extern/gmp/include/gmp.h])
-- elif `grep -q 'define USE_GMP 1' $ARCHPATH/config.h`; then
-- eval `grep '^GMP_CFLAGS=' $GAPROOT/$GAP_MAKEFILE`
-- GAP_CPPFLAGS="$GAP_CPPFLAGS $GMP_CFLAGS"
-- GMP_ROOT=`echo "$GMP_CFLAGS" | cut -c3- | sed 's,/include$,,'`
-- AC_MSG_RESULT([$GMP_ROOT/include/gmp.h])
- else
- AC_MSG_RESULT([not found, GAP was compiled without GMP])
-- fi
-+ fi;
-
-- GMP_WITH="--with-gmp=$GMP_ROOT"
-- GAP_EXEC="$GAPROOT/bin/$GAP_EXEC"
- AC_SUBST(GAPARCH)
- AC_SUBST(GAPROOT)
+@@ -160,4 +160,22 @@
AC_SUBST(GAP_CPPFLAGS)
-- AC_SUBST(GAP_EXEC)
-- AC_SUBST(GMP_ROOT)
-- AC_SUBST(GMP_WITH)
-+
+
AC_LANG_POP([C])
+
+ ###############################################
@@ -184,14 +31,3 @@ Last-Update: 2014-08-19
+ fi
+
])
---- a/doc/Makefile.am
-+++ b/doc/Makefile.am
-@@ -13,7 +13,7 @@
- doc: manual.six
-
- manual.six: float.xml float.bib
-- cd $(top_srcdir) && echo 'LoadPackage("float"); DOC at FLOAT();' | $(GAP_EXEC) -A -q -T
-+ cd $(top_srcdir) && echo 'LoadPackage("float"); DOC at FLOAT();' | $(CGAP) -A -q -T
-
- distclean-local:
- rm -f chap*.txt chap*.html index.html chooser.html
diff --git a/debian/patches/upstream-upgrade-tst-testall_g.patch b/debian/patches/upstream-upgrade-tst-testall_g.patch
index ef728ee..955858c 100644
--- a/debian/patches/upstream-upgrade-tst-testall_g.patch
+++ b/debian/patches/upstream-upgrade-tst-testall_g.patch
@@ -2,7 +2,7 @@ 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: debian
+Origin: vendor, Debian
Author: Jerome Benoit <calculus at rezozer.net>
Last-Update: 2016-04-29
diff --git a/debian/rules b/debian/rules
index 97a7580..a890056 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,10 @@ override_dh_auto_configure:
--with-fplll=yes \
--with-cxsc=no
+override_dh_prep:
+ cat makedoc.g | $(CGAP) -A -q -T
+ dh_prep
+
override_dh_auto_install:
dh_auto_install --destdir debian/tmp/
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..52ed93e
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,3 @@
+# Upstream source tarball is not (yet) signed: request to the upstream
+# maintainer was sent -- Jerome Benoit <calculus at rrezozer.net>
+debian-watch-may-check-gpg-signature
diff --git a/debian/tests/makecheck.tst b/debian/tests/makecheck.tst
index 1a3ecac..90784ca 100644
--- a/debian/tests/makecheck.tst
+++ b/debian/tests/makecheck.tst
@@ -1,7 +1,7 @@
## debian/tests/makecheck.tst -- GAP Test script
## script format: GAP Reference Manual section 7.9 Test Files (GAP 4r8)
##
-gap> TestPackageAvailability( "float" , "=0.6.3" , true );
+gap> TestPackageAvailability( "float" , "=0.7.4" , true );
"/usr/share/gap/pkg/float"
gap> TestPackage( "float" );
--
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