[med-svn] [Git][med-team/pycorrfit][master] 4 commits: Add patch tex_pkg_order.patch fixing #914729, thanks to Hilmar Preuße

[Alexandre Mestiashvili]

Alexandre Mestiashvili pushed to branch master at Debian Med / pycorrfit


Commits:
52487f46 by Alexandre Mestiashvili at 2018-11-27T20:16:22Z
Add patch tex_pkg_order.patch fixing #914729, thanks to Hilmar Preuße

- - - - -
50b02435 by Alexandre Mestiashvili at 2018-11-27T21:23:20Z
Respect nocheck in DEB_BUILD_OPTIONS

- - - - -
05cc56e3 by Alexandre Mestiashvili at 2018-11-27T21:31:00Z
Run latex, bibtex, latex, latex mantra sequentially

- - - - -
474499c3 by Alexandre Mestiashvili at 2018-11-27T21:35:51Z
Update changelog

Gbp-Dch: Ignore

- - - - -


4 changed files:

- debian/changelog
- + debian/patches/series
- + debian/patches/tex_pkg_order.patch
- debian/rules


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,13 @@
+pycorrfit (1.1.4+dfsg-3) unstable; urgency=medium
+
+  * Add patch tex_pkg_order.patch, thanks to Hilmar Preuße. Closes: #914729
+  * d/rules:
+    - respect nocheck in DEB_BUILD_OPTIONS
+    - run latex, bibtex, latex, latex mantra sequentially in order to build
+      bibliography
+
+ -- Alexandre Mestiashvili <mestia at debian.org>  Tue, 27 Nov 2018 21:33:04 +0000
+
 pycorrfit (1.1.4+dfsg-2) unstable; urgency=medium
 
   * Remove libpython3-all-dev, Closes: #910750


=====================================
debian/patches/series
=====================================
@@ -0,0 +1 @@
+tex_pkg_order.patch


=====================================
debian/patches/tex_pkg_order.patch
=====================================
@@ -0,0 +1,16 @@
+Description: Load \usepackage[svgnames]{xcolor} before \usepackage{fancyvrb}
+ to avoid failures with LaTeX, thanks to Hilmar Preuße, #914729.
+From: Alex Mestiashvili <mestia at debian.org>
+Forwarded: https://github.com/FCS-analysis/PyCorrFit/issues/191
+--- pycorrfit.orig/doc/PyCorrFit_doc.tex
++++ pycorrfit/doc/PyCorrFit_doc.tex
+@@ -53,8 +53,8 @@
+ \usepackage{textcomp} % Sonderzeichen
+ \usepackage{wrapfig}
+ 
+-\usepackage{fancyvrb}
+ \usepackage[svgnames]{xcolor} %Farben wie DarkBlue
++\usepackage{fancyvrb}
+ 
+ %%
+ %%


=====================================
debian/rules
=====================================
@@ -4,6 +4,9 @@ export DH_VERBOSE=1
 export DEB_BUILD_MAINT_OPTIONS=hardening=+BINDNOW
 export PYBUILD_NAME=pycorrfit
 export PYBUILD_TEST_PYTEST=1
+ifneq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
+        export PYBUILD_TEST_PYTEST=0
+endif
 export PYBUILD_INSTALL_ARGS_python3=--install-lib=/usr/lib/${PYBUILD_NAME}
 # see https://wiki.debian.org/ReproducibleBuilds/TimestampsInPDFGeneratedByLaTeX
 DEB_DATE_RFC_2822 := $(shell dpkg-parsechangelog -S date)
@@ -27,11 +30,10 @@ override_dh_auto_clean:
 
 override_dh_auto_build:
 	cd $(DOCDIR) && \
-	(   $(FAKETIME) $(PDFLATEX) \
-		bibtex $(BIBDOC) \
-		$(FAKETIME) $(PDFLATEX) \
-		$(FAKETIME) $(PDFLATEX) \
-	)
+	$(FAKETIME) $(PDFLATEX) && \
+	bibtex $(BIBDOC) && \
+	$(FAKETIME) $(PDFLATEX) && \
+	$(FAKETIME) $(PDFLATEX)
 	rm -f $(PDF); ln -s $(DOCDIR)/$(PDF)
 	convert -background "rgba(255,255,255,0)" -geometry 32x32 \
 		$(DOCDIR)/Images/PyCorrFit_icon.svg debian/pycorrfit.xpm



View it on GitLab: https://salsa.debian.org/med-team/pycorrfit/compare/c85be1963e7cbfc9b5a384aea5840084220daf61...474499c37b282d1e4da73e872d9c6158822ca12a

-- 
View it on GitLab: https://salsa.debian.org/med-team/pycorrfit/compare/c85be1963e7cbfc9b5a384aea5840084220daf61...474499c37b282d1e4da73e872d9c6158822ca12a
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/debian-med-commit/attachments/20181127/9d563829/attachment-0001.html>