[suitesparse] 09/10: Rebuild PDF doc.
Sébastien Villemot
sebastien at debian.org
Sat Dec 9 21:40:22 UTC 2017
This is an automated email from the git hooks/post-receive script.
sebastien pushed a commit to branch master
in repository suitesparse.
commit 1fe84669bb7f7dfe7fe9f95d767b29189824a98e
Author: Sébastien Villemot <sebastien at debian.org>
Date: Sat Dec 9 22:20:22 2017 +0100
Rebuild PDF doc.
+ add some texlive build-depedencies.
+ new pdf-docs.patch
Gbp-Dch: Full
---
debian/control | 5 +++-
debian/patches/pdf-docs.patch | 69 +++++++++++++++++++++++++++++++++++++++++++
debian/patches/series | 1 +
debian/rules | 9 ++++++
4 files changed, 83 insertions(+), 1 deletion(-)
diff --git a/debian/control b/debian/control
index eb563d4..fee0bcf 100644
--- a/debian/control
+++ b/debian/control
@@ -8,7 +8,10 @@ Build-Depends: debhelper (>= 10),
libblas-dev,
liblapack-dev,
libmetis-dev,
- cmake
+ cmake,
+ texlive-latex-extra,
+ texlive-plain-generic,
+ texlive-bibtex-extra
Standards-Version: 4.1.2
Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/suitesparse.git
Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/suitesparse.git
diff --git a/debian/patches/pdf-docs.patch b/debian/patches/pdf-docs.patch
new file mode 100644
index 0000000..31cd042
--- /dev/null
+++ b/debian/patches/pdf-docs.patch
@@ -0,0 +1,69 @@
+Description: Tweaks to make PDF buildable
+Author: Sébastien Villemot <sebastien at debian.org>
+Forwarded: by private email on 2017-12-09
+Last-Update: 2017-12-09
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/GraphBLAS/Doc/GraphBLAS_UserGuide.tex
++++ b/GraphBLAS/Doc/GraphBLAS_UserGuide.tex
+@@ -7110,7 +7110,7 @@ However, with \verb'cmake' the port to W
+ {\small
+ \addcontentsline{toc}{section}{References}
+ \bibliographystyle{annotate}
+-\bibliography{GraphBLAS_userguide.bib}
++\bibliography{GraphBLAS_UserGuide.bib}
+ }
+ \end{document}
+
+--- a/AMD/Doc/Makefile
++++ b/AMD/Doc/Makefile
+@@ -23,9 +23,9 @@ distclean: clean
+ #------------------------------------------------------------------------------
+
+ AMD_UserGuide.pdf: AMD_UserGuide.tex AMD_UserGuide.bib ../Include/amd.h
+- echo '\begin{verbatim}' > amd_h.tex
++ echo '\\begin{verbatim}' > amd_h.tex
+ expand -8 ../Include/amd.h >> amd_h.tex
+- echo '\end{verbatim}' >> amd_h.tex
++ echo '\\end{verbatim}' >> amd_h.tex
+ pdflatex AMD_UserGuide
+ bibtex AMD_UserGuide
+ pdflatex AMD_UserGuide
+--- a/CAMD/Doc/Makefile
++++ b/CAMD/Doc/Makefile
+@@ -23,9 +23,9 @@ distclean: clean
+ #------------------------------------------------------------------------------
+
+ CAMD_UserGuide.pdf: CAMD_UserGuide.tex CAMD_UserGuide.bib ../Include/camd.h
+- echo '\begin{verbatim}' > camd_h.tex
++ echo '\\begin{verbatim}' > camd_h.tex
+ expand -8 ../Include/camd.h >> camd_h.tex
+- echo '\end{verbatim}' >> camd_h.tex
++ echo '\\end{verbatim}' >> camd_h.tex
+ pdflatex CAMD_UserGuide
+ bibtex CAMD_UserGuide
+ pdflatex CAMD_UserGuide
+--- a/KLU/Doc/Makefile
++++ b/KLU/Doc/Makefile
+@@ -24,15 +24,15 @@ distclean: clean
+
+ KLU_UserGuide.pdf: KLU_UserGuide.tex KLU_UserGuide.bib \
+ ../Include/klu.h ../../BTF/Include/btf.h Makefile
+- echo '\begin{verbatim}' > klu_h.tex
++ echo '\\begin{verbatim}' > klu_h.tex
+ expand -8 ../Include/klu.h >> klu_h.tex
+- echo '\end{verbatim}' >> klu_h.tex
+- echo '\begin{verbatim}' > btf_h.tex
++ echo '\\end{verbatim}' >> klu_h.tex
++ echo '\\begin{verbatim}' > btf_h.tex
+ expand -8 ../../BTF/Include/btf.h >> btf_h.tex
+- echo '\end{verbatim}' >> btf_h.tex
+- echo '\begin{verbatim}' > klu_simple_c.tex
++ echo '\\end{verbatim}' >> btf_h.tex
++ echo '\\begin{verbatim}' > klu_simple_c.tex
+ expand -8 ../Demo/klu_simple.c >> klu_simple_c.tex
+- echo '\end{verbatim}' >> klu_simple_c.tex
++ echo '\\end{verbatim}' >> klu_simple_c.tex
+ pdflatex KLU_UserGuide
+ bibtex KLU_UserGuide
+ pdflatex KLU_UserGuide
diff --git a/debian/patches/series b/debian/patches/series
index f13da96..f0151da 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
buildflags.patch
cmake.patch
+pdf-docs.patch
diff --git a/debian/rules b/debian/rules
index 50d719e..703ea04 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,8 @@ NOPIC_FLAGS := $(COMMON_FLAGS) OPTIMIZATION=
STATIC_LIBS := CAMD/Lib/libcamd.a BTF/Lib/libbtf.a CHOLMOD/Lib/libcholmod.a AMD/Lib/libamd.a RBio/Lib/librbio.a LDL/Lib/libldl.a SuiteSparse_config/libsuitesparseconfig.a KLU/Lib/libklu.a SPQR/Lib/libspqr.a UMFPACK/Lib/libumfpack.a COLAMD/Lib/libcolamd.a CXSparse/Lib/libcxsparse.a CCOLAMD/Lib/libccolamd.a
+PDF_DOCS := AMD/Doc/AMD_UserGuide.pdf CAMD/Doc/CAMD_UserGuide.pdf CHOLMOD/Doc/CHOLMOD_UserGuide.pdf GraphBLAS/Doc/GraphBLAS_UserGuide.pdf KLU/Doc/KLU_UserGuide.pdf UMFPACK/Doc/UMFPACK_QuickStart.pdf UMFPACK/Doc/UMFPACK_UserGuide.pdf LDL/Doc/ldl_userguide.pdf SPQR/Doc/spqr_user_guide.pdf
+
# For building GraphBLAS
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -24,6 +26,11 @@ override_dh_auto_configure:
# LD_LIBRARY_PATH needed to make tests work (since buildflags.patch removes the -rpath)
override_dh_auto_build:
+ # Docs must be rebuilt first, because the build system expect them for some libs
+ rm -f $(PDF_DOCS)
+ make docs
+ make -C GraphBLAS/Doc
+
# Build static libraries
dh_auto_build -- static $(NOPIC_FLAGS)
mkdir static_lib && cp $(STATIC_LIBS) static_lib/
@@ -45,6 +52,8 @@ override_dh_auto_clean:
make purge
rm -rf static_lib
rm -rf GraphBLAS/build/
+ rm -f $(PDF_DOCS)
+ make -C GraphBLAS/Doc clean
override_dh_makeshlibs:
dh_makeshlibs -V
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/suitesparse.git
More information about the debian-science-commits
mailing list