[gap-float] 04/04: Imported Debian patch 0.6.3+ds-1
Jerome Benoit
calculus-guest at moszumanska.debian.org
Tue Sep 23 23:58:26 UTC 2014
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 8da61c269299ada00a02a0f9eaf4ef018545a490
Author: Jerome Benoit <calculus at rezozer.net>
Date: Tue Sep 23 06:27:38 2014 +0200
Imported Debian patch 0.6.3+ds-1
---
debian/changelog | 11 +-
debian/control | 4 +-
debian/gap-float.doc-base | 10 ++
debian/patches/debianization.patch | 6 +-
debian/patches/series | 1 +
.../patches/upstream-autotoolization-cleanup.patch | 114 +++++++++++++++++++--
debian/patches/upstream-autotoolization-doc.patch | 23 +++--
debian/patches/upstream-fix-gapdoc-bib.patch | 88 ++++++++++++++++
.../upstream-update-m4_ac_find_gap_m4.patch | 2 +-
debian/rules | 10 +-
10 files changed, 243 insertions(+), 26 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 3d25a98..02bf33a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,17 @@
gap-float (0.6.3+ds-1) unstable; urgency=medium
* New upstream version.
+ * Debianization:
+ - debian/control, Standards Version 3.9.6 bump (no change);
+ - debian/repack, refresh;
+ - debian/rules:
+ - multiarch support, correct;
+ - hardened dh_auto_clean;
+ - debian/patches/, refresh;
+ - debian/gap-float.doc-base, not forget.
+ * Minor fixes submitted to the upstream maintainer.
- -- Jerome Benoit <calculus at rezozer.net> Sat, 13 Sep 2014 11:44:53 +0000
+ -- Jerome Benoit <calculus at rezozer.net> Tue, 23 Sep 2014 23:55:26 +0000
gap-float (0.6.0+ds-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index def30cd..40256bb 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), autotools-dev, libtool, dh-autoreconf, autoconf-archive,
+ debhelper (>= 9), quilt, autotools-dev, libtool, dh-autoreconf, autoconf-archive,
gap (>=4r7p5), gap-dev (>=4r7p5), gap-gapdoc,
libgmp-dev, libmpfr-dev, libmpc-dev, libmpfi-dev, libfplll-dev,
# libcxsc-dev,
texlive-latex-recommended, texlive-fonts-recommended, texlive-latex-extra
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
Homepage: http://www.gap-system.org/Packages/float.html
Vcs-Git: git://anonscm.debian.org/debian-science/packages/gap-float.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/gap-float.git
diff --git a/debian/gap-float.doc-base b/debian/gap-float.doc-base
new file mode 100644
index 0000000..b1aedd5
--- /dev/null
+++ b/debian/gap-float.doc-base
@@ -0,0 +1,10 @@
+Document: gap-float
+Title: Floating-point numbers
+Author: Laurent Bartholdi
+Abstract:
+ This document describes the GAP package Float, which implements
+ in GAP arbitrary-precision floating-point numbers.
+Section: Science/Mathematics
+
+Format: pdf
+Files: /usr/share/doc/gap-float/doc/manual.pdf
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index e1bcdaa..38717a9 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -18,9 +18,9 @@ Last-Update: 2014-08-17
--- a/src/Makefile.am
+++ b/src/Makefile.am
-@@ -6,14 +6,14 @@
- ##
- #############################################################################
+@@ -8,14 +8,14 @@
+
+ EXTERN=$(CURDIR)/bin/@GAPARCH@/extern
-libdir = $(GAPROOT)/pkg/$(PACKAGE)/bin/$(GAPARCH)
+gaplibdir = $(libdir)/gap/pkg/$(PACKAGE)/bin
diff --git a/debian/patches/series b/debian/patches/series
index 1237ddb..be6022b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+upstream-fix-gapdoc-bib.patch
upstream-autotoolization-cleanup.patch
upstream-update-m4_ac_find_gap_m4.patch
upstream-autotoolization-doc.patch
diff --git a/debian/patches/upstream-autotoolization-cleanup.patch b/debian/patches/upstream-autotoolization-cleanup.patch
index 6505a6e..3a2fb55 100644
--- a/debian/patches/upstream-autotoolization-cleanup.patch
+++ b/debian/patches/upstream-autotoolization-cleanup.patch
@@ -14,16 +14,20 @@ Last-Update: 2014-08-19
AC_CONFIG_SRCDIR([src/float.c])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
-@@ -54,7 +54,7 @@
+@@ -74,9 +74,9 @@
################################################################
# generate files
-mkdir -p bin/$GAPARCH
+-mkdir -p extern
+-
+##mkdir -p bin/$GAPARCH
- ##mkdir -p extern
++##mkdir -p extern
++##
##CONFIG_STATUS=bin/$GAPARCH/config.status
##
-@@ -67,6 +67,8 @@
+ ##AC_CONFIG_FILES([$GAP_MAKEFILE:Makefile.in])
+@@ -88,6 +88,8 @@
AC_CONFIG_FILES([
Makefile
src/Makefile
@@ -34,7 +38,7 @@ Last-Update: 2014-08-19
AC_OUTPUT
--- a/Makefile.am
+++ b/Makefile.am
-@@ -16,49 +16,20 @@
+@@ -16,135 +16,20 @@
#AM_DISTCHECK_CONFIGURE_FLAGS =
@@ -56,10 +60,96 @@ Last-Update: 2014-08-19
+EXTRA_DIST = \
+ $(pkgdata_DATA)
--Changelog:
-- gitlog-to-changelog > $@
+-EXTERN=$(CURDIR)/bin/@GAPARCH@/extern
+export TAR_OPTIONS = --owner=0 --group=0 --numeric-owner
+-MPFRLIB=extern/mpfr-3.1.2
+-MPFILIB=extern/mpfi-1.5.1
+-MPCLIB=extern/mpc-1.0.1
+-CXSCLIB=extern/cxsc-2-5-3
+-FPLLLLIB=extern/libfplll-4.0.1
+-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)
+-
+-$(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.1.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)
+-
+-$(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 > $@
+-
-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 -)
@@ -88,9 +178,19 @@ Last-Update: 2014-08-19
- (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: all-recursive
+-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
index f3254ab..9ce46f9 100644
--- a/debian/patches/upstream-autotoolization-doc.patch
+++ b/debian/patches/upstream-autotoolization-doc.patch
@@ -16,8 +16,8 @@ Last-Update: 2014-08-19
-all-local: doc
+doc_DATA = \
-+ chapInd.txt chap0.txt chap1.txt chap2.txt chap3.txt chap4.txt \
-+ chapInd.html chap0.html chap1.html chap2.html chap3.html chap4.html \
++ 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 \
@@ -25,14 +25,14 @@ Last-Update: 2014-08-19
+ manual.lab
-doc: manual.six
-+$(doc_DATA): float.xml floatbib.xml
-+ cd $(top_srcdir) && cat makedoc.g | $(CGAP) -A -q -T
++$(doc_DATA): float.xml float.bib
++ cd $(top_srcdir) && cat makedoc.g | $(CGAP) -A -q -T > /dev/null
--manual.six: float.xml floatbib.xml
+-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
++ 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:
@@ -42,18 +42,21 @@ Last-Update: 2014-08-19
- 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
+ rm -f $(doc_DATA)
#E doc/Makefile.am . . . . . . . . . . . . . . . . . . . . . . . . . ends here
--- /dev/null
+++ b/makedoc.g
-@@ -0,0 +1,7 @@
+@@ -0,0 +1,10 @@
+SetPackagePath("float",".");
+LoadPackage("GAPDoc");
+##LoadPackage("float");
-+MakeGAPDocDoc("./doc","float",["../lib/float.gd","../PackageInfo.g"],"float");;
++MakeGAPDocDoc("./doc","float",[
++ "../lib/float.gd",
++ "../lib/pslq.gi",
++ "../PackageInfo.g"
++ ],"float");;
+CopyHTMLStyleFiles("doc");
+GAPDocManualLab("Float");
-+QUIT;
diff --git a/debian/patches/upstream-fix-gapdoc-bib.patch b/debian/patches/upstream-fix-gapdoc-bib.patch
new file mode 100644
index 0000000..cc19e08
--- /dev/null
+++ b/debian/patches/upstream-fix-gapdoc-bib.patch
@@ -0,0 +1,88 @@
+Description: fix GAPDoc bibliography composition
+Origin: 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 @@
++
++
++
++
++ at article{ MR1836930,
++ author = {Bailey, D. H. and Broadhurst, D. J.},
++ title = {Parallel integer relation detection: techniques and
++ applications},
++ journal = {Math. Comp.},
++ volume = {70},
++ number = {236},
++ year = {2001},
++ pages = {1719--1736 (electronic)},
++ coden = {MCMPAF},
++ fjournal = {Mathematics of Computation},
++ issn = {0025-5718},
++ mrclass = {11Y16},
++ mrnumber = {1836930 (2002b:11174)},
++ mrreviewer = {David Bradley},
++ url = {http://dx.doi.org/10.1090/S0025-5718-00-01278-3},
++ doi = {10.1090/S0025-5718-00-01278-3},
++ printedkey = {BB01}
++}
+--- a/doc/floatbib.xml.bib
++++ /dev/null
+@@ -1,23 +0,0 @@
+-
+-
+-
+-
+- at article{ MR1836930,
+- author = {Bailey, D. H. and Broadhurst, D. J.},
+- title = {Parallel integer relation detection: techniques and
+- applications},
+- journal = {Math. Comp.},
+- volume = {70},
+- number = {236},
+- year = {2001},
+- pages = {1719--1736 (electronic)},
+- coden = {MCMPAF},
+- fjournal = {Mathematics of Computation},
+- issn = {0025-5718},
+- mrclass = {11Y16},
+- mrnumber = {1836930 (2002b:11174)},
+- mrreviewer = {David Bradley},
+- url = {http://dx.doi.org/10.1090/S0025-5718-00-01278-3},
+- doi = {10.1090/S0025-5718-00-01278-3},
+- printedkey = {BB01}
+-}
+--- a/doc/float.xml
++++ b/doc/float.xml
+@@ -209,7 +209,7 @@
+
+ </Body>
+
+-<Bibliography Databases="floatbib.xml"/>
++<Bibliography Databases="float"/>
+ <TheIndex/>
+
+ </Book>
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 f4c30d6..0593aa6 100644
--- a/debian/patches/upstream-update-m4_ac_find_gap_m4.patch
+++ b/debian/patches/upstream-update-m4_ac_find_gap_m4.patch
@@ -189,7 +189,7 @@ Last-Update: 2014-08-19
@@ -13,7 +13,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
+ cd $(top_srcdir) && echo 'LoadPackage("float"); DOC at FLOAT();' | $(CGAP) -A -q -T
diff --git a/debian/rules b/debian/rules
index d8c1f30..8c9e3f9 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,7 @@
CGAP = /usr/bin/gap
-DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_BUILD_MULTIARCH ?= $(shell dpkg-architecture -qDEB_BUILD_MULTIARCH)
DEB_BUILD_GAP_INFO_ARCH ?= $(shell echo 'Print(GAPInfo.Architecture);' | $(CGAP) -A -q -T)
default:
@@ -25,9 +25,15 @@ override_dh_auto_install:
override_dh_link:
dh_link -p gap-float \
- /usr/lib/$(DEB_BUILD_GNU_TYPE)/gap/pkg/float/bin /usr/lib/gap/pkg/float/bin/$(DEB_BUILD_GAP_INFO_ARCH) \
+ /usr/lib/$(DEB_BUILD_MULTIARCH)/gap/pkg/float/bin /usr/lib/gap/pkg/float/bin/$(DEB_BUILD_GAP_INFO_ARCH) \
/usr/lib/gap/pkg/float/bin /usr/share/gap/pkg/float/bin \
/usr/share/gap/pkg/float/doc /usr/share/doc/gap-float/doc
+override_dh_auto_clean:
+ QUILT_PATCHES=debian/patches quilt pop -q -a -R || test $$? -le 2
+ QUILT_PATCHES=debian/patches quilt push -q -a
+ dh_auto_clean
+ QUILT_PATCHES=debian/patches quilt pop -q -a -R || test $$? = 2
+
get-orig-source:
uscan --no-conf --download-current-version --verbose
--
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