Use system highlight.js

This commit is contained in:
Ximin Luo 2017-05-16 13:11:10 +02:00
parent f40dfcc05f
commit 3d31b4caee
6 changed files with 80 additions and 22 deletions

1
debian/TODO.Debian vendored
View File

@ -1,4 +1,3 @@
- libjs-highlight.js needs updating (9.10 vs 8 in Debian)
- update d/copyright
- upload to experimental, check arch tests

4
debian/control vendored
View File

@ -156,7 +156,9 @@ Package: rust-doc
Section: doc
Architecture: all
Build-Profiles: <!nodoc>
Depends: ${misc:Depends}, libjs-jquery, libjs-mathjax, fonts-open-sans, fonts-font-awesome
Depends: ${misc:Depends},
libjs-jquery, libjs-highlight.js, libjs-mathjax,
fonts-open-sans, fonts-font-awesome
Description: Rust systems programming language - Documentation
Rust is a curly-brace, block-structured expression language. It
visually resembles the C language family, but differs significantly

2
debian/copyright vendored
View File

@ -8,6 +8,8 @@ Files-Excluded:
src/llvm
src/rt/hoedown/src/html_blocks.c
src/vendor/mdbook/src/theme/_FontAwesome
src/vendor/mdbook/src/theme/highlight.js
src/vendor/mdbook/src/theme/highlight.css
Files: *
Copyright: 2006-2009 Graydon Hoare

File diff suppressed because one or more lines are too long

View File

@ -11,6 +11,8 @@ u-fix-weird-arm-logic.diff
u-fix-debuginfo.patch
u-allow-stable-features.patch
gcc-4.8-aarch64-ice.diff
# Debian-specific patches, not suitable for upstream
d-raise-min-llvm-version.patch
d-disable-cargo-vendor.patch
@ -21,5 +23,3 @@ d-add-soname.patch
d-dynamic-link-llvm.patch
d-use-system-jquery.patch
d-no-web-dependencies-in-doc.patch
gcc-4.8-aarch64-ice.diff

View File

@ -2,6 +2,8 @@
# Something that does e.g.
# find $(DESTDIR) -name jquery.js -execdir ln -sf -T \
# /usr/share/doc/rust-doc/html/jquery.js '{}' \;
usr/share/javascript/jquery/jquery.min.js usr/share/doc/rust-doc/html/jquery.min.js
usr/share/fonts-font-awesome/css/font-awesome.min.css usr/share/doc/rust-doc/html/fonts-font-awesome.min.css
usr/share/javascript/mathjax usr/share/doc/rust-doc/html/mathjax
usr/share/javascript/jquery/jquery.min.js usr/share/doc/rust-doc/html/jquery.js
usr/share/fonts-font-awesome/css/font-awesome.min.css usr/share/doc/rust-doc/html/fonts-font-awesome.min.css
usr/share/javascript/mathjax usr/share/doc/rust-doc/html/mathjax
usr/share/javascript/highlight.js/styles/atelier-dune.light.css usr/share/doc/rust-doc/html/highlight.css
usr/share/javascript/highlight.js/highlight.js usr/share/doc/rust-doc/html/highlight.js