Update doc-base files. (Closes: #876831)

diff --git a/debian/changelog b/debian/changelog
index 751c7d1ea21f80e1ea38ba9ac01d94622a969c74..d78cc96b882ca0f426655e84261938d94430abcf 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ rustc (1.26.0+dfsg1-1~exp1) UNRELEASED; urgency=medium
 
   * New upstream release.
   * Update to latest Standards-Version; no changes required.
+  * Update doc-base files. (Closes: #876831)
 
  -- Ximin Luo <infinity0@debian.org>  Sat, 19 May 2018 14:14:04 -0700
 

diff --git a/debian/rust-doc.doc-base.book b/debian/rust-doc.doc-base.book
index 08ddd4d926f23bfa7d3a65820e61cdd6cc506563..80c3e08a89896e4bf0539e572cac5d6766d62eaa 100644 (file)
--- a/debian/rust-doc.doc-base.book
+++ b/debian/rust-doc.doc-base.book
@@ -10,3 +10,4 @@ Abstract:
 Format: HTML
 Index: /usr/share/doc/rust-doc/html/book/index.html
 Files: /usr/share/doc/rust-doc/html/book/*.html
+       /usr/share/doc/rust-doc/html/book/*/*.html

diff --git a/debian/rust-doc.doc-base.intro b/debian/rust-doc.doc-base.intro
deleted file mode 100644 (file)
index 270cce7..0000000
--- a/debian/rust-doc.doc-base.intro
+++ /dev/null
@@ -1,10 +0,0 @@
-Document: rust-intro
-Title: The Rust Guide
-Section: Programming/Rust
-Abstract:
- This introduction will give you a rough idea of what Rust is like,
- eliding many details.
-
-Format: HTML
-Index: /usr/share/doc/rust-doc/html/intro.html
-Files: /usr/share/doc/rust-doc/html/intro.html

diff --git a/debian/rust-doc.doc-base.reference b/debian/rust-doc.doc-base.reference
index e1909c83f6e1da086dc0136f5ae23821e25b5195..a538f8bcd865e8d430d42ea884d6510f317e18d0 100644 (file)
--- a/debian/rust-doc.doc-base.reference
+++ b/debian/rust-doc.doc-base.reference
@@ -6,5 +6,6 @@ Abstract:
  language.
 
 Format: HTML
-Index: /usr/share/doc/rust-doc/html/reference.html
-Files: /usr/share/doc/rust-doc/html/reference.html
+Index: /usr/share/doc/rust-doc/html/reference/index.html
+Files: /usr/share/doc/rust-doc/html/reference/*.html
+       /usr/share/doc/rust-doc/html/reference/*/*.html