which: Update to 4.2.4

diff --git a/src/which/debian/changelog b/src/which/debian/changelog
index bed1fd3f3861e8627cc0a389b871156331054228..11dd8f7c626fff3943997ac7104250dc80b6f245 100644 (file)
--- a/src/which/debian/changelog
+++ b/src/which/debian/changelog
@@ -1,3 +1,11 @@
+rust-which (4.2.4-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package which 4.2.4 from crates.io using debcargo 2.5.0
+  * Backport patch from upstream to use tempfile crate instead of tempdir
+
+ -- James McCoy <jamessan@debian.org>  Fri, 18 Feb 2022 20:22:12 -0500
+
 rust-which (3.0.0-2) unstable; urgency=medium
 
   [ Sylvestre Ledru ]

diff --git a/src/which/debian/copyright.debcargo.hint b/src/which/debian/copyright.debcargo.hint
index 0d61f8ead287ff1fc7ea94b87010e5ecd05cf3dd..58bf44d03fe71e6196c91f9de491d13066a33ee8 100644 (file)
--- a/src/which/debian/copyright.debcargo.hint
+++ b/src/which/debian/copyright.debcargo.hint
@@ -21,8 +21,8 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2018-2019 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2018-2019 Ximin Luo <infinity0@debian.org>
+ 2018-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2018-2022 Ximin Luo <infinity0@debian.org>
 License: MIT
 
 License: MIT

diff --git a/src/which/debian/patches/series b/src/which/debian/patches/series
new file mode 100644 (file)
index 0000000..03f03f1
--- /dev/null
+++ b/src/which/debian/patches/series
@@ -0,0 +1 @@
+tempfile.patch

diff --git a/src/which/debian/patches/tempfile.patch b/src/which/debian/patches/tempfile.patch
new file mode 100644 (file)
index 0000000..d03ff0f
--- /dev/null
+++ b/src/which/debian/patches/tempfile.patch
@@ -0,0 +1,52 @@
+From 894cbdbb7042a776470402104ef9b6adc18c101f Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Alexander=20Kj=C3=A4ll?= <alexander.kjall@gmail.com>
+Date: Mon, 7 Feb 2022 12:58:21 +0100
+Subject: [PATCH] Replace tempdir with tempfile, as the tempdir crate have been
+ superceded by tempfile
+
+---
+ Cargo.toml     | 2 +-
+ tests/basic.rs | 5 ++---
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/Cargo.toml b/Cargo.toml
+index ec31c55..a77e831 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -32,7 +32,7 @@ regex = { version = "1.5.4", optional = true }
+ [dependencies.regex]
+ version = "1.5.4"
+ optional = true
+-[dev-dependencies.tempdir]
+-version = "0.3.7"
++[dev-dependencies.tempfile]
++version = "3"
+ [target."cfg(windows)".dependencies.lazy_static]
+ version = "1"
+diff --git a/tests/basic.rs b/tests/basic.rs
+index 34c7180..05d68e6 100644
+--- a/tests/basic.rs
++++ b/tests/basic.rs
+@@ -1,4 +1,3 @@
+-extern crate tempdir;
+ extern crate which;
+ 
+ #[cfg(feature = "regex")]
+@@ -8,7 +7,7 @@ use std::fs;
+ use std::io;
+ use std::path::{Path, PathBuf};
+ use std::{env, vec};
+-use tempdir::TempDir;
++use tempfile::TempDir;
+ 
+ struct TestFixture {
+     /// Temp directory.
+@@ -55,7 +54,7 @@ impl TestFixture {
+     // tmp/c/bin.exe
+     // tmp/c/bin.cmd
+     pub fn new() -> TestFixture {
+-        let tempdir = TempDir::new("which_tests").unwrap();
++        let tempdir = tempfile::tempdir().unwrap();
+         let mut builder = fs::DirBuilder::new();
+         builder.recursive(true);
+         let mut paths = vec![];