diff --git a/src/ignore/debian/changelog b/src/ignore/debian/changelog index 5cb25b7..1cbef78 100644 --- a/src/ignore/debian/changelog +++ b/src/ignore/debian/changelog @@ -1,3 +1,9 @@ +rust-ignore (0.4.6-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium + + * Package ignore 0.4.6 from crates.io using debcargo 2.2.10 + + -- Ximin Luo Tue, 5 Feb 2019 19:00:06 -0800 + rust-ignore (0.4.4-1) unstable; urgency=medium * Team upload. diff --git a/src/ignore/debian/copyright.debcargo.hint b/src/ignore/debian/copyright.debcargo.hint index 4fa4d04..c531231 100644 --- a/src/ignore/debian/copyright.debcargo.hint +++ b/src/ignore/debian/copyright.debcargo.hint @@ -21,8 +21,8 @@ Files: debian/* Copyright: - 2018 Debian Rust Maintainers - 2018 Ximin Luo + 2018-2019 Debian Rust Maintainers + 2018-2019 Ximin Luo License: Unlicense or MIT License: MIT diff --git a/src/ignore/debian/patches/relax-crossbeam-channel-dep.diff b/src/ignore/debian/patches/relax-crossbeam-channel-dep.diff deleted file mode 100644 index 7989bb0..0000000 --- a/src/ignore/debian/patches/relax-crossbeam-channel-dep.diff +++ /dev/null @@ -1,41 +0,0 @@ -Index: rust-ignore-0.4.4/Cargo.toml -=================================================================== ---- rust-ignore-0.4.4.orig/Cargo.toml -+++ rust-ignore-0.4.4/Cargo.toml -@@ -26,7 +26,7 @@ repository = "https://github.com/BurntSu - name = "ignore" - bench = false - [dependencies.crossbeam-channel] --version = "0.2.4" -+version = "0.3.2" - - [dependencies.globset] - version = "0.4.2" -Index: rust-ignore-0.4.4/src/walk.rs -=================================================================== ---- rust-ignore-0.4.4.orig/src/walk.rs -+++ rust-ignore-0.4.4/src/walk.rs -@@ -1446,12 +1446,12 @@ impl Worker { - return None; - } - match self.rx.try_recv() { -- Some(Message::Work(work)) => { -+ Ok(Message::Work(work)) => { - self.waiting(false); - self.quitting(false); - return Some(work); - } -- Some(Message::Quit) => { -+ Ok(Message::Quit) => { - // We can't just quit because a Message::Quit could be - // spurious. For example, it's possible to observe that - // all workers are waiting even if there's more work to -@@ -1482,7 +1482,7 @@ impl Worker { - // Otherwise, spin. - } - } -- None => { -+ Err(_) => { - self.waiting(true); - self.quitting(false); - if self.num_waiting() == self.threads { diff --git a/src/ignore/debian/patches/series b/src/ignore/debian/patches/series deleted file mode 100644 index db87168..0000000 --- a/src/ignore/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -relax-crossbeam-channel-dep.diff