Fix some lintian warnings

This commit is contained in:
Ximin Luo 2017-10-17 00:42:05 +02:00
parent cd17b70a13
commit 29fbeefd48
6 changed files with 22 additions and 5 deletions

View File

@ -105,8 +105,8 @@ output and logging messages, the term "host" and "target" mean as they do in
the previous paragraph. Yes, it's a total mind fuck. :( Table for clarity:
======================================= =============== ========================
GNU term / Debian envvar Rust ecosystem, Some parts of the rustc
rustc and cargo and cargo build scripts
Rust ecosystem, Some parts of the rustc
GNU term / Debian envvar rustc and cargo and cargo build scripts
======================================= =============== ========================
build DEB_BUILD_{ARCH,RUST_TYPE} host build
the machine running the build

2
debian/changelog vendored
View File

@ -7,6 +7,8 @@ rustc (1.21.0+dfsg1-1) UNRELEASED; urgency=medium
README.Debian for details.
* Fix the "install" target for cross-compilations; cross-compiling with
sbuild --host=$foreign-arch should work again.
* Update to latest Standards-Version; changes:
- Priority changed to optional from extra.
-- Ximin Luo <infinity0@debian.org> Mon, 16 Oct 2017 16:40:13 +0200

4
debian/control vendored
View File

@ -1,6 +1,6 @@
Source: rustc
Section: devel
Priority: extra
Priority: optional
Maintainer: Rust Maintainers <pkg-rust-maintainers@lists.alioth.debian.org>
Uploaders: Jordan Justen <jordan.l.justen@intel.com>,
Luca Bruno <lucab@debian.org>,
@ -41,7 +41,7 @@ Build-Depends: debhelper (>= 9),
# that, but this will keep things covered even in the case that they change
# gdb-minimal to do a versioned Provides: gdb.
Build-Conflicts: gdb-minimal <!nocheck>
Standards-Version: 4.0.0
Standards-Version: 4.1.1
Homepage: http://www.rust-lang.org/
Vcs-Git: https://anonscm.debian.org/git/pkg-rust/rust.git
Vcs-Browser: https://anonscm.debian.org/cgit/pkg-rust/rust.git

2
debian/copyright vendored
View File

@ -283,7 +283,7 @@ Comment: see upstream projects,
Files: src/vendor/ar/*
Copyright: 2017 Matthew D. Steele <mdsteele@alum.mit.edu>
License: MIT
License: Expat
Comment: see https://github.com/mdsteele/rust-ar
Files: src/vendor/atty/*

View File

@ -13,6 +13,7 @@ u-ignoretest-ppc64el.patch
u-ignoretest-ppc64el_02.patch
u-output-failed-commands.patch
u-cross-compile-install.patch
u-prefer-local-css.patch
# not forwarded, or forwarded but unlikely to be merged
u-reproducible-dl-stage0.patch

14
debian/patches/u-prefer-local-css.patch vendored Normal file
View File

@ -0,0 +1,14 @@
Description: Prefer local CSS to remote
Author: Ximin Luo <infinity0@debian.org>
Bug: https://github.com/rust-lang/rust/pull/45331
--- a/src/bootstrap/doc.rs
+++ b/src/bootstrap/doc.rs
@@ -411,7 +411,7 @@
if filename == "not_found.md" {
cmd.arg("--markdown-no-toc")
.arg("--markdown-css")
- .arg("https://doc.rust-lang.org/rust.css");
+ .arg("rust.css");
} else {
cmd.arg("--markdown-css").arg("rust.css");
}