[Pkg-octave-commit] [octave] 03/08: Install back the PDF files of the octave-doc package in /usr/share/doc/octave-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 octave.

commit 6d80233fc88b56e3c79204c41f61fe16316826ab
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Sun Sep 10 16:53:26 2017 +0200

    Install back the PDF files of the octave-doc package in /usr/share/doc/octave-doc
    
    This fixes FTBFS with DEB_BUILD_OPTIONS=nodoc.
    The PDF will be moved again to /usr/share/doc/octave when we bump to debhelper
    compat level 11.
    
    Gbp-Dch: Full
---
 debian/octave-doc.doc-base.lib    | 2 +-
 debian/octave-doc.doc-base.manual | 2 +-
 debian/octave-doc.doc-base.refs   | 2 +-
 debian/octave-doc.docs            | 5 +++++
 debian/octave-doc.install         | 9 ---------
 5 files changed, 8 insertions(+), 12 deletions(-)

diff --git a/debian/octave-doc.doc-base.lib b/debian/octave-doc.doc-base.lib
index 2e341ce..444ea24 100644
--- a/debian/octave-doc.doc-base.lib
+++ b/debian/octave-doc.doc-base.lib
@@ -8,4 +8,4 @@ Abstract: This document describes the Octave libraries. Octave is a
 Section: Science/Mathematics
 
 Format: PDF
-Files: /usr/share/doc/octave/liboctave.pdf
+Files: /usr/share/doc/octave-doc/liboctave.pdf
diff --git a/debian/octave-doc.doc-base.manual b/debian/octave-doc.doc-base.manual
index e7a837e..300757e 100644
--- a/debian/octave-doc.doc-base.manual
+++ b/debian/octave-doc.doc-base.manual
@@ -8,4 +8,4 @@ Abstract: Octave is a (mostly Matlab (R) compatible) high-level
 Section: Science/Mathematics
 
 Format: PDF
-Files: /usr/share/doc/octave/octave.pdf
+Files: /usr/share/doc/octave-doc/octave.pdf
diff --git a/debian/octave-doc.doc-base.refs b/debian/octave-doc.doc-base.refs
index acf5e9d..77ff504 100644
--- a/debian/octave-doc.doc-base.refs
+++ b/debian/octave-doc.doc-base.refs
@@ -8,4 +8,4 @@ Abstract: Octave is a (mostly Matlab (R) compatible) high-level
 Section: Science/Mathematics
 
 Format: PDF
-Files: /usr/share/doc/octave/refcard-*.pdf
+Files: /usr/share/doc/octave-doc/refcard-*.pdf
diff --git a/debian/octave-doc.docs b/debian/octave-doc.docs
new file mode 100644
index 0000000..49aca2c
--- /dev/null
+++ b/debian/octave-doc.docs
@@ -0,0 +1,5 @@
+doc/liboctave/liboctave.pdf
+doc/interpreter/octave.pdf
+doc/refcard/refcard-a4.pdf
+doc/refcard/refcard-legal.pdf
+doc/refcard/refcard-letter.pdf
diff --git a/debian/octave-doc.install b/debian/octave-doc.install
deleted file mode 100644
index 72ed07e..0000000
--- a/debian/octave-doc.install
+++ /dev/null
@@ -1,9 +0,0 @@
-# This file can be transformed into a .docs one as soon as we upgrade to
-# debhelper compat level 11 (since docs file will then be installed by default
-# in the main octave package and not in octave-doc, as mandated by policy
-# §12.3)
-doc/liboctave/liboctave.pdf	usr/share/doc/octave
-doc/interpreter/octave.pdf	usr/share/doc/octave
-doc/refcard/refcard-a4.pdf	usr/share/doc/octave
-doc/refcard/refcard-legal.pdf	usr/share/doc/octave
-doc/refcard/refcard-letter.pdf	usr/share/doc/octave

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave.git