[lapack] 05/09: Merge liblapack-doc-man into liblapack-doc.

[Sébastien Villemot]

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

sebastien pushed a commit to branch master
in repository lapack.

commit 73d1c6867eec34d16c8e158dae0f80ae52abf1b9
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Tue Jul 4 14:36:40 2017 +0200

    Merge liblapack-doc-man into liblapack-doc.
    
    Now that both packages are smaller, it makes sense to merge them.
    liblapack-doc-man is now a transitional package.
    
    Gbp-Dch: Full
---
 debian/control                                     | 42 ++++++++++------------
 debian/liblapack-doc-man.lintian-overrides         |  2 --
 debian/liblapack-doc.lintian-overrides             |  2 ++
 ...ack-doc-man.manpages => liblapack-doc.manpages} |  0
 4 files changed, 20 insertions(+), 26 deletions(-)

diff --git a/debian/control b/debian/control
index 1b9faa5..bb41061 100644
--- a/debian/control
+++ b/debian/control
@@ -52,8 +52,7 @@ Depends: ${misc:Depends},
          libblas-dev | libblas.so,
          liblapack-dev | liblapack.so,
          libtmglib-dev
-Suggests: liblapack-doc-man,
-          liblapack-doc
+Suggests: liblapack-doc
 Description: Library of linear algebra routines 3 - Headers
  LAPACK version 3.X is a comprehensive FORTRAN library that does
  linear algebra operations including matrix inversions, least
@@ -95,8 +94,7 @@ Section: libdevel
 Depends: ${misc:Depends},
          liblapack3 (= ${binary:Version}),
          libblas-dev | libblas.so
-Suggests: liblapack-doc-man,
-          liblapack-doc
+Suggests: liblapack-doc
 Provides: liblapack.so
 Description: Library of linear algebra routines 3 - static version
  LAPACK version 3.X is a comprehensive FORTRAN library that does
@@ -153,7 +151,9 @@ Package: liblapack-doc
 Architecture: all
 Section: doc
 Depends: ${misc:Depends}
-Description: Library of linear algebra routines 3 - documentation (HTML)
+Breaks: liblapack-doc-man (<< 3.7.1)
+Replaces: liblapack-doc-man (<< 3.7.1)
+Description: Library of linear algebra routines 3 - documentation
  LAPACK version 3.X is a comprehensive FORTRAN library that does
  linear algebra operations including matrix inversions, least
  squared solutions to linear sets of equations, eigenvector
@@ -161,23 +161,10 @@ Description: Library of linear algebra routines 3 - documentation (HTML)
  comprehensive and reputable package that has found extensive
  use in the scientific community.
  .
- This package contains the Lapack User's Guide manual in HTML format.
-
-Package: liblapack-doc-man
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Breaks: libblas-doc (<< 3.6.0)
-Replaces: libblas-doc (<< 3.6.0)
-Description: Library of linear algebra routines 3 - documentation (manual pages)
- LAPACK version 3.X is a comprehensive FORTRAN library that does
- linear algebra operations including matrix inversions, least
- squared solutions to linear sets of equations, eigenvector
- analysis, singular value decomposition, etc. It is a very
- comprehensive and reputable package that has found extensive
- use in the scientific community.
- .
- This package contains manpages for all BLAS and LAPACK routines.
+ This package contains:
+  - manpages of BLAS and LAPACK routines,
+  - the Lapack User's Guide manual (in HTML),
+  - the manual for the LAPACKE C interface to LAPACK (in PDF).
 
 Package: libblas3
 Architecture: any
@@ -209,8 +196,7 @@ Section: libdevel
 Depends: libblas3 (= ${binary:Version}),
          ${misc:Depends},
          gfortran
-Suggests: liblapack-doc-man,
-          liblapack-doc
+Suggests: liblapack-doc
 Provides: libblas.so
 Description: Basic Linear Algebra Subroutines 3, static library
  This package is a binary incompatible upgrade to the blas-dev
@@ -248,3 +234,11 @@ Description: Basic Linear Algebra Subroutines 3, testing programs
  the libblas.so.3 alternative, or by using the LD_LIBRARY_PATH or LD_PRELOAD
  environment variables. Likewise, one can display the library selected using
  the ldd program in an identical environment.
+
+Package: liblapack-doc-man
+Architecture: all
+Section: oldlibs
+Priority: extra
+Depends: ${misc:Depends}, liblapack-doc
+Description: Transitional package for BLAS and LAPACK manpages
+ This is a transitional dummy package. It can be safely removed.
diff --git a/debian/liblapack-doc-man.lintian-overrides b/debian/liblapack-doc-man.lintian-overrides
deleted file mode 100644
index 996fe01..0000000
--- a/debian/liblapack-doc-man.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-# Upstream does not provide a meaningful brief description of functions
-manpage-has-bad-whatis-entry *
diff --git a/debian/liblapack-doc.lintian-overrides b/debian/liblapack-doc.lintian-overrides
index a812da8..66707fc 100644
--- a/debian/liblapack-doc.lintian-overrides
+++ b/debian/liblapack-doc.lintian-overrides
@@ -1,2 +1,4 @@
 # Using the jquery.js from libjs-jquery instead of the Doxygen-generated breaks the HTML doc
 embedded-javascript-library usr/share/doc/liblapack-doc/explore-html/jquery.js please use libjs-jquery
+# Upstream does not provide a meaningful brief description of functions
+manpage-has-bad-whatis-entry *
diff --git a/debian/liblapack-doc-man.manpages b/debian/liblapack-doc.manpages
similarity index 100%
rename from debian/liblapack-doc-man.manpages
rename to debian/liblapack-doc.manpages

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