[Python-modules-commits] [cysignals] 03/03: Debian patch 1.6.5+ds-1
Jerome Benoit
calculus-guest at moszumanska.debian.org
Fri Jul 28 13:20:28 UTC 2017
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository cysignals.
commit 1c797aeb9c038d3c2d36f3c96abd881b2a23133c
Author: Jerome Benoit <calculus at rezozer.net>
Date: Fri Jul 28 17:04:39 2017 +0400
Debian patch 1.6.5+ds-1
---
debian/adhoc/examples/doctest/Makefile | 39 ----------------------
debian/changelog | 19 +++++++++++
debian/control | 3 +-
debian/patches/debianization.patch | 24 +++++--------
debian/patches/series | 1 +
.../upstream-autotoolization-harden-pari_gp.patch | 26 +++++----------
...tion_pytoolization-harden-build_directory.patch | 26 +++++++++++----
.../upstream-lintian-spelling-error-silence.patch | 20 +++++++++++
...eam-source-tools-gdb-handling_enhancement.patch | 4 +--
debian/python-cysignals-doc.examples | 1 -
debian/rules | 10 ++----
debian/tests/check | 20 +++++++----
12 files changed, 98 insertions(+), 95 deletions(-)
diff --git a/debian/adhoc/examples/doctest/Makefile b/debian/adhoc/examples/doctest/Makefile
deleted file mode 100644
index 3863915..0000000
--- a/debian/adhoc/examples/doctest/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-# /usr/share/doc/python-cysignals-doc/examples/doctest/Makefile
-#
-# Ad hoc Makefile for building and playing with the sample sources
-# distributed within the debian package python-cysignals-doc.
-#
-# Recommended usage:
-# create a dedicated folder somewhere in your HOME directory;
-# link all the files in /usr/share/doc/python-cysignals-doc/examples/doctest
-# in the dedicated folder; launch this Makefile in the dedicated folder:
-# $ make ;
-# for a basic cleanup, consider the clean target:
-# $ make clean ;
-# for an entire cleanup, the maintainer-clean target:
-# $ make maintainer-clean ;
-# for other targets, just read the Makefile.
-#
-# 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>
-# distributed under the terms and conditions of GPL version 3 or later
-#
-
-DOCTESTS = $(foreach pyx,$(sort $(wildcard *.pyx)),$(basename $(pyx)))
-
-default: all
-
-all: check
-
-check: $(foreach tst, $(DOCTESTS), check-$(tst))
-
-check-%:
- @echo "*** $(subst check-,,$@) ***"
- $(PYTHON) -m doctest $(subst check-,,$@).pyx
-
-clean:
-
-maintainer-clean: clean
-
-PYTHON ?= python
diff --git a/debian/changelog b/debian/changelog
index 51f7526..8dfe38b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+cysignals (1.6.5+ds-1) unstable; urgency=medium
+
+ * Upload to unstable.
+ * New upstream release.
+ * Debianization:
+ - debian/rules, use pkg-info.mk ;
+ - debian/control:
+ - python-cysignals-pari package, introduce Breaks field against sagemath;
+ - Standards Version, bump to 4.0.0 (no change);
+ - debian/patches/*:
+ - d/p/upstream-lintian-spelling-error-silence.patch, introduce;
+ - refresh;
+ - debian/tests/*:
+ - d/t/check, manage doctest separately to use rundoctests.py ;
+ - debian/adhoc/examples/doctest/Makefile, discard (see d/t/check);
+ - doctest examples, no distributed as examples.
+
+ -- Jerome Benoit <calculus at rezozer.net> Fri, 28 Jul 2017 13:01:38 +0000
+
cysignals (1.6.4+ds-1) experimental; urgency=medium
* New upstream release.
diff --git a/debian/control b/debian/control
index 06427e9..a42c46d 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Build-Depends-Indep:
texlive-fonts-recommended,
texlive-generic-extra,
texlive-latex-extra
-Standards-Version: 3.9.8
+Standards-Version: 4.0.0
X-Python-Version: >= 2.7
Homepage: https://github.com/sagemath/cysignals
Vcs-Git: https://anonscm.debian.org/git/python-modules/packages/cysignals.git
@@ -31,6 +31,7 @@ Vcs-Browser: https://anonscm.debian.org/git/python-modules/packages/cysignals.gi
Package: python-cysignals-pari
Provides: python-cysignals
Conflicts: python-cysignals-bare
+Breaks: sagemath (<< 8.0~)
Architecture: any
Multi-Arch: same
Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
diff --git a/debian/patches/debianization.patch b/debian/patches/debianization.patch
index 7d6d71b..1bdf64e 100644
--- a/debian/patches/debianization.patch
+++ b/debian/patches/debianization.patch
@@ -4,30 +4,24 @@ Description: debianization
Origin: vendor, Debian
Forwarded: not-needed
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2017-06-09
+Last-Update: 2017-07-28
---- a/src/scripts/cysignals-CSI
-+++ b/src/scripts/cysignals-CSI
-@@ -101,6 +101,7 @@
-
- # Preload the right Python library
- libpython = os.path.join(sysconfig.get_config_var('LIBDIR'),
-+ sysconfig.get_config_var('MULTIARCH'),
- sysconfig.get_config_var('INSTSONAME'))
- if sys.platform == 'macosx':
- env['DYLD_INSERT_LIBRARIES'] = libpython
--- a/setup.py
+++ b/setup.py
-@@ -35,6 +35,8 @@
+@@ -36,11 +36,7 @@
ac_configure_flags = "--with-pari"
sys.argv.remove("--with-pari")
+-if sys.platform == 'cygwin':
+- # On Cygwin FD_SETSIZE defaults to a rather low 64; we set it higher
+- # for use with PSelecter
+- # See https://github.com/sagemath/cysignals/pull/57
+- macros.append(('FD_SETSIZE', 512))
+env_PYBUILD_DESTDIR = os.environ.get("PYBUILD_DESTDIR")
-+
+
cythonize_dir = "build/XXXX"
if "--without-pari" in ac_configure_flags:
- cythonize_dir = "build/bare"
-@@ -133,8 +135,12 @@
+@@ -140,8 +136,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 1e1ece4..0c8bbb2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+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-pari_gp.patch b/debian/patches/upstream-autotoolization-harden-pari_gp.patch
index 3c18321..f39c955 100644
--- a/debian/patches/upstream-autotoolization-harden-pari_gp.patch
+++ b/debian/patches/upstream-autotoolization-harden-pari_gp.patch
@@ -8,7 +8,7 @@ Description: autotoolization: harden: PARI/GP
Origin: vendor, Debian
Forwarded: https://github.com/sagemath/cysignals/pull/38
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2017-06-09
+Last-Update: 2017-07-28
--- /dev/null
+++ b/m4/pari.m4
@@ -16,7 +16,7 @@ Last-Update: 2017-06-09
+# pari.m4 serial 2
+dnl m4/pari.m4 -- M4 macro processor include script
+dnl
-+dnl Copyright (C) 2016 Jerome Benoit <jgmbenoit at rezozer.net>
++dnl Copyright (C) 2016-2017 Jerome Benoit <jgmbenoit at rezozer.net>
+dnl
+dnl Based on macros by Owen Taylor, modified by:
+dnl Hans Petter Jansson, 2001-04-09;
@@ -315,16 +315,9 @@ Last-Update: 2017-06-09
--- a/setup.py
+++ b/setup.py
-@@ -23,11 +23,22 @@
-
- from glob import glob
-
-+import sys
-+
- opj = os.path.join
-
-
- cythonize_dir = "build"
+@@ -31,6 +31,14 @@
+ # Disable .c line numbers in exception tracebacks
+ macros = [("CYTHON_CLINE_IN_TRACEBACK", 0)]
+ac_configure_flags = ""
+if "--without-pari" in sys.argv:
@@ -334,11 +327,10 @@ Last-Update: 2017-06-09
+ ac_configure_flags = "--with-pari"
+ sys.argv.remove("--with-pari")
+
-+
- kwds = dict(include_dirs=[opj("src", "cysignals"),
- opj(cythonize_dir, "src"),
- opj(cythonize_dir, "src", "cysignals")],
-@@ -79,7 +90,7 @@
+ 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 @@
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 2117f51..3fcedc7 100644
--- a/debian/patches/upstream-autotoolization_pytoolization-harden-build_directory.patch
+++ b/debian/patches/upstream-autotoolization_pytoolization-harden-build_directory.patch
@@ -8,35 +8,47 @@ Description: autotoolization/pytoolization: harden: build directory
Origin: vendor, Debian
Forwarded: https://github.com/sagemath/cysignals/pull/38
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2017-06-09
+Last-Update: 2017-07-28
--- a/setup.py
+++ b/setup.py
-@@ -27,10 +27,7 @@
+@@ -25,13 +25,10 @@
opj = os.path.join
-
-cythonize_dir = "build"
-
+ # Disable .c line numbers in exception tracebacks
+ macros = [("CYTHON_CLINE_IN_TRACEBACK", 0)]
+
-ac_configure_flags = ""
+ac_configure_flags = os.environ.get("PYSETUP_CONFIGURE_FLAGS","--without-pari")
if "--without-pari" in sys.argv:
ac_configure_flags = "--without-pari"
sys.argv.remove("--without-pari")
-@@ -38,6 +35,11 @@
- ac_configure_flags = "--with-pari"
- sys.argv.remove("--with-pari")
+@@ -45,6 +42,12 @@
+ # See https://github.com/sagemath/cysignals/pull/57
+ macros.append(('FD_SETSIZE', 512))
+cythonize_dir = "build/XXXX"
+if "--without-pari" in ac_configure_flags:
+ cythonize_dir = "build/bare"
+elif "--with-pari" in ac_configure_flags:
+ cythonize_dir = "build/pari"
-
++
kwds = dict(include_dirs=[opj("src", "cysignals"),
opj(cythonize_dir, "src"),
-@@ -90,7 +92,11 @@
+ opj(cythonize_dir, "src", "cysignals")],
+@@ -59,7 +62,6 @@
+ Extension("cysignals.tests", ["src/cysignals/tests.pyx"], **kwds),
+ ]
+
+-
+ def write_if_changed(filename, text):
+ """
+ Write ``text`` to ``filename`` but only if it differs from the
+@@ -97,7 +99,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
new file mode 100644
index 0000000..de35ac5
--- /dev/null
+++ b/debian/patches/upstream-lintian-spelling-error-silence.patch
@@ -0,0 +1,20 @@
+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 c5b5cb5..5505e8d 100644
--- a/debian/patches/upstream-source-tools-gdb-handling_enhancement.patch
+++ b/debian/patches/upstream-source-tools-gdb-handling_enhancement.patch
@@ -6,11 +6,11 @@ Description: enhance helper handling in cysignals-CSI
Origin: vendor, Debian
Forwarded: https://github.com/sagemath/cysignals/pull/39
Author: Jerome Benoit <calculus at rezozer.net>
-Last-Update: 2017-06-09
+Last-Update: 2017-07-28
--- a/setup.py
+++ b/setup.py
-@@ -208,11 +208,13 @@
+@@ -215,11 +215,13 @@
setup_requires=["Cython"],
ext_modules=extensions,
diff --git a/debian/python-cysignals-doc.examples b/debian/python-cysignals-doc.examples
index d885386..036cec8 100644
--- a/debian/python-cysignals-doc.examples
+++ b/debian/python-cysignals-doc.examples
@@ -1,3 +1,2 @@
-build/DEBIAN/examples/doctest
example
debian/adhoc/examples/*
diff --git a/debian/rules b/debian/rules
index a37f4ac..4872a50 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,14 @@
#!/usr/bin/make -f
+include /usr/share/dpkg/pkg-info.mk
export DEB_BUILD_MAINT_OPTIONS=hardening=+bindnow
-DEB_PKG_VERSION ?= $(shell dpkg-parsechangelog -S Version)
-
export ACLOCAL_PATH=m4
H2MFLAGS = \
--manual="CySIgnals Cython package" \
- --source="CySIgnals (Debian $(DEB_PKG_VERSION))" \
- --version-string="cysignals-CSI - $(DEB_PKG_VERSION)" \
+ --source="CySIgnals (Debian $(DEB_VERSION))" \
+ --version-string="cysignals-CSI - $(DEB_VERSION)" \
--locale=C.UTF-8 \
--no-info
@@ -40,14 +39,11 @@ override_dh_auto_test-arch:
override_dh_auto_test-indep:
$(call adhoc_dh_auto_test_do,bare)
-DEB_INSTALLEXAMPLES_DOCTEST = $(CURDIR)/build/DEBIAN/examples/doctest
override_dh_prep-indep:
help2man $(H2MFLAGS) -s 1 \
-n "debugger information extractor for Python processes" \
-o cysignals-CSI.1 \
$(CURDIR)/debian/adhoc/wrappers/cysignals-CSI
- mkdir -p $(DEB_INSTALLEXAMPLES_DOCTEST)
- cp -p -t $(DEB_INSTALLEXAMPLES_DOCTEST) $(CURDIR)/src/cysignals/*.pyx
override_dh_auto_install-arch:
$(call adhoc_dh_auto_install_do,bare)
diff --git a/debian/tests/check b/debian/tests/check
index 15293a3..8c858ee 100755
--- a/debian/tests/check
+++ b/debian/tests/check
@@ -1,15 +1,23 @@
#!/bin/sh
-# autopkgtest check based on upstream Makefile check-doctest
+# autopkgtest check based on upstream Makefile check-(doctest|example)
set -ue
testname="$1"
flavour="$2"
test -n "$testname"
-cp -pr "/usr/share/doc/python-cysignals-doc/examples/$testname" "$ADTTMP"
-
-cd "$ADTTMP/$testname"
-
-make -k check
+case "$testname" in
+ doctest)
+ mkdir -p "$ADTTMP/doctest"
+ cp -p rundoctests.py src/cysignals/*.pyx "$ADTTMP/doctest"
+ cd "$ADTTMP/$testname"
+ python -B rundoctests.py *.pyx
+ ;;
+ *)
+ cp -pr "/usr/share/doc/python-cysignals-doc/examples/$testname" "$ADTTMP"
+ cd "$ADTTMP/$testname"
+ make -k check
+ ;;
+esac
exit 0
--
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