[Python-modules-commits] [cysignals] 04/04: Debian patch 1.6.6+ds-1
Jerome Benoit
calculus-guest at moszumanska.debian.org
Fri Jan 19 13:05:38 UTC 2018
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository cysignals.
commit 096b0a33e6ae96446a8a609fcab3faef4f0a0e63
Author: Jerome Benoit <calculus at rezozer.net>
Date: Fri Jan 19 16:57:50 2018 +0400
Debian patch 1.6.6+ds-1
---
debian/adhoc/examples/example/Makefile | 2 +-
debian/changelog | 24 ++++++++++------------
debian/compat | 2 +-
debian/control | 12 +++++------
debian/cysignals-tools.install | 2 +-
debian/patches/debianization.patch | 2 +-
debian/patches/series | 1 -
.../upstream-autotoolization-harden-generic.patch | 5 ++---
.../upstream-autotoolization-harden-pari_gp.patch | 2 +-
...tion_pytoolization-harden-build_directory.patch | 6 +++---
.../upstream-lintian-spelling-error-silence.patch | 20 ------------------
...eam-source-tools-gdb-handling_enhancement.patch | 8 ++++----
debian/rules | 4 +---
debian/tests/check | 7 +++++--
debian/tests/control | 22 ++++++++++++++++----
15 files changed, 55 insertions(+), 64 deletions(-)
diff --git a/debian/adhoc/examples/example/Makefile b/debian/adhoc/examples/example/Makefile
index 6c4a9bd..d985d06 100644
--- a/debian/adhoc/examples/example/Makefile
+++ b/debian/adhoc/examples/example/Makefile
@@ -16,7 +16,7 @@
#
# written for Debian by Jerome Benoit <calculus at rezozer.net>
# on behalf of the Debian Python Modules Team
-# copyright: 2016-2017 Jerome Benoit <calculus at rezozer.net>
+# copyright: 2016-2018 Jerome Benoit <calculus at rezozer.net>
# distributed under the terms and conditions of GPL version 3 or later
#
diff --git a/debian/changelog b/debian/changelog
index 4ee9752..46e3059 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,25 +1,23 @@
-cysignals (1.6.6+ds-0) UNRELEASED; urgency=medium
+cysignals (1.6.6+ds-1) experimental; urgency=medium
* New upstream version.
* Debianization:
+ - add Python 3 support (Closes: #874179);
- debian/copyright:
- format URI, secure;
- copyright year tupe, update;
- debian/watch, harden (see d/rules);
- - debian/rules:
- - get-orig-source target, move compression option to d/watch.
-
- -- Jerome Benoit <calculus at rezozer.net> Fri, 19 Jan 2018 05:15:17 +0000
-
-cysignals (1.6.5+ds-3) unstable; urgency=medium
-
- * Debianization:
- - add Python 3 support (Closes: #874179);
- debian/control:
- - Standards Version, bump to 4.1.0 (no change);
- - Build-Depends, refresh.
+ - debhelper, bump to 11;
+ - Standards-Version, bump to 4.1.3;
+ - Build-Depends, refresh;
+ - debian/rules:
+ - get-orig-source target, move compression option to d/watch;
+ - .PHONY target, discard (as it appears to parasite dh);
+ - debian/tests/*:
+ - refresh (doctest check not ported to python3).
- -- Jerome Benoit <calculus at rezozer.net> Sat, 16 Sep 2017 10:55:02 +0000
+ -- Jerome Benoit <calculus at rezozer.net> Fri, 19 Jan 2018 12:56:27 +0000
cysignals (1.6.5+ds-2) unstable; urgency=medium
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 b17f057..2b6b61a 100644
--- a/debian/control
+++ b/debian/control
@@ -4,16 +4,16 @@ Priority: optional
Maintainer: Jerome Benoit <calculus at rezozer.net>
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Build-Depends:
- debhelper (>= 10),
+ debhelper (>= 11),
help2man,
dh-python,
python-setuptools,
python-all,
- python-sphinx,
libpython-dev,
cython (>= 0.26),
python3-setuptools,
python3-all,
+ python3-sphinx,
libpython3-dev,
cython3 (>= 0.26),
libpari-dev (>= 2.9),
@@ -26,7 +26,7 @@ Build-Depends-Indep:
texlive-fonts-recommended,
texlive-generic-extra,
texlive-latex-extra
-Standards-Version: 4.1.0
+Standards-Version: 4.1.3
X-Python-Version: >= 2.7
X-Python3-Version: >= 3.5
Homepage: https://github.com/sagemath/cysignals
@@ -56,7 +56,7 @@ Conflicts: python3-cysignals-bare
Breaks: sagemath (<< 8.0~)
Architecture: any
Multi-Arch: same
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
Recommends: cysignals-tools
Suggests: python-cysignals-doc (= ${source:Version})
Description: interrupt and signal handling for Cython -- Python 3 - PARI/GP
@@ -88,7 +88,7 @@ Provides: python3-cysignals
Conflicts: python3-cysignals-pari
Architecture: any
Multi-Arch: same
-Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Depends: ${python3:Depends}, ${shlibs:Depends}, ${misc:Depends}
Recommends: cysignals-tools
Suggests: python-cysignals-doc (= ${source:Version})
Description: interrupt and signal handling for Cython -- Python 3 - bare
@@ -102,7 +102,7 @@ Description: interrupt and signal handling for Cython -- Python 3 - bare
Package: cysignals-tools
Section: devel
Architecture: all
-Depends: gdb, ${python:Depends}, ${misc:Depends}
+Depends: gdb, ${python3:Depends}, ${misc:Depends}
Suggests: python-cysignals-doc (= ${source:Version})
Description: interrupt and signal handling for Cython -- tools
Since Cython optimizes for speed, Cython normally does not check
diff --git a/debian/cysignals-tools.install b/debian/cysignals-tools.install
index 3eeecea..c72afc8 100644
--- a/debian/cysignals-tools.install
+++ b/debian/cysignals-tools.install
@@ -1,2 +1,2 @@
-usr/lib/python2*/dist-packages/cysignals_gdb/*
+usr/lib/python3*/dist-packages/cysignals_gdb/*
usr/bin/cysignals-CSI
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index 1bdf64e..90ca6b9 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -21,7 +21,7 @@ Last-Update: 2017-07-28
cythonize_dir = "build/XXXX"
if "--without-pari" in ac_configure_flags:
-@@ -140,8 +136,12 @@
+@@ -160,8 +156,12 @@
# The variable "init_pxd" is the string which should be written to
# __init__.pxd
init_pxd = "# distutils: include_dirs = {0}\n".format(install_dir)
diff --git a/debian/patches/series b/debian/patches/series
index 0c8bbb2..1e1ece4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-upstream-lintian-spelling-error-silence.patch
upstream-autotoolization-harden-generic.patch
upstream-autotoolization-harden-pari_gp.patch
upstream-autotoolization_pytoolization-harden-build_directory.patch
diff --git a/debian/patches/upstream-autotoolization-harden-generic.patch b/debian/patches/upstream-autotoolization-harden-generic.patch
index bc460d6..5103f14 100644
--- a/debian/patches/upstream-autotoolization-harden-generic.patch
+++ b/debian/patches/upstream-autotoolization-harden-generic.patch
@@ -10,14 +10,13 @@ Last-Update: 2017-06-09
--- a/Makefile
+++ b/Makefile
-@@ -136,8 +136,8 @@
+@@ -136,8 +136,7 @@
#####################
configure: configure.ac
- autoconf
- autoheader
-+ autoconf -i -f -I m4
-+ autoheader -f
++ autoreconf -i -f -I m4
@rm -f src/config.h.in~
.PHONY: all build doc install dist doc clean clean-build clean-doc \
diff --git a/debian/patches/upstream-autotoolization-harden-pari_gp.patch b/debian/patches/upstream-autotoolization-harden-pari_gp.patch
index f39c955..1e15d47 100644
--- a/debian/patches/upstream-autotoolization-harden-pari_gp.patch
+++ b/debian/patches/upstream-autotoolization-harden-pari_gp.patch
@@ -330,7 +330,7 @@ Last-Update: 2017-07-28
if sys.platform == 'cygwin':
# On Cygwin FD_SETSIZE defaults to a rather low 64; we set it higher
# for use with PSelecter
-@@ -89,7 +97,7 @@
+@@ -109,7 +117,7 @@
if not os.path.isfile(config_h):
import subprocess
subprocess.check_call(["make", "configure"])
diff --git a/debian/patches/upstream-autotoolization_pytoolization-harden-build_directory.patch b/debian/patches/upstream-autotoolization_pytoolization-harden-build_directory.patch
index 3fcedc7..e4fa2b8 100644
--- a/debian/patches/upstream-autotoolization_pytoolization-harden-build_directory.patch
+++ b/debian/patches/upstream-autotoolization_pytoolization-harden-build_directory.patch
@@ -40,15 +40,15 @@ Last-Update: 2017-07-28
kwds = dict(include_dirs=[opj("src", "cysignals"),
opj(cythonize_dir, "src"),
opj(cythonize_dir, "src", "cysignals")],
-@@ -59,7 +62,6 @@
- Extension("cysignals.tests", ["src/cysignals/tests.pyx"], **kwds),
+@@ -79,7 +82,6 @@
+ 'Topic :: Software Development :: Debuggers',
]
-
def write_if_changed(filename, text):
"""
Write ``text`` to ``filename`` but only if it differs from the
-@@ -97,7 +99,11 @@
+@@ -117,7 +119,11 @@
if not os.path.isfile(config_h):
import subprocess
subprocess.check_call(["make", "configure"])
diff --git a/debian/patches/upstream-lintian-spelling-error-silence.patch b/debian/patches/upstream-lintian-spelling-error-silence.patch
deleted file mode 100644
index de35ac5..0000000
--- a/debian/patches/upstream-lintian-spelling-error-silence.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-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/sagemath/cysignals/pull/60
-Comment: spelling-error-in-binary
-Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2017-07-28
-
---- a/src/cysignals/pysignals.pyx
-+++ b/src/cysignals/pysignals.pyx
-@@ -11,7 +11,7 @@
- which calls the Python-level signal handler.
-
- The Python ``signal`` module does not allow access to the OS-level
--signal handler (in particular, it does not allow to temporarily change
-+signal handler (in particular, it does not allow one to temporarily change
- a signal handler if the OS-level handler was not the Python one).
- """
-
diff --git a/debian/patches/upstream-source-tools-gdb-handling_enhancement.patch b/debian/patches/upstream-source-tools-gdb-handling_enhancement.patch
index 5505e8d..e56ca7a 100644
--- a/debian/patches/upstream-source-tools-gdb-handling_enhancement.patch
+++ b/debian/patches/upstream-source-tools-gdb-handling_enhancement.patch
@@ -10,7 +10,7 @@ Last-Update: 2017-07-28
--- a/setup.py
+++ b/setup.py
-@@ -215,11 +215,13 @@
+@@ -242,11 +242,13 @@
setup_requires=["Cython"],
ext_modules=extensions,
@@ -19,14 +19,14 @@ Last-Update: 2017-07-28
package_dir={"cysignals": opj("src", "cysignals"),
- "cysignals-cython": opj(cythonize_dir, "src", "cysignals")},
+ "cysignals-cython": opj(cythonize_dir, "src", "cysignals"),
-+ "cysignals_gdb": opj("src", "scripts")},
++ "cysignals_gdb": opj("src", "scripts")},
package_data={"cysignals": ["*.pxi", "*.pxd", "*.h"],
- "cysignals-cython": ["*.h"]},
- scripts=glob(opj("src", "scripts", "*")),
+ "cysignals-cython": ["*.h"],
-+ "cysignals_gdb": ["cysignals-CSI-helper.py"]},
++ "cysignals_gdb": ["cysignals-CSI-helper.py"]},
+ scripts=glob(opj("src", "scripts", "cysignals-CSI")),
- cmdclass=dict(build=build, build_py=build_py, install=install, bdist_egg=no_egg)
+ cmdclass=dict(build=build, build_py=build_py, install=install, bdist_egg=no_egg),
)
--- a/src/scripts/cysignals-CSI
+++ b/src/scripts/cysignals-CSI
diff --git a/debian/rules b/debian/rules
index 6b9b135..faeaad6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -16,7 +16,7 @@ default:
@uscan --no-conf --dehs --report || true
%:
- dh $@ --with autoreconf --with python2,python3 --with sphinxdoc --buildsystem=pybuild
+ dh $@ --with python2,python3 --with sphinxdoc --buildsystem=pybuild
override_dh_auto_configure-arch:
$(call adhoc_dh_auto_configure_do,bare)
@@ -82,8 +82,6 @@ override_dh_auto_clean:
get-orig-source:
uscan --no-conf --download-current-version --verbose
-.PHONY: build
-
##################################################################################
## ad hoc machinery
diff --git a/debian/tests/check b/debian/tests/check
index 8c858ee..27e3c59 100755
--- a/debian/tests/check
+++ b/debian/tests/check
@@ -4,6 +4,9 @@ set -ue
testname="$1"
flavour="$2"
+
+PYTHON="${3:-python}"
+
test -n "$testname"
case "$testname" in
@@ -11,12 +14,12 @@ case "$testname" in
mkdir -p "$ADTTMP/doctest"
cp -p rundoctests.py src/cysignals/*.pyx "$ADTTMP/doctest"
cd "$ADTTMP/$testname"
- python -B rundoctests.py *.pyx
+ $PYTHON -B rundoctests.py *.pyx
;;
*)
cp -pr "/usr/share/doc/python-cysignals-doc/examples/$testname" "$ADTTMP"
cd "$ADTTMP/$testname"
- make -k check
+ PYTHON=$PYTHON make -k check
;;
esac
diff --git a/debian/tests/control b/debian/tests/control
index e1a032c..254c00b 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,13 +1,27 @@
-Test-Command: debian/tests/check doctest bare
+Test-Command: debian/tests/check doctest bare python2
Depends: python-cysignals-bare, cysignals-tools, python-cysignals-doc
-Test-Command: debian/tests/check doctest pari
+Test-Command: debian/tests/check doctest pari python2
Depends: python-cysignals-pari, cysignals-tools, python-cysignals-doc
-Test-Command: debian/tests/check example bare
+Test-Command: debian/tests/check example bare python2
Depends: python-cysignals-bare, python-cysignals-doc, cython, libpython-dev, build-essential
Restrictions: allow-stderr
-Test-Command: debian/tests/check example pari
+Test-Command: debian/tests/check example pari python2
Depends: python-cysignals-pari, python-cysignals-doc, cython, libpython-dev, build-essential
Restrictions: allow-stderr
+
+##Test-Command: debian/tests/check doctest bare python3
+##Depends: python3-cysignals-bare, cysignals-tools, python-cysignals-doc
+
+##Test-Command: debian/tests/check doctest pari python3
+##Depends: python3-cysignals-pari, cysignals-tools, python-cysignals-doc
+
+Test-Command: debian/tests/check example bare python3
+Depends: python3-cysignals-bare, python-cysignals-doc, cython3, libpython3-dev, build-essential
+Restrictions: allow-stderr
+
+Test-Command: debian/tests/check example pari python3
+Depends: python3-cysignals-pari, python-cysignals-doc, cython3, libpython3-dev, build-essential
+Restrictions: allow-stderr
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/python-modules/packages/cysignals.git
More information about the Python-modules-commits
mailing list