[Pkg-octave-commit] [octave] 06/09: Bump to debhelper compat level 11.

[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 89c17683403c2b0a4cfaf3f5fc33aea4adc3c0a9
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Thu Jan 4 15:39:12 2018 +0100

    Bump to debhelper compat level 11.
    
    Incidentally, all documentation is now under /usr/share/doc/octave.
    
    Gbp-Dch: Full
---
 debian/README.Debian                  | 4 ++--
 debian/compat                         | 2 +-
 debian/control                        | 2 +-
 debian/octave-doc.doc-base.lib        | 2 +-
 debian/octave-doc.doc-base.manual     | 2 +-
 debian/octave-doc.doc-base.refs       | 2 +-
 debian/octave-htmldoc.doc-base.lib    | 4 ++--
 debian/octave-htmldoc.doc-base.manual | 4 ++--
 debian/rules                          | 6 ++++++
 9 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/debian/README.Debian b/debian/README.Debian
index e7d0439..c133ad6 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -2,7 +2,7 @@ General information
 ===================
 
 The octave-doc package contains extra documentation in PDF form which can be
-found in the directory /usr/share/doc/octave-doc once this supplementary
+found in the directory /usr/share/doc/octave once this supplementary
 package is installed. Similarly, documentation in HTML format is available in
 the octave-htmldoc package, and documentation in Info format is in the
 octave-info package.
@@ -48,5 +48,5 @@ these packages, so one can use mkoctfile then.
 pkg.m is not part of liboctave-dev as it's used to find already installed
 packages (via /etc/octave.conf).
 
- -- Sébastien Villemot <sebastien at debian.org>, Wed, 12 Feb 2014 18:52:32 +0100
+ -- Sébastien Villemot <sebastien at debian.org>, Thu,  4 Jan 2018 15:54:01 +0100
 
diff --git a/debian/compat b/debian/compat
index f599e28..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
diff --git a/debian/control b/debian/control
index 0f074ed..8509285 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Section: math
 Priority: optional
 Build-Depends: automake,
                bison,
-               debhelper (>= 10.3),
+               debhelper (>= 11),
                default-jdk,
                desktop-file-utils,
                dh-exec,
diff --git a/debian/octave-doc.doc-base.lib b/debian/octave-doc.doc-base.lib
index 444ea24..2e341ce 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-doc/liboctave.pdf
+Files: /usr/share/doc/octave/liboctave.pdf
diff --git a/debian/octave-doc.doc-base.manual b/debian/octave-doc.doc-base.manual
index 300757e..e7a837e 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-doc/octave.pdf
+Files: /usr/share/doc/octave/octave.pdf
diff --git a/debian/octave-doc.doc-base.refs b/debian/octave-doc.doc-base.refs
index 77ff504..acf5e9d 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-doc/refcard-*.pdf
+Files: /usr/share/doc/octave/refcard-*.pdf
diff --git a/debian/octave-htmldoc.doc-base.lib b/debian/octave-htmldoc.doc-base.lib
index f75165a..8238295 100644
--- a/debian/octave-htmldoc.doc-base.lib
+++ b/debian/octave-htmldoc.doc-base.lib
@@ -8,5 +8,5 @@ Abstract: This document describes the Octave libraries. Octave is a
 Section: Science/Mathematics
 
 Format: HTML
-Index: /usr/share/doc/octave-htmldoc/liboctave.html/index.html
-Files: /usr/share/doc/octave-htmldoc/liboctave.html/*.html
+Index: /usr/share/doc/octave/liboctave.html/index.html
+Files: /usr/share/doc/octave/liboctave.html/*.html
diff --git a/debian/octave-htmldoc.doc-base.manual b/debian/octave-htmldoc.doc-base.manual
index 2f947dd..d5375e2 100644
--- a/debian/octave-htmldoc.doc-base.manual
+++ b/debian/octave-htmldoc.doc-base.manual
@@ -8,5 +8,5 @@ Abstract: Octave is a (mostly Matlab (R) compatible) high-level
 Section: Science/Mathematics
 
 Format: HTML
-Index: /usr/share/doc/octave-htmldoc/octave.html/index.html
-Files: /usr/share/doc/octave-htmldoc/octave.html/*.html
+Index: /usr/share/doc/octave/octave.html/index.html
+Files: /usr/share/doc/octave/octave.html/*.html
diff --git a/debian/rules b/debian/rules
index 3e1e1fc..84fa549 100755
--- a/debian/rules
+++ b/debian/rules
@@ -89,6 +89,12 @@ override_dh_makeshlibs:
 	dh_makeshlibs --package=octave --noscripts
 	dh_makeshlibs --no-package=octave
 
+# Since octave-htmldoc does not end with "-doc", dh_installdocs needs help in order
+# to figure the main doc package.
+override_dh_installdocs:
+	dh_installdocs --package=octave-htmldoc --doc-main-package=octave
+	dh_installdocs --no-package=octave-htmldoc
+
 get-orig-source:
 	uscan --force-download --rename --destdir .
 .PHONY: get-orig-source

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