[suitesparse] 05/05: Ship cs.h from both CSparse and CXSparse.

[Sébastien Villemot]

This is an automated email from the git hooks/post-receive script.

sebastien pushed a commit to branch master
in repository suitesparse.

commit f710e5ce106c1ca0d4802815b8f99ece56cc7318
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Mon Jan 19 19:22:22 2015 +0100

    Ship cs.h from both CSparse and CXSparse.
    
    CSparse and CXSparse both provide a header named cs.h. Previously, only the
    CXSparse version was provided. Both versions are now provided in separate
    subdirectories of /usr/include/suitesparse. A toplevel symlink pointing to the
    CXSparse version is left for backward compatibility.
    
    Git-Dch: Full
---
 debian/libsuitesparse-dev.install | 4 ++--
 debian/libsuitesparse-dev.links   | 3 +++
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/debian/libsuitesparse-dev.install b/debian/libsuitesparse-dev.install
index 49e91fd..654bab6 100755
--- a/debian/libsuitesparse-dev.install
+++ b/debian/libsuitesparse-dev.install
@@ -23,10 +23,10 @@ LDL/Lib/*.so /usr/lib/${DEB_HOST_MULTIARCH}/
 LDL/Include/*.h /usr/include/suitesparse
 CSparse/Lib/*.a /usr/lib/${DEB_HOST_MULTIARCH}/
 CSparse/Lib/*.so /usr/lib/${DEB_HOST_MULTIARCH}/
-CSparse/Include/*.h /usr/include/suitesparse
+CSparse/Include/*.h /usr/include/suitesparse/csparse/
 CXSparse/Lib/*.a /usr/lib/${DEB_HOST_MULTIARCH}/
 CXSparse/Lib/*.so /usr/lib/${DEB_HOST_MULTIARCH}/
-CXSparse/Include/*.h /usr/include/suitesparse
+CXSparse/Include/*.h /usr/include/suitesparse/cxsparse/
 CHOLMOD/Lib/*.a /usr/lib/${DEB_HOST_MULTIARCH}/
 CHOLMOD/Lib/*.so /usr/lib/${DEB_HOST_MULTIARCH}/
 CHOLMOD/Include/*.h /usr/include/suitesparse
diff --git a/debian/libsuitesparse-dev.links b/debian/libsuitesparse-dev.links
new file mode 100644
index 0000000..ea1ebb1
--- /dev/null
+++ b/debian/libsuitesparse-dev.links
@@ -0,0 +1,3 @@
+# CSparse and CXSparse both provide a cs.h: symlink to the one from CXSparse
+# from toplevel include directory, for backward compatibility.
+/usr/include/suitesparse/cxsparse/cs.h /usr/include/suitesparse/cs.h

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/suitesparse.git