Numerous minor rust-doc fixups

- Correct guard on privacy-breach-logo fix
- Install RELEASES.md as upstream changelog
- Ignore TeX intermediate files when installing docs
- Install README.md into /usr/share/doc/rust/
- Install upstream docs into /usr/share/doc/rust-doc/html/
- Correct Index paths in doc-base files
- Add doc-base file for the Style Guidelines doc

diff --git a/debian/docs b/debian/docs
new file mode 100644 (file)
index 0000000..b43bf86
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1 @@
+README.md

diff --git a/debian/rules b/debian/rules
index 3a71505f558ab89a00e08af7f94d84b8ff91fddb..fb71af877e8a90959a1fd0f0079a1c520c747cc9 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -117,12 +117,18 @@ override_dh_install:
        # Brute force to remove privacy-breach-logo lintian warning.
        # We could have updated the upstream sources but it would complexify
        # the rebase
-       if test "$(BUILD)" = "1"; then \
+       if test "$(BUILD_DOCS)" = "1"; then \
                sed -i '/rel="shortcut icon" href="http:\/\/www.rust-lang.org\/favicon.ico"/d' `find $(DEB_DESTDIR) -iname '*.html'`; \
-               rm -f `find $(DEB_DESTDIR) -iname '*.html' -empty` $(DEB_DESTDIR)/usr/share/doc/rust/html/.lock; \
+               rm -f `find $(DEB_DESTDIR) -iname '*.html' -empty` $(DEB_DESTDIR)/usr/share/doc/rust-doc/html/.lock; \
        fi
        dh_install
 
+override_dh_installchangelogs:
+       dh_installchangelogs RELEASES.md
+
+override_dh_installdocs:
+       dh_installdocs -X.tex -X.aux -X.log -X.out -X.toc
+
 override_dh_auto_test:
        # NB: not parallel - there is some race that leads to failures like:
        # note: cc: error: x86_64-unknown-linux-gnu/test/run-pass/generic-default-type-params-cross-crate.stage2-x86_64-unknown-linux-gnulibaux/default_type_params_xc.o: No such file or directory

diff --git a/debian/rust-doc.doc-base.book b/debian/rust-doc.doc-base.book
index b722104e8786383eb66bcaa03c945597bd64bb1e..08ddd4d926f23bfa7d3a65820e61cdd6cc506563 100644 (file)
--- a/debian/rust-doc.doc-base.book
+++ b/debian/rust-doc.doc-base.book
@@ -7,6 +7,6 @@ Abstract:
  accomplishes these goals by being memory safe without using garbage
  collection.
 
-
 Format: HTML
-Index: /usr/share/doc/rust/book.html
+Index: /usr/share/doc/rust-doc/html/book/index.html
+Files: /usr/share/doc/rust-doc/html/book/*.html

diff --git a/debian/rust-doc.doc-base.intro b/debian/rust-doc.doc-base.intro
index 4781b379c16f15cda89a5d8ebee99cdf295cdb37..889f87e046390ebbe1876ecce874d63cd56014cd 100644 (file)
--- a/debian/rust-doc.doc-base.intro
+++ b/debian/rust-doc.doc-base.intro
@@ -1,11 +1,13 @@
 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.
+Abstract:
+ This introduction will give you a rough idea of what Rust is like,
+ eliding many details.
 
 Format: HTML
-Index: /usr/share/doc/rust/intro.html
+Index: /usr/share/doc/rust-doc/html/intro.html
+Files: /usr/share/doc/rust-doc/html/intro.html
 
 Format: EPUB
-Files: /usr/share/doc/rust/intro.epub
+Files: /usr/share/doc/rust-doc/html/intro.epub

diff --git a/debian/rust-doc.doc-base.reference b/debian/rust-doc.doc-base.reference
index e3a232cc9ba153e2e8f40d330c67e62c573003a3..a47525adaa4b72a72eeb4023cb7df295cf9ecbbd 100644 (file)
--- a/debian/rust-doc.doc-base.reference
+++ b/debian/rust-doc.doc-base.reference
@@ -1,14 +1,16 @@
 Document: rust-reference
 Title: The Rust Reference
 Section: Programming/Rust
-Abstract: This document is the primary reference for the Rust
- programming language.
+Abstract:
+ This document is the primary reference for the Rust programming
+ language.
 
 Format: HTML
-Index: /usr/share/doc/rust/reference.html
+Index: /usr/share/doc/rust-doc/html/reference.html
+Files: /usr/share/doc/rust-doc/html/reference.html
 
 Format: PDF
-Files: /usr/share/doc/rust/reference.pdf
+Files: /usr/share/doc/rust-doc/html/reference.pdf.gz
 
 Format: EPUB
-Files: /usr/share/doc/rust/reference.epub
+Files: /usr/share/doc/rust-doc/html/reference.epub

diff --git a/debian/rust-doc.doc-base.style b/debian/rust-doc.doc-base.style
new file mode 100644 (file)
index 0000000..269d820
--- /dev/null
+++ b/debian/rust-doc.doc-base.style
@@ -0,0 +1,12 @@
+Document: rust-style
+Title: The Rust Style Guidelines
+Section: Programming/Rust
+Abstract:
+ This document collects the emerging principles, conventions,
+ abstractions, and best practices for writing Rust code.
+
+Format: HTML
+Index: /usr/share/doc/rust-doc/html/style/index.html
+Files: /usr/share/doc/rust-doc/html/style/*.html
+ /usr/share/doc/rust-doc/html/style/*/*.html
+ /usr/share/doc/rust-doc/html/style/*/*/*.html

diff --git a/debian/rust-doc.docs b/debian/rust-doc.docs
index 30d29dea9becd50f5a7218c0e6eaaafbe5ca4dcd..179bbbcb8119afdedeada0113f66ca43bea8ace0 100644 (file)
--- a/debian/rust-doc.docs
+++ b/debian/rust-doc.docs
@@ -1 +1 @@
-doc/*
+debian/tmp/usr/lib/*/rust/*/share/doc/rust/html

diff --git a/debian/rust-doc.install b/debian/rust-doc.install
deleted file mode 100644 (file)
index 36b8711..0000000
--- a/debian/rust-doc.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/rust/*/share/doc/rust/ usr/share/doc