[Python-modules-commits] [fpylll] 05/05: Debian patch 0.3.0+ds1-1
Jerome Benoit
calculus-guest at moszumanska.debian.org
Fri Jan 26 14:38:43 UTC 2018
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository fpylll.
commit 75466e914899627095174b075acb29f5d0482a52
Author: Jerome Benoit <calculus at rezozer.net>
Date: Fri Jan 26 18:32:10 2018 +0400
Debian patch 0.3.0+ds1-1
---
debian/changelog | 22 ++++++++
debian/compat | 2 +-
debian/control | 60 ++++++++++++++++------
debian/copyright | 6 ++-
debian/patches/series | 2 +
.../upstream-fix-lintian-spelling-error.patch | 23 +++++++++
.../patches/workaround-test-lll-lll-32-bit.patch | 22 ++++++++
debian/python3-fpylll.lintian-overrides | 2 +
debian/rules | 4 +-
debian/source/lintian-overrides | 2 +-
debian/tests/control | 10 +++-
debian/watch | 2 +-
12 files changed, 131 insertions(+), 26 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 57a6ecd..5354a8a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,25 @@
+fpylll (0.3.0+ds1-1) experimental; urgency=medium
+
+ * Debianization:
+ - add Python 3 support (Closes: #874696);
+ - debian/copyright:
+ - copyright year tuple, refresh;
+ - Files-Excluded field, update;
+ - debian/watch:
+ - options, add compression;
+ - debian/control:
+ - debhelper, bump to 11;
+ - Standards-Version, bump to 4.1.3;
+ - Build-Depends, refresh;
+ - debian/rules:
+ - get-orig-source target, compression option, remove;
+ - debian/patches/*:
+ - d/p/upstream-fix-lintian-spelling-error.patch , introduce;
+ - debian/tests/*:
+ - refresh.
+
+ -- Jerome Benoit <calculus at rezozer.net> Fri, 26 Jan 2018 14:25:40 +0000
+
fpylll (0.3.0+ds-3) unstable; urgency=medium
* Team upload.
diff --git a/debian/compat b/debian/compat
index f599e28..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
diff --git a/debian/control b/debian/control
index c150985..7cd4a0a 100644
--- a/debian/control
+++ b/debian/control
@@ -4,24 +4,34 @@ Priority: optional
Maintainer: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Uploaders: Jerome Benoit <calculus at rezozer.net>,
Ximin Luo <infinity0 at debian.org>
-Build-Depends: cython (>= 0.25),
- debhelper (>= 10),
- dh-python,
- dpkg-dev (>= 1.17.14),
- libfplll-dev (>= 5.2.0),
- libgmp-dev,
- libmpfr-dev,
- libpython-dev,
- pkg-config,
- python-all,
- python-cysignals-bare | python-cysignals,
- python-flake8,
- python-numpy,
- python-pytest,
- python-setuptools
-Build-Depends-Indep: python-docutils
-Standards-Version: 4.1.1
+Build-Depends:
+ debhelper (>= 11),
+ pkg-config,
+ dh-python,
+ python-all,
+ libpython-dev,
+ cython (>= 0.26),
+ python-setuptools,
+ python-cysignals-bare | python-cysignals,
+ python-flake8,
+ python-numpy,
+ python-pytest,
+ python3-all,
+ libpython3-dev,
+ cython3 (>= 0.26),
+ python3-setuptools,
+ python3-cysignals-bare | python3-cysignals,
+ python3-flake8,
+ python3-numpy,
+ python3-pytest,
+ libgmp-dev,
+ libmpfr-dev,
+ libfplll-dev (>= 5.2.0),
+Build-Depends-Indep:
+ python-docutils
+Standards-Version: 4.1.3
X-Python-Version: >= 2.7
+X-Python3-Version: >= 3.5
Homepage: https://github.com/fplll/fpylll
Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/fpylll.git
Vcs-Browser: https://anonscm.debian.org/git/python-modules/packages/fpylll.git
@@ -42,6 +52,22 @@ Description: Python wrapper for LLL-reduction of Euclidean lattices -- Python
.
This package installs the library for Python 2.
+Package: python3-fpylll
+Architecture: any
+Multi-Arch: same
+Depends: python3-cysignals-bare | python3-cysignals,
+ python3-numpy,
+ ${misc:Depends},
+ ${python3:Depends},
+ ${shlibs:Depends}
+Suggests: python-fpylll-doc (= ${source:Version})
+Breaks: sagemath (<< 8.1~)
+Description: Python wrapper for LLL-reduction of Euclidean lattices -- Python 3
+ fpylll is a Python library for performing lattice reduction on lattices over
+ the Integers; it is based on the fpLLL C++ library.
+ .
+ This package installs the library for Python 3.
+
Package: python-fpylll-doc
Multi-Arch: foreign
Section: doc
diff --git a/debian/copyright b/debian/copyright
index 5d8daaf..dc18c1e 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,16 +3,18 @@ Upstream-Name: fpylll
Upstream-Contact: Martin Albrecht <martinralbrecht+github at googlemail.com>
Source: https://github.com/fplll/fpylll
Files-Excluded:
+ src/fpylll/algorithms/*.pyc
+ src/fpylll/tools/*.pyc
src/fpylll/config.pxi
Files: *
Copyright:
- 2016-2017 Martin Albrecht <martinralbrecht+github at googlemail.com>
+ 2016-2018 Martin Albrecht <martinralbrecht+github at googlemail.com>
License: GPL-2+
Files: debian/*
Copyright:
- 2016-2017 Jerome Benoit <calculus at rezozer.net>
+ 2016-2018 Jerome Benoit <calculus at rezozer.net>
License: GPL-2+
License: GPL-2+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..62973d6
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+upstream-fix-lintian-spelling-error.patch
+workaround-test-lll-lll-32-bit.patch
diff --git a/debian/patches/upstream-fix-lintian-spelling-error.patch b/debian/patches/upstream-fix-lintian-spelling-error.patch
new file mode 100644
index 0000000..4a9032d
--- /dev/null
+++ b/debian/patches/upstream-fix-lintian-spelling-error.patch
@@ -0,0 +1,23 @@
+Description: source typo
+ Correct spelling errors as reported by lintian in the binary library; meant
+ to silence lintian and eventually to be submitted to the upstream maintainer.
+Origin: vendor, Debian
+Forwarded: https://github.com/fplll/fpylll/pull/113
+Comment: spelling-error-in-binary
+Author: Jerome Benoit <calculus at rezozer.net>
+Last-Update: 2018-01-26
+
+--- a/src/fpylll/fplll/bkz_param.pyx
++++ b/src/fpylll/fplll/bkz_param.pyx
+@@ -435,9 +435,9 @@
+
+ """
+ if not isinstance(what, str):
+- raise TypeError("Only strings are supported as auxilary keys but got %s"%what)
++ raise TypeError("Only strings are supported as auxiliary keys but got %s"%what)
+ if not what.startswith("aux"):
+- raise ValueError("Auxilary keys must start with 'aux' but got '%s'"%what)
++ raise ValueError("Auxiliary keys must start with 'aux' but got '%s'"%what)
+ self.aux[what] = value
+
+ def dict(self, all=True):
diff --git a/debian/patches/workaround-test-lll-lll-32-bit.patch b/debian/patches/workaround-test-lll-lll-32-bit.patch
new file mode 100644
index 0000000..88f5446
--- /dev/null
+++ b/debian/patches/workaround-test-lll-lll-32-bit.patch
@@ -0,0 +1,22 @@
+Description: Work around test_lll_lll failure on 32-bit architectures
+Author: Ximin Luo <infinity0 at debian.org>
+Bug: https://github.com/fplll/fpylll/issues/112
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/tests/test_lll.py
++++ b/tests/test_lll.py
+@@ -4,7 +4,13 @@
+ from fpylll.config import float_types, int_types
+ from copy import copy
+
+-dimensions = ((0, 0), (1, 1), (2, 2), (3, 3), (10, 10), (50, 50), (60, 60),)
++import sys
++
++if sys.maxsize > 2**32:
++ dimensions = ((0, 0), (1, 1), (2, 2), (3, 3), (10, 10), (50, 50), (60, 60))
++else:
++ # work around https://github.com/fplll/fpylll/issues/112
++ dimensions = ((0, 0), (1, 1), (2, 2), (3, 3), (10, 10), (20, 20), (30, 30))
+
+
+ def make_integer_matrix(m, n, int_type="mpz"):
diff --git a/debian/python3-fpylll.lintian-overrides b/debian/python3-fpylll.lintian-overrides
new file mode 100644
index 0000000..bc6cf26
--- /dev/null
+++ b/debian/python3-fpylll.lintian-overrides
@@ -0,0 +1,2 @@
+# The upstream source tarball contains no ChangeLog file.
+python3-fpylll: no-upstream-changelog
diff --git a/debian/rules b/debian/rules
index 5d09b10..df83fa4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,7 +8,7 @@ default:
@uscan --no-conf --dehs --report || true
%:
- dh $@ --with autoreconf --with python2 --buildsystem=pybuild
+ dh $@ --with python2,python3 --buildsystem=pybuild
override_dh_auto_build-indep:
@true
@@ -28,4 +28,4 @@ override_dh_auto_clean:
@true
get-orig-source:
- uscan --no-conf --download-current-version --compression xz --verbose
+ uscan --no-conf --download-current-version --verbose
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index c74904c..602ab0c 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -1,2 +1,2 @@
# The upstream source ball is downloaded from its GitHub repository
-debian-watch-may-check-gpg-signature
+debian-watch-does-not-check-gpg-signature
diff --git a/debian/tests/control b/debian/tests/control
index aad8c01..c8fe116 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,5 +1,11 @@
-Test-Command: py.test /usr/share/doc/python-fpylll-doc/tests
+Test-Command: pytest /usr/share/doc/python-fpylll-doc/tests
Depends: python-cysignals-bare, python-fpylll, python-fpylll-doc, python-pytest
-Test-Command: py.test /usr/share/doc/python-fpylll-doc/tests
+Test-Command: pytest /usr/share/doc/python-fpylll-doc/tests
Depends: python-cysignals-pari, python-fpylll, python-fpylll-doc, python-pytest
+
+Test-Command: pytest-3 /usr/share/doc/python-fpylll-doc/tests
+Depends: python3-cysignals-bare, python3-fpylll, python-fpylll-doc, python3-pytest
+
+Test-Command: pytest-3 /usr/share/doc/python-fpylll-doc/tests
+Depends: python3-cysignals-pari, python3-fpylll, python-fpylll-doc, python3-pytest
diff --git a/debian/watch b/debian/watch
index dc932c2..964dd94 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
version=4
-opts=repack,dversionmangle=s/\+ds//,repacksuffix=+ds \
+opts=repack,compression=xz,dversionmangle=s/\+ds[\d]?//,repacksuffix=+ds1 \
https://github.com/fplll/fpylll/releases .*/fpylll-(\d\S*)dev\.tar\.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/fpylll.git
More information about the Python-modules-commits
mailing list