diff --git a/src/starship/debian/patches/disable-battery.diff b/src/starship/debian/patches/disable-battery.diff index 40cb1a4..e69de29 100644 --- a/src/starship/debian/patches/disable-battery.diff +++ b/src/starship/debian/patches/disable-battery.diff @@ -1,24 +0,0 @@ -Index: starship/Cargo.toml -=================================================================== ---- starship.orig/Cargo.toml -+++ starship/Cargo.toml -@@ -40,10 +40,6 @@ features = ["tls", "form"] - optional = true - default-features = false - --[dependencies.battery] --version = "0.7.5" --optional = true -- - [dependencies.byte-unit] - version = "3.0.3" - -@@ -131,7 +127,7 @@ version = "0.5.2" - version = "3.1.0" - - [features] --default = ["battery", "http"] -+#default = ["battery", "http"] - http = ["attohttpc"] - tls-vendored = ["native-tls/vendored"] - [badges.is-it-maintained-issue-resolution] diff --git a/src/uucore/debian/changelog b/src/uucore/debian/changelog index 3ab1f7d..6944845 100644 --- a/src/uucore/debian/changelog +++ b/src/uucore/debian/changelog @@ -1,5 +1,5 @@ -rust-uucore (0.0.1-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium +rust-uucore (0.0.2-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium - * Package uucore 0.0.1 from crates.io using debcargo 2.4.0 + * Package uucore 0.0.2 from crates.io using debcargo 2.4.2 - -- Sylvestre Ledru Fri, 03 Jan 2020 09:06:15 +0100 + -- Sylvestre Ledru Wed, 22 Apr 2020 12:10:49 +0200 diff --git a/src/uucore/debian/patches/disable-dunce.diff b/src/uucore/debian/patches/disable-dunce.diff new file mode 100644 index 0000000..e5eb873 --- /dev/null +++ b/src/uucore/debian/patches/disable-dunce.diff @@ -0,0 +1,41 @@ +Index: uucore/Cargo.toml +=================================================================== +--- uucore.orig/Cargo.toml ++++ uucore/Cargo.toml +@@ -28,9 +28,6 @@ version = ">= 0.3.3, <= 0.3.30" + version = "~2.1" + optional = true + +-[dependencies.dunce] +-version = "1.0.0" +- + [dependencies.failure] + version = "<= 0.1.1" + optional = true +Index: uucore/src/fs.rs +=================================================================== +--- uucore.orig/src/fs.rs ++++ uucore/src/fs.rs +@@ -6,8 +6,6 @@ + // For the full copyright and license information, please view the LICENSE + // file that was distributed with this source code. + +-#[cfg(windows)] +-extern crate dunce; + #[cfg(target_os = "redox")] + extern crate termion; + +@@ -102,9 +100,10 @@ pub fn canonicalize>(orig + let original = original.as_ref(); + let original = if original.is_absolute() { + original.to_path_buf() +- } else { +- dunce::canonicalize(env::current_dir().unwrap()).unwrap().join(original) +- }; ++ } // windows specific ++ // else { ++ // dunce::canonicalize(env::current_dir().unwrap()).unwrap().join(original) ++ //}; + + let mut result = PathBuf::new(); + let mut parts = vec![]; diff --git a/src/uucore/debian/patches/series b/src/uucore/debian/patches/series new file mode 100644 index 0000000..567749b --- /dev/null +++ b/src/uucore/debian/patches/series @@ -0,0 +1,2 @@ +disable-dunce.diff +update-dep.diff diff --git a/src/uucore/debian/patches/update-dep.diff b/src/uucore/debian/patches/update-dep.diff new file mode 100644 index 0000000..8c3578c --- /dev/null +++ b/src/uucore/debian/patches/update-dep.diff @@ -0,0 +1,13 @@ +Index: uucore/Cargo.toml +=================================================================== +--- uucore.orig/Cargo.toml ++++ uucore/Cargo.toml +@@ -22,7 +22,7 @@ categories = ["os"] + license = "MIT" + repository = "https://github.com/uutils/uucore" + [dependencies.backtrace] +-version = ">= 0.3.3, <= 0.3.30" ++version = ">= 0.3.3" + + [dependencies.data-encoding] + version = "~2.1"