[suitesparse] 02/08: Drop patches applied upstream: cmake.patch, pdf-docs.patch.

Sébastien Villemot sebastien at debian.org
Thu Dec 21 20:46:32 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 f26475c38bd8c95034248b52d76c9230af2d5ae8
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Thu Dec 21 18:31:56 2017 +0100

    Drop patches applied upstream: cmake.patch, pdf-docs.patch.
---
 debian/patches/cmake.patch    | 29 ------------------
 debian/patches/pdf-docs.patch | 69 -------------------------------------------
 debian/patches/series         |  2 --
 3 files changed, 100 deletions(-)

diff --git a/debian/patches/cmake.patch b/debian/patches/cmake.patch
deleted file mode 100644
index dbffb46..0000000
--- a/debian/patches/cmake.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: Use GNU install directories
- Needed for supporting installation in /usr, and for multiarch.
-Author: Sébastien Villemot <sebastien at debian.org>
-Forwarded: by private email on 2017-12-07
-Last-Update: 2017-12-07
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
---- a/GraphBLAS/CMakeLists.txt
-+++ b/GraphBLAS/CMakeLists.txt
-@@ -37,6 +37,8 @@ cmake_minimum_required ( VERSION 2.8.12
- 
- project ( graphblas )
- 
-+include(GNUInstallDirs)
-+
- if ( CMAKE_VERSION VERSION_GREATER "3.0" )
-     cmake_policy ( SET CMP0042 NEW )
- endif ( )
-@@ -88,8 +90,8 @@ set_property ( TARGET graphblas PROPERTY
- 
- # graphblas installation location
- install ( TARGETS graphblas
--    LIBRARY       DESTINATION /usr/local/lib
--    PUBLIC_HEADER DESTINATION /usr/local/include )
-+    LIBRARY       DESTINATION ${CMAKE_INSTALL_LIBDIR}
-+    PUBLIC_HEADER DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} )
- 
- # Demo library
- file ( GLOB DEMO_SOURCES "Demo/Source/*.c" )
diff --git a/debian/patches/pdf-docs.patch b/debian/patches/pdf-docs.patch
deleted file mode 100644
index 31cd042..0000000
--- a/debian/patches/pdf-docs.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-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 f0151da..896fdf1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
 buildflags.patch
-cmake.patch
-pdf-docs.patch

-- 
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