From 8b8d5090e8fa854a7daa3643d76363b9d510b9fd Mon Sep 17 00:00:00 2001 From: Vasudev Kamath Date: Sun, 3 Dec 2017 19:16:24 +0530 Subject: [PATCH] Drop patch 1001 as its merged upstream. --- debian/patches/1001_fix_spelling_errors.patch | 75 ------------------- debian/patches/series | 1 - 2 files changed, 76 deletions(-) delete mode 100644 debian/patches/1001_fix_spelling_errors.patch diff --git a/debian/patches/1001_fix_spelling_errors.patch b/debian/patches/1001_fix_spelling_errors.patch deleted file mode 100644 index 0f8c4727b..000000000 --- a/debian/patches/1001_fix_spelling_errors.patch +++ /dev/null @@ -1,75 +0,0 @@ -Description: Fix spelling errors in cargo messages. -Author: Vasudev Kamath -Forwarded: https://github.com/rust-lang/cargo/pull/4532 -Last-Update: 2017-09-23 ---- -This patch header follows DEP-3: http://dep.debian.net/deps/dep3/ ---- a/src/bin/search.rs -+++ b/src/bin/search.rs -@@ -28,7 +28,7 @@ - Options: - -h, --help Print this message - --index INDEX Registry index to search in -- --host HOST DEPRICATED, renamed to '--index' -+ --host HOST DEPRECATED, renamed to '--index' - -v, --verbose ... Use verbose output (-vv very verbose/build.rs output) - -q, --quiet No output printed to stdout - --color WHEN Coloring: auto, always, never ---- a/src/cargo/util/toml/mod.rs -+++ b/src/cargo/util/toml/mod.rs -@@ -693,19 +693,19 @@ - bail!("virtual manifests do not define [package]"); - } - if me.lib.is_some() { -- bail!("virtual manifests do not specifiy [lib]"); -+ bail!("virtual manifests do not specify [lib]"); - } - if me.bin.is_some() { -- bail!("virtual manifests do not specifiy [[bin]]"); -+ bail!("virtual manifests do not specify [[bin]]"); - } - if me.example.is_some() { -- bail!("virtual manifests do not specifiy [[example]]"); -+ bail!("virtual manifests do not specify [[example]]"); - } - if me.test.is_some() { -- bail!("virtual manifests do not specifiy [[test]]"); -+ bail!("virtual manifests do not specify [[test]]"); - } - if me.bench.is_some() { -- bail!("virtual manifests do not specifiy [[bench]]"); -+ bail!("virtual manifests do not specify [[bench]]"); - } - - let mut nested_paths = Vec::new(); ---- a/src/etc/man/cargo-pkgid.1 -+++ b/src/etc/man/cargo-pkgid.1 -@@ -43,7 +43,7 @@ - .RE - .SH EXAMPLES - .PP --Retrive package specification for foo package -+Retrieve package specification for foo package - .IP - .nf - \f[C] -@@ -59,7 +59,7 @@ - \f[] - .fi - .PP --Retrive package specification for foo from crates.io -+Retrieve package specification for foo from crates.io - .IP - .nf - \f[C] ---- a/vendor/url-1.5.1/src/parser.rs -+++ b/vendor/url-1.5.1/src/parser.rs -@@ -683,7 +683,7 @@ - self.syntax_violation("unencoded @ sign in username or password") - } else { - self.syntax_violation( -- "embedding authentification information (username or password) \ -+ "embedding authentication information (username or password) \ - in an URL is not recommended") - } - last_at = Some((char_count, remaining.clone())) diff --git a/debian/patches/series b/debian/patches/series index 3f1c2cfc1..859a2408b 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,5 +2,4 @@ 2003_local-jquery.patch 2001_use-system-libgit2.patch 2002_disable-net-tests.patch -1001_fix_spelling_errors.patch 1002_fix_typo_cargo_search.patch -- 2.30.2