[Python-modules-commits] [cysignals] 01/02: RC bug #840017 fix
Jerome Benoit
calculus-guest at moszumanska.debian.org
Sat Oct 8 02:28:54 UTC 2016
This is an automated email from the git hooks/post-receive script.
calculus-guest pushed a commit to branch master
in repository cysignals.
commit 5c8c673d88be0e9c97bf73c57a8ae7b8930cc8f2
Author: Jerome Benoit <calculus at rezozer.net>
Date: Sat Oct 8 03:25:45 2016 +0100
RC bug #840017 fix
---
debian/changelog | 13 ++
debian/control | 2 +-
debian/patches/series | 1 +
...mentation-make-user_friendly_check-soften.patch | 180 +++++++++++++++++++++
debian/rules | 7 +-
5 files changed, 201 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 95a15e0..a303c1e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+cysignals (1.1.1+ds-2) unstable; urgency=medium
+
+ * RC bug fix release (Closes: #840017):
+ - debian/rules, conditionalize use of --with sphinxdoc appropriately,
+ thanks to Aaron M. Ucko <amu at alum.mit.edu> for the hint;
+ - debian/patches/:
+ - d/p/upstream-documentation-make-user_friendly_check-soften.patch,
+ introduce and submitted (hidden bug);
+ - debian/control, move help2man from Build-Depends-Indep to Build-Depends
+ (hidden bug).
+
+ -- Jerome Benoit <calculus at rezozer.net> Sat, 08 Oct 2016 02:23:57 +0000
+
cysignals (1.1.1+ds-1) unstable; urgency=medium
* Initial release (Closes: #834232).
diff --git a/debian/control b/debian/control
index 56c6fd6..711f79c 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Jerome Benoit <calculus at rezozer.net>
Uploaders: Debian Python Modules Team <python-modules-team at lists.alioth.debian.org>
Build-Depends:
debhelper (>= 10),
+ help2man,
dh-python,
dpkg-dev (>= 1.17.14),
python-setuptools,
@@ -14,7 +15,6 @@ Build-Depends:
cython (>= 0.24),
gdb
Build-Depends-Indep:
- help2man,
python-docutils,
python-sphinx,
texlive-latex-base,
diff --git a/debian/patches/series b/debian/patches/series
index 0c8bbb2..3cdd02b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,4 +3,5 @@ upstream-autotoolization-harden-generic.patch
upstream-autotoolization-harden-pari_gp.patch
upstream-autotoolization_pytoolization-harden-build_directory.patch
upstream-source-tools-gdb-handling_enhancement.patch
+upstream-documentation-make-user_friendly_check-soften.patch
debianization.patch
diff --git a/debian/patches/upstream-documentation-make-user_friendly_check-soften.patch b/debian/patches/upstream-documentation-make-user_friendly_check-soften.patch
new file mode 100644
index 0000000..dc5fda5
--- /dev/null
+++ b/debian/patches/upstream-documentation-make-user_friendly_check-soften.patch
@@ -0,0 +1,180 @@
+Description: upstream: documentation composition: soften user-friendly check
+ Render `user-friendly check for sphinx-build' even more friendly by not
+ emitting the error message and not stopping wherever is not needed in view
+ to be able to launch non-composition targets (e.g., clean) on systems without
+ sphinx-build installed; meant to be submitted to the upstream maintainer.
+Origin: vendor, Debian
+Forwarded: https://github.com/sagemath/cysignals/pull/40
+Author: Jerome Benoit <calculus at rezozer.net>
+Last-Update: 2016-10-08
+
+--- a/docs/Makefile
++++ b/docs/Makefile
+@@ -7,11 +7,6 @@
+ PAPER =
+ BUILDDIR = build
+
+-# User-friendly check for sphinx-build
+-ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
+-$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
+-endif
+-
+ # Internal variables.
+ PAPEROPT_a4 = -D latex_paper_size=a4
+ PAPEROPT_letter = -D latex_paper_size=letter
+@@ -50,37 +45,44 @@
+ rm -rf $(BUILDDIR)/*
+
+ html:
++ $(call user_friendly_check_for_sphinx_build)
+ $(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+ @echo
+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+
+ dirhtml:
++ $(call user_friendly_check_for_sphinx_build)
+ $(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
+ @echo
+ @echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
+
+ singlehtml:
++ $(call user_friendly_check_for_sphinx_build)
+ $(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
+ @echo
+ @echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
+
+ pickle:
++ $(call user_friendly_check_for_sphinx_build)
+ $(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
+ @echo
+ @echo "Build finished; now you can process the pickle files."
+
+ json:
++ $(call user_friendly_check_for_sphinx_build)
+ $(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
+ @echo
+ @echo "Build finished; now you can process the JSON files."
+
+ htmlhelp:
++ $(call user_friendly_check_for_sphinx_build)
+ $(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
+ @echo
+ @echo "Build finished; now you can run HTML Help Workshop with the" \
+ ".hhp project file in $(BUILDDIR)/htmlhelp."
+
+ qthelp:
++ $(call user_friendly_check_for_sphinx_build)
+ $(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
+ @echo
+ @echo "Build finished; now you can run "qcollectiongenerator" with the" \
+@@ -90,6 +92,7 @@
+ @echo "# assistant -collectionFile $(BUILDDIR)/qthelp/cysignals.qhc"
+
+ devhelp:
++ $(call user_friendly_check_for_sphinx_build)
+ $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
+ @echo
+ @echo "Build finished."
+@@ -99,11 +102,13 @@
+ @echo "# devhelp"
+
+ epub:
++ $(call user_friendly_check_for_sphinx_build)
+ $(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
+ @echo
+ @echo "Build finished. The epub file is in $(BUILDDIR)/epub."
+
+ latex:
++ $(call user_friendly_check_for_sphinx_build)
+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+ @echo
+ @echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
+@@ -111,28 +116,33 @@
+ "(use \`make latexpdf' here to do that automatically)."
+
+ latexpdf:
++ $(call user_friendly_check_for_sphinx_build)
+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+ @echo "Running LaTeX files through pdflatex..."
+ $(MAKE) -C $(BUILDDIR)/latex all-pdf
+ @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+ latexpdfja:
++ $(call user_friendly_check_for_sphinx_build)
+ $(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
+ @echo "Running LaTeX files through platex and dvipdfmx..."
+ $(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
+ @echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
+
+ text:
++ $(call user_friendly_check_for_sphinx_build)
+ $(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
+ @echo
+ @echo "Build finished. The text files are in $(BUILDDIR)/text."
+
+ man:
++ $(call user_friendly_check_for_sphinx_build)
+ $(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
+ @echo
+ @echo "Build finished. The manual pages are in $(BUILDDIR)/man."
+
+ texinfo:
++ $(call user_friendly_check_for_sphinx_build)
+ $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+ @echo
+ @echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
+@@ -140,38 +150,54 @@
+ "(use \`make info' here to do that automatically)."
+
+ info:
++ $(call user_friendly_check_for_sphinx_build)
+ $(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
+ @echo "Running Texinfo files through makeinfo..."
+ make -C $(BUILDDIR)/texinfo info
+ @echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
+
+ gettext:
++ $(call user_friendly_check_for_sphinx_build)
+ $(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
+ @echo
+ @echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
+
+ changes:
++ $(call user_friendly_check_for_sphinx_build)
+ $(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
+ @echo
+ @echo "The overview file is in $(BUILDDIR)/changes."
+
+ linkcheck:
++ $(call user_friendly_check_for_sphinx_build)
+ $(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
+ @echo
+ @echo "Link check complete; look for any errors in the above output " \
+ "or in $(BUILDDIR)/linkcheck/output.txt."
+
+ doctest:
++ $(call user_friendly_check_for_sphinx_build)
+ $(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
+ @echo "Testing of doctests in the sources finished, look at the " \
+ "results in $(BUILDDIR)/doctest/output.txt."
+
+ xml:
++ $(call user_friendly_check_for_sphinx_build)
+ $(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
+ @echo
+ @echo "Build finished. The XML files are in $(BUILDDIR)/xml."
+
+ pseudoxml:
++ $(call user_friendly_check_for_sphinx_build)
+ $(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
+ @echo
+ @echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
++
++
++#### utilities
++
++user_friendly_check_for_sphinx_build = \
++ $(if $(shell which $(SPHINXBUILD) >/dev/null 2>&1 || echo $$?),\
++ $(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/),)
++
++####
diff --git a/debian/rules b/debian/rules
index e1fd1e1..3775bd6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,6 +6,8 @@ DEB_PKG_VERSION ?= $(shell dpkg-parsechangelog -S Version)
export ACLOCAL_PATH=m4
+DHFLAGS = --with autoreconf --with python2 --buildsystem=pybuild
+
H2MFLAGS = \
--manual="CySIgnals Cython package" \
--source="CySIgnals (Debian $(DEB_PKG_VERSION))" \
@@ -15,8 +17,11 @@ H2MFLAGS = \
default:
@uscan --no-conf --dehs --report || true
+%-indep:
+ dh $@ $(DHFLAGS) --with sphinxdoc
+
%:
- dh $@ --with autoreconf --with python2,sphinxdoc --buildsystem=pybuild
+ dh $@ $(DHFLAGS)
override_dh_auto_configure-arch:
$(call adhoc_dh_auto_configure_do,bare)
--
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