Update indicatif to 0.17.0, drop outdated patches

diff --git a/src/indicatif/debian/changelog b/src/indicatif/debian/changelog
index b8798b067030674c9cdbb35b84fc80592045fc5d..44017c27dfa6fb56ce96691b695e11ba2871fa0b 100644 (file)
--- a/src/indicatif/debian/changelog
+++ b/src/indicatif/debian/changelog
@@ -1,3 +1,11 @@
+rust-indicatif (0.17.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package indicatif 0.17.0 from crates.io using debcargo 2.5.0
+  * Drop outdated patches
+
+ -- Blair Noctis <n@sail.ng>  Mon, 29 Aug 2022 16:36:57 +0000
+
 rust-indicatif (0.16.0-1) unstable; urgency=medium
 
   * Package indicatif 0.16.0 from crates.io using debcargo 2.4.4-alpha.0

diff --git a/src/indicatif/debian/copyright b/src/indicatif/debian/copyright
index 47c094f7b57aeaba03316754648c7ad4d3bf1d5b..39888a00847c1e2f5f37f4e0f8161a9eafbb2355 100644 (file)
--- a/src/indicatif/debian/copyright
+++ b/src/indicatif/debian/copyright
@@ -1,16 +1,18 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: indicatif
 Upstream-Contact: Armin Ronacher <armin.ronacher@active-4.com>
-Source: https://github.com/mitsuhiko/indicatif
+Source: https://github.com/console-rs/indicatif
 
 Files: *
-Copyright: 2017-2018 Armin Ronacher <armin.ronacher@active-4.com>
+Copyright:
+ 2017-2020 Armin Ronacher <armin.ronacher@active-4.com>
+ 2021-2022 Dirkjan Ochtman <dirkjan@ochtman.nl>
 License: MIT
 
 Files: debian/*
 Copyright:
- 2018 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2018 Sylvestre Ledru <sylvestre@debian.org>
+ 2018-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2018-2022 Sylvestre Ledru <sylvestre@debian.org>
 License: MIT
 
 License: MIT

diff --git a/src/indicatif/debian/copyright.debcargo.hint b/src/indicatif/debian/copyright.debcargo.hint
index 58d4a69d2b025d34d30daef10e6a6247bc67f412..e529dec32a934503020a352cd8990b934d214a76 100644 (file)
--- a/src/indicatif/debian/copyright.debcargo.hint
+++ b/src/indicatif/debian/copyright.debcargo.hint
@@ -1,14 +1,10 @@
 Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: indicatif
-Upstream-Contact:
- Armin Ronacher <armin.ronacher@active-4.com>
- Dirkjan Ochtman <dirkjan@ochtman.nl>
-Source: https://github.com/mitsuhiko/indicatif
+Upstream-Contact: FIXME (overlay) UNKNOWN-AUTHORS
+Source: https://github.com/console-rs/indicatif
 
 Files: *
-Copyright:
- FIXME (overlay) UNKNOWN-YEARS Armin Ronacher <armin.ronacher@active-4.com>
- FIXME (overlay) UNKNOWN-YEARS Dirkjan Ochtman <dirkjan@ochtman.nl>
+Copyright: FIXME (overlay) UNKNOWN-AUTHORS FIXME (overlay) UNKNOWN-YEARS
 License: MIT
 Comment:
  FIXME (overlay): Since upstream copyright years are not available in
@@ -25,8 +21,8 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2020-2021 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2020-2021 Sylvestre Ledru <sylvestre@debian.org>
+ 2020-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2020-2022 Sylvestre Ledru <sylvestre@debian.org>
 License: MIT
 
 License: MIT

diff --git a/src/indicatif/debian/patches/bump-console.diff b/src/indicatif/debian/patches/bump-console.diff
deleted file mode 100644 (file)
index d8c3271..0000000
--- a/src/indicatif/debian/patches/bump-console.diff
+++ /dev/null
@@ -1,31 +0,0 @@
-Index: indicatif/Cargo.toml
-===================================================================
---- indicatif.orig/Cargo.toml
-+++ indicatif/Cargo.toml
-@@ -40,13 +40,13 @@ version = "1.3.1"
- features = ["std"]
- default-features = false
- 
--[dependencies.unicode-segmentation]
--version = "1.6.0"
--optional = true
-+#[dependencies.unicode-segmentation]
-+#version = "1.6.0"
-+#optional = true
- 
--[dependencies.unicode-width]
--version = "0.1.7"
--optional = true
-+#[dependencies.unicode-width]
-+#version = "0.1.7"
-+#optional = true
- [dev-dependencies.rand]
- version = "0.8"
- 
-@@ -56,5 +56,5 @@ features = ["time", "rt"]
- 
- [features]
- default = []
--improved_unicode = ["unicode-segmentation", "unicode-width", "console/unicode-width"]
-+#improved_unicode = ["unicode-segmentation", "unicode-width", "console/unicode-width"]
- with_rayon = ["rayon"]

diff --git a/src/indicatif/debian/patches/number-prefix.patch b/src/indicatif/debian/patches/number-prefix.patch
deleted file mode 100644 (file)
index 973fea3..0000000
--- a/src/indicatif/debian/patches/number-prefix.patch
+++ /dev/null
@@ -1,10 +0,0 @@
-From d0a7028c926ba9a2eeb04dfbb0914c765026e6c3 Mon Sep 17 00:00:00 2001
-From: mibac138 <5672750+mibac138@users.noreply.github.com>
-Date: Wed, 15 Apr 2020 02:07:42 +0200
-Subject: [PATCH] Update number_prefix to 0.4
-
----
- Cargo.toml    |  2 +-
- src/format.rs | 14 +++++++-------
- 2 files changed, 8 insertions(+), 8 deletions(-)
-

diff --git a/src/indicatif/debian/patches/series b/src/indicatif/debian/patches/series
deleted file mode 100644 (file)
index 9d07eb2..0000000
--- a/src/indicatif/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-bump-console.diff
-#number-prefix.patch