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

[Lifeng Sun]

The following commit has been merged in the master branch:
commit cbd66642ef72af592378812cab01d5a784e51abc
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Tue Jul 17 08:21:49 2012 +0800

    Rename linbox-user-doc to liblinbox-doc and remove linbox-dev-doc.

diff --git a/debian/changelog b/debian/changelog
index 9aff2db..dfb745e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,8 @@
 linbox (1.3.2-1) unstable; urgency=low
 
   * New maintainer.
-  * New upstream.
-  * New packages: liblinboxsage0, liblinboxsage-dev, linbox-user-doc and
-    linbox-dev-doc.
+  * New upstream release.
+  * New packages: liblinboxsage1, liblinboxsage-dev and liblinbox-doc.
   * Bump SONAME.
 
  -- Lifeng Sun <lifongsun at gmail.com>  Mon, 11 Jun 2012 21:32:35 +0800
diff --git a/debian/control b/debian/control
index 75c8f99..81d8892 100644
--- a/debian/control
+++ b/debian/control
@@ -59,24 +59,14 @@ Description: SAGE interface of LinBox - shared library
  .
  This package contains shared library of SAGE interface of LinBox.
 
-Package: linbox-user-doc
+Package: liblinbox-doc
 Section: doc
 Architecture: all
 Depends: ${misc:Depends}
-Description: LinBox User Documentation
+Description: LinBox 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.
+ This package provies 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/debian/liblinbox-doc.README.Debian b/debian/liblinbox-doc.README.Debian
new file mode 100644
index 0000000..e50b1b1
--- /dev/null
+++ b/debian/liblinbox-doc.README.Debian
@@ -0,0 +1,20 @@
+LinBox provides more detailed developer's documentation that includes
+descriptions of internal interfaces and data structures, we believe they
+are not interesting for most of LinBox users so the package does not ship
+developer's documentation.
+
+If you want to get developer's documentation, please follow these
+instructions:
+
+1.Get Debian source of LinBox
+
+   $ apt-get source linbox
+
+2.Generate developer's documentation
+
+   $ cd linbox-$ver/doc
+   $ doxygen DoxyfileDev.mod
+
+  now the documentation is under linbox-$ver/doc/linbox-dev-html/.
+
+ -- Lifeng Sun <lifongsun at gmail.com>  Mon, 16 Jul 2012 09:12:02 +0800
diff --git a/debian/linbox-user-doc.doc-base b/debian/liblinbox-doc.doc-base
similarity index 54%
rename from debian/linbox-user-doc.doc-base
rename to debian/liblinbox-doc.doc-base
index a28b886..7025222 100644
--- a/debian/linbox-user-doc.doc-base
+++ b/debian/liblinbox-doc.doc-base
@@ -1,9 +1,9 @@
-Document: linbox-user-doc
-Title: LinBox Documentation for Users
+Document: liblinbox-doc
+Title: LinBox Documentation
 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.
+Abstract: 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
+Index: /usr/share/doc/liblinbox-doc/index.html
+Files: /usr/share/doc/liblinbox-doc/*.html
diff --git a/debian/linbox-user-doc.docs b/debian/liblinbox-doc.docs
similarity index 100%
rename from debian/linbox-user-doc.docs
rename to debian/liblinbox-doc.docs
diff --git a/debian/linbox-dev-doc.doc-base b/debian/linbox-dev-doc.doc-base
deleted file mode 100644
index 9da51b5..0000000
--- a/debian/linbox-dev-doc.doc-base
+++ /dev/null
@@ -1,10 +0,0 @@
-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
deleted file mode 100644
index 2d8ec4a..0000000
--- a/debian/linbox-dev-doc.docs
+++ /dev/null
@@ -1 +0,0 @@
-doc/linbox-dev-html/*
diff --git a/debian/patches/fix-doc-path.patch b/debian/patches/fix-doc-path.patch
index 489ffd6..37848b4 100644
--- a/debian/patches/fix-doc-path.patch
+++ b/debian/patches/fix-doc-path.patch
@@ -1,15 +1,20 @@
 --- a/doc/mainpage.doxy
 +++ b/doc/mainpage.doxy
-@@ -95,10 +95,10 @@
+@@ -95,12 +95,14 @@
   * - \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:
++ * - <a href="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:
++ * - <a href="../liblinbox-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.
+- * you can get to everything (not necessarily yet) documented.
++ * you can get to everything (not necessarily yet) documented. Note: The Debian
++ * package does not ship this documentation, for details please see
++ * /usr/share/doc/liblinbox-doc/README.Debian.
   * .
+  *
+  * \section contrib Contributing to LinBox, getting assistance.
diff --git a/debian/patches/no-include-graph.patch b/debian/patches/no-include-graph.patch
deleted file mode 100644
index cc7d365..0000000
--- a/debian/patches/no-include-graph.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- 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/patches/series b/debian/patches/series
index 5fd1c0d..8020f62 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 example.patch
 soname.patch
+fix-doc-path.patch

-- 
linbox: library for exact linear algebra