[SCM] linbox: library for exact linear algebra branch, master, updated. upstream/1.3.2-33-g6f60222

Lifeng Sun lifongsun at gmail.com
Sun Jul 15 11:14:42 UTC 2012 

The following commit has been merged in the master branch:
commit 7300a3fcec130fa7ecee685409b2f27b0fc29723
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Fri Jun 22 01:13:29 2012 +0800

    Build doc packages.

diff --git a/debian/TODO b/debian/TODO
index f540e55..09d62be 100644
--- a/debian/TODO
+++ b/debian/TODO
@@ -1 +1,2 @@
 New documentation packages.
+examples
diff --git a/debian/changelog b/debian/changelog
index d551822..f881f8d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,8 @@ linbox (1.3.2-1) UNRELEASED; urgency=low
 
   * New maintainer.
   * New upstream.
-  * New packages: liblinboxsage0 and liblinboxsage-dev.
+  * New packages: liblinboxsage0, liblinboxsage-dev, linbox-user-doc and
+    linbox-dev-doc.
 
  -- Lifeng Sun <lifongsun at gmail.com>  Mon, 11 Jun 2012 21:32:35 +0800
 
diff --git a/debian/control b/debian/control
index f3ac3a0..58fc5c5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,6 +3,7 @@ Section: math
 Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Lifeng Sun <lifongsun at gmail.com>
+DM-Upload-Allowed: yes
 Homepage: http://www.linalg.org/
 Build-Depends: autotools-dev, debhelper (>= 8.0.0), libgivaro-dev (>= 3.7.0), libgivaro-dev (<< 3.8.0), libntl-dev, libgmp-dev, libatlas-dev, libgsl0-dev, liblapack-dev, fflas-ffpack
 Build-Depends-Indep: doxygen-latex, ghostscript
@@ -12,6 +13,7 @@ Package: liblinbox-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends}, liblinbox0 (= ${binary:Version}), libgivaro-dev, liblapack-dev
+Suggests: linbox-user-doc, linbox-dev-doc
 Description: Library for exact linear algebra - development files
  LinBox is a C++ template library for exact, high-performance
  linear algebra computation with dense, sparse, and structured
@@ -36,6 +38,7 @@ Package: liblinboxsage-dev
 Section: libdevel
 Architecture: any
 Depends: ${misc:Depends}, liblinbox-dev (= ${binary:Version}), liblinboxsage0 (= ${binary:Version})
+Suggests: linbox-user-doc, linbox-dev-doc
 Description: SAGE interface of LinBox - development files
  LinBox is a C++ template library for exact, high-performance
  linear algebra computation with dense, sparse, and structured
@@ -55,3 +58,25 @@ Description: SAGE interface of LinBox - shared library
  matrices over the integers and over finite fields.
  .
  This package contains shared library of SAGE interface of LinBox.
+
+Package: linbox-user-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Description: LinBox User Documentation
+ LinBox is a C++ template library for exact, high-performance
+ linear algebra computation with dense, sparse, and structured
+ matrices over the integers and over finite fields.
+ .
+ This package provies user's documentation of LinBox.
+
+Package: linbox-dev-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Description: LinBox Developer Documentation
+ LinBox is a C++ template library for exact, high-performance
+ linear algebra computation with dense, sparse, and structured
+ matrices over the integers and over finite fields.
+ .
+ This package provies developer's documentation of LinBox.
diff --git a/tests/benchmark-blas-domain.C b/debian/liblinbox-dev.examples
similarity index 100%
copy from tests/benchmark-blas-domain.C
copy to debian/liblinbox-dev.examples
diff --git a/debian/linbox-dev-doc.doc-base b/debian/linbox-dev-doc.doc-base
new file mode 100644
index 0000000..9da51b5
--- /dev/null
+++ b/debian/linbox-dev-doc.doc-base
@@ -0,0 +1,10 @@
+Document: linbox-dev-doc
+Title: LinBox Documentation for Developers
+Author: Jean-Guillaume Dumas, Mark Giesbrecht, Pascal Giorgi, Bradford Hovinen, Erich Kaltofen, Clement Pernet, Daniel Roche, B. David Saunders, Arne Storjohann, William Turner, Gilles Villard, Zhendong Wan
+Abstract: Developer-oriented documentation of LinBox.
+Section: Science/Mathematics
+
+Format: HTML
+Index: /usr/share/doc/linbox-dev-doc/index.html
+Files: /usr/share/doc/linbox-dev-doc/*.html
+
diff --git a/debian/linbox-dev-doc.docs b/debian/linbox-dev-doc.docs
new file mode 100644
index 0000000..2d8ec4a
--- /dev/null
+++ b/debian/linbox-dev-doc.docs
@@ -0,0 +1 @@
+doc/linbox-dev-html/*
diff --git a/debian/linbox-user-doc.doc-base b/debian/linbox-user-doc.doc-base
new file mode 100644
index 0000000..a28b886
--- /dev/null
+++ b/debian/linbox-user-doc.doc-base
@@ -0,0 +1,9 @@
+Document: linbox-user-doc
+Title: LinBox Documentation for Users
+Author: Jean-Guillaume Dumas, Mark Giesbrecht, Pascal Giorgi, Bradford Hovinen, Erich Kaltofen, Clement Pernet, Daniel Roche, B. David Saunders, Arne Storjohann, William Turner, Gilles Villard, Zhendong Wan
+Abstract: User-oriented documentation of LinBox.
+Section: Science/Mathematics
+
+Format: HTML
+Index: /usr/share/doc/linbox-user-doc/index.html
+Files: /usr/share/doc/linbox-user-doc/*.html
diff --git a/debian/linbox-user-doc.docs b/debian/linbox-user-doc.docs
new file mode 100644
index 0000000..520bad2
--- /dev/null
+++ b/debian/linbox-user-doc.docs
@@ -0,0 +1 @@
+doc/linbox-html/*
diff --git a/debian/patches/fix-doc-path.patch b/debian/patches/fix-doc-path.patch
new file mode 100644
index 0000000..489ffd6
--- /dev/null
+++ b/debian/patches/fix-doc-path.patch
@@ -0,0 +1,15 @@
+--- a/doc/mainpage.doxy
++++ b/doc/mainpage.doxy
+@@ -95,10 +95,10 @@
+  * - \subpage inst. Explains how to install from sources or from the latest svn
+  * version.
+  * - \subpage arch. Describes how %LinBox is organized
+- * - <a href="../linbox-html/index.html"     style="color: blue  ; font-weight:
++ * - <a href="../linbox-user-doc/index.html"     style="color: blue  ; font-weight:
+  * bold"> Documentation for Users</a>. If everything around is blue, then you
+  * are reading the lighter, user-oriented, documentation.
+- * - <a href="../linbox-dev-html/index.html" style="color: green ; font-weight:
++ * - <a href="../linbox-dev-doc/index.html" style="color: green ; font-weight:
+  * bold"> Documentation for Developers</a>. If everything around is green, then
+  * you can get to everything (not necessarily yet) documented.
+  * .
diff --git a/debian/patches/no-include-graph.patch b/debian/patches/no-include-graph.patch
new file mode 100644
index 0000000..cc7d365
--- /dev/null
+++ b/debian/patches/no-include-graph.patch
@@ -0,0 +1,19 @@
+--- a/doc/DoxyfileDev.mod
++++ b/doc/DoxyfileDev.mod
+@@ -1709,14 +1709,14 @@
+ # file showing the direct and indirect include dependencies of the file with
+ # other documented files.
+ 
+-INCLUDE_GRAPH          = YES
++INCLUDE_GRAPH          = NO
+ 
+ # If the ENABLE_PREPROCESSING, SEARCH_INCLUDES, INCLUDED_BY_GRAPH, and
+ # HAVE_DOT tags are set to YES then doxygen will generate a graph for each
+ # documented header file showing the documented files that directly or
+ # indirectly include this file.
+ 
+-INCLUDED_BY_GRAPH      = YES
++INCLUDED_BY_GRAPH      = NO
+ 
+ # If the CALL_GRAPH and HAVE_DOT options are set to YES then
+ # doxygen will generate a call dependency graph for every global function
diff --git a/debian/rules b/debian/rules
index b276ece..172280c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,9 +22,18 @@ override_dh_auto_configure:
 		--enable-sage \
 		--enable-shared
 
+override_dh_auto_install:
+	dh_auto_install --max-parallel=1
+	mkdir -p debian/liblinboxsage-dev/usr/include/linbox
+	mv debian/tmp/usr/include/linbox/linbox-sage.h \
+		debian/liblinboxsage-dev/usr/include/linbox
+
 override_dh_auto_build-indep:
 	dh_testdir
+	$(MAKE) docs_dev
 	$(MAKE) docs
+	rm -f doc/linbox-*html/INSTALL
+	rm -f doc/linbox-*html/COPYING
 
 %:
 	dh $@ --parallel

-- 
linbox: library for exact linear algebra

More information about the debian-science-commits mailing list