[SCM] givaro: library for arithmetic and algebraic computations branch, master, updated. debian/3.2.13-1.3-30-g6204b0e

[Lifeng Sun]

The following commit has been merged in the master branch:
commit 6204b0e9cda66d2a0ea43bc3e0f516c3b3d0d92c
Author: Lifeng Sun <lifongsun at gmail.com>
Date:   Sun Jul 15 21:57:21 2012 +0800

    Change documentation path.

diff --git a/debian/givaro-dev-doc.doc-base b/debian/givaro-dev-doc.doc-base
index c966231..5b08f3a 100644
--- a/debian/givaro-dev-doc.doc-base
+++ b/debian/givaro-dev-doc.doc-base
@@ -5,5 +5,5 @@ Abstract: Developer's Reference of Givaro
 Section: Science/Mathematics
 
 Format: HTML
-Index: /usr/share/doc/givaro-dev-doc/html/index.html
-Files: /usr/share/doc/givaro-dev-doc/html/*.html
+Index: /usr/share/doc/givaro-dev-doc/index.html
+Files: /usr/share/doc/givaro-dev-doc/*.html
diff --git a/debian/givaro-dev-doc.install b/debian/givaro-dev-doc.install
index 8cf302d..e038f7e 100644
--- a/debian/givaro-dev-doc.install
+++ b/debian/givaro-dev-doc.install
@@ -1 +1 @@
-docs/givaro-dev-html/* usr/share/doc/givaro-dev-doc/html
+docs/givaro-dev-html/* usr/share/doc/givaro-dev-doc/
diff --git a/debian/givaro-user-doc.doc-base b/debian/givaro-user-doc.doc-base
index 0d1eccf..2492ce8 100644
--- a/debian/givaro-user-doc.doc-base
+++ b/debian/givaro-user-doc.doc-base
@@ -5,5 +5,5 @@ Abstract: User's Guide of Givaro
 Section: Science/Mathematics
 
 Format: HTML
-Index: /usr/share/doc/givaro-user-doc/html/index.html
-Files: /usr/share/doc/givaro-user-doc/html/*.html
+Index: /usr/share/doc/givaro-user-doc/index.html
+Files: /usr/share/doc/givaro-user-doc/*.html
diff --git a/debian/givaro-user-doc.install b/debian/givaro-user-doc.install
index 5d605b3..7d329fb 100644
--- a/debian/givaro-user-doc.install
+++ b/debian/givaro-user-doc.install
@@ -1 +1 @@
-docs/givaro-html/* usr/share/doc/givaro-user-doc/html
+docs/givaro-html/* usr/share/doc/givaro-user-doc/
diff --git a/debian/patches/fix-doc-path.patch b/debian/patches/fix-doc-path.patch
new file mode 100644
index 0000000..a864f83
--- /dev/null
+++ b/debian/patches/fix-doc-path.patch
@@ -0,0 +1,15 @@
+--- a/docs/mainpage.doxy
++++ b/docs/mainpage.doxy
+@@ -22,10 +22,10 @@
+  * - \subpage tuto. This is a brief introduction to %LinBox capabilities.
+  * - \subpage inst. Explains how to install from sources or from the latest cvs version.
+  * - \subpage arch. Describes how Givaro is organized
+- * - <a href="../givaro-html/index.html"     style="color: blue  ; font-weight: bold">
++ * - <a href="../givaro-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="../givaro-dev-html/index.html" style="color: green ; font-weight: bold">
++ * - <a href="../givaro-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/series b/debian/patches/series
index f191d13..c3d048e 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+fix-doc-path.patch
 givaro-makefile.patch
 doxygen-exclude-debian-dir.patch
 local-include-syntax.patch
diff --git a/debian/rules b/debian/rules
index 6d842c8..822d400 100755
--- a/debian/rules
+++ b/debian/rules
@@ -26,6 +26,7 @@ override_dh_auto_build-indep:
 	mkdir -p docs/givaro-dev-html
 	$(MAKE) -C docs docs_dev
 	rm -f docs/givaro-*html/COPYING
+	rm -f docs/givaro-*html/INSTALL
 
 override_dh_auto_test:
 	dh_auto_test --max-parallel=1

-- 
givaro: library for arithmetic and algebraic computations