[SCM] givaro: library for arithmetic and algebraic computations branch, master, updated. debian/3.2.13-1.3-31-gb491579
Lifeng Sun
lifongsun at gmail.com
Mon Jul 16 01:27:58 UTC 2012
The following commit has been merged in the master branch:
commit b491579a5199ab7f3d6826bc5b1180b82ab55c58
Author: Lifeng Sun <lifongsun at gmail.com>
Date: Mon Jul 16 08:34:22 2012 +0800
Rename givaro-user-doc to libgivaro-doc and remove givaro-dev-doc.
diff --git a/debian/changelog b/debian/changelog
index 5e00a09..7ee8870 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ givaro (3.7.1-1) unstable; urgency=low
* Remove bus-error.patch: applied by upstream.
* Bump SONAME. (Closes: #678769)
* New patch: local-include-syntax.patch. (Closes: #681589)
+ * Rename givaro-user-doc to libgivaro-doc and remove givaro-dev-doc.
+ Thanks to Daniel Leidert.
-- Lifeng Sun <lifongsun at gmail.com> Fri, 13 Jul 2012 22:44:32 +0800
diff --git a/debian/control b/debian/control
index b3403db..8436bc5 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Package: libgivaro-dev
Section: libdevel
Architecture: any
Depends: ${misc:Depends}, libgivaro1 (= ${binary:Version}), make
-Suggests: givaro-dev-doc, givaro-user-doc
+Suggests: libgivaro-doc
Description: arithmetic and algebraic computations - development files
Givaro is a C++ library for arithmetic and algebraic computations.
Its main features are implementations of the basic arithmetic of many
@@ -58,11 +58,12 @@ Description: arithmetic and algebraic computations
.
This package contains runtime files for Givaro.
-Package: givaro-user-doc
+Package: libgivaro-doc
Section: doc
Architecture: all
Depends: ${misc:Depends}
-Description: User Documentation for Givaro
+Conflicts: givaro-user-doc
+Description: Documentation for Givaro
Givaro is a C++ library for arithmetic and algebraic computations.
Its main features are implementations of the basic arithmetic of many
mathematical entities: Primes fields, Extensions Fields, Finite
@@ -78,27 +79,4 @@ Description: User Documentation for Givaro
the LinBox linear algebra library and the Athapascan environment,
which permits parallel programming.
.
- This package contains User Documentation for Givaro.
-
-Package: givaro-dev-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Description: Developer Documentation for Givaro
- Givaro is a C++ library for arithmetic and algebraic computations.
- Its main features are implementations of the basic arithmetic of many
- mathematical entities: Primes fields, Extensions Fields, Finite
- Fields, Finite Rings, Polynomials, Algebraic numbers, and Arbitrary
- precision integers and rationals (C++ wrappers over gmp).
- .
- Givaro also provides data-structures and templated classes for the
- manipulation of basic algebraic objects, such as vectors, matrices
- (dense, sparse, structured), univariate polynomials (and therefore
- recursive multivariate).
- .
- It contains different program modules and is fully compatible with
- the LinBox linear algebra library and the Athapascan environment,
- which permits parallel programming.
- .
- This package contains Developer Documentation for Givaro.
-
+ This package contains Documentation for Givaro.
diff --git a/debian/givaro-dev-doc.doc-base b/debian/givaro-dev-doc.doc-base
deleted file mode 100644
index 5b08f3a..0000000
--- a/debian/givaro-dev-doc.doc-base
+++ /dev/null
@@ -1,9 +0,0 @@
-Document: givaro-dev-doc
-Title: Documentation of Givaro for Developers
-Author: Thierry Gautier, Jean-Louis Roch, Gilles Villard, Jean-Guillaume Dumas, Pascal Giorgi, Clement Pernet
-Abstract: Developer's Reference of Givaro
-Section: Science/Mathematics
-
-Format: 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
deleted file mode 100644
index e038f7e..0000000
--- a/debian/givaro-dev-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-docs/givaro-dev-html/* usr/share/doc/givaro-dev-doc/
diff --git a/debian/givaro-user-doc.install b/debian/givaro-user-doc.install
deleted file mode 100644
index 7d329fb..0000000
--- a/debian/givaro-user-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-docs/givaro-html/* usr/share/doc/givaro-user-doc/
diff --git a/debian/libgivaro-doc.README.Debian b/debian/libgivaro-doc.README.Debian
new file mode 100644
index 0000000..a0e3750
--- /dev/null
+++ b/debian/libgivaro-doc.README.Debian
@@ -0,0 +1,20 @@
+Givaro provides more detailed developer's documentation that includes
+descriptions of internal interfaces and data structures, we believe they
+are not interesting for most of Givaro 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 Givaro
+
+ $ apt-get source givaro
+
+2.Generate developer's documentation
+
+ $ cd givaro-$ver/docs
+ $ doxygen DoxyfileDev.mod
+
+ now the documentation is under givaro-$ver/docs/givaro-dev-html/.
+
+ -- Lifeng Sun <lifongsun at gmail.com> Mon, 16 Jul 2012 09:12:02 +0800
diff --git a/debian/givaro-user-doc.doc-base b/debian/libgivaro-doc.doc-base
similarity index 53%
rename from debian/givaro-user-doc.doc-base
rename to debian/libgivaro-doc.doc-base
index 2492ce8..47c4ed5 100644
--- a/debian/givaro-user-doc.doc-base
+++ b/debian/libgivaro-doc.doc-base
@@ -1,9 +1,9 @@
-Document: givaro-user-doc
-Title: Documentation of Givaro for Users
+Document: libgivaro-doc
+Title: Documentation of Givaro
Author: Thierry Gautier, Jean-Louis Roch, Gilles Villard, Jean-Guillaume Dumas, Pascal Giorgi, Clement Pernet
Abstract: User's Guide of Givaro
Section: Science/Mathematics
Format: HTML
-Index: /usr/share/doc/givaro-user-doc/index.html
-Files: /usr/share/doc/givaro-user-doc/*.html
+Index: /usr/share/doc/libgivaro-doc/index.html
+Files: /usr/share/doc/libgivaro-doc/*.html
diff --git a/debian/libgivaro-doc.install b/debian/libgivaro-doc.install
new file mode 100644
index 0000000..aac9866
--- /dev/null
+++ b/debian/libgivaro-doc.install
@@ -0,0 +1 @@
+docs/givaro-html/* usr/share/doc/libgivaro-doc/
diff --git a/debian/patches/fix-doc-path.patch b/debian/patches/fix-doc-path.patch
index a864f83..78a5169 100644
--- a/debian/patches/fix-doc-path.patch
+++ b/debian/patches/fix-doc-path.patch
@@ -1,15 +1,19 @@
--- a/docs/mainpage.doxy
+++ b/docs/mainpage.doxy
-@@ -22,10 +22,10 @@
+@@ -22,12 +22,13 @@
* - \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">
++ * - <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="../givaro-dev-html/index.html" style="color: green ; font-weight: bold">
-+ * - <a href="../givaro-dev-doc/index.html" style="color: green ; font-weight: bold">
++ * - <a href="../libgivaro-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.
+- * get to everything (not necessarily yet) documented.
++ * get to everything (not necessarily yet) documented. Note: The Debian package does not
++ * ship this documentation, for details please see /usr/share/doc/libgivaro-doc/README.Debian.
* .
+ * \section contrib Contributing to Givaro, getting assistance.
+ \version 3.6.0
diff --git a/debian/rules b/debian/rules
index 822d400..1c3b9dd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,8 +23,9 @@ override_dh_installexamples:
dh_installexamples -XMakefile -XMakefile.am -XMakefile.in
override_dh_auto_build-indep:
- mkdir -p docs/givaro-dev-html
- $(MAKE) -C docs docs_dev
+ #mkdir -p docs/givaro-dev-html
+ #$(MAKE) -C docs docs_dev
+ $(MAKE) docs
rm -f docs/givaro-*html/COPYING
rm -f docs/givaro-*html/INSTALL
--
givaro: library for arithmetic and algebraic computations
More information about the debian-science-commits
mailing list