Add ITP for cargo-debstatus; various fixes

diff --git a/src/cargo-debstatus/debian/TODO b/src/cargo-debstatus/debian/TODO
deleted file mode 100644 (file)
index ff35f76..0000000
--- a/src/cargo-debstatus/debian/TODO
+++ /dev/null
@@ -1 +0,0 @@
-Requires postgres

diff --git a/src/cargo-debstatus/debian/changelog b/src/cargo-debstatus/debian/changelog
index 77e4c66ebc180aba465121b51730d478a7ea7b2d..3de7785d01194faf949aee128e707841c2354604 100644 (file)
--- a/src/cargo-debstatus/debian/changelog
+++ b/src/cargo-debstatus/debian/changelog
@@ -1,5 +1,5 @@
-rust-cargo-debstatus (0.2.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+rust-cargo-debstatus (0.4.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
 
-  * Package cargo-debstatus 0.2.0 from crates.io using debcargo 2.4.3
+  * Package cargo-debstatus 0.4.0 from crates.io using debcargo 2.6.0 (Closes: #1026852)
 
- -- Andrej Shadura <andrewsh@debian.org>  Tue, 10 Nov 2020 08:46:29 +0100
+ -- Matthias Geiger <matthias.geiger1024@tutanota.de>  Thu, 02 Feb 2023 19:06:02 +0100

diff --git a/src/cargo-debstatus/debian/copyright.debcargo.hint b/src/cargo-debstatus/debian/copyright.debcargo.hint
index 02eb3c47baefaae99e25d92a9c919d14f30bb342..5007eba268d9384df053321c7ddb53cc191a0811 100644 (file)
--- a/src/cargo-debstatus/debian/copyright.debcargo.hint
+++ b/src/cargo-debstatus/debian/copyright.debcargo.hint
@@ -16,7 +16,7 @@ Comment:
  be correct information so you should review and fix this before uploading to
  the archive.
 
-Files: ./LICENSE
+Files: LICENSE
 Copyright: 2007 Free Software Foundation, Inc. <http://fsf.org/>
 License: UNKNOWN-LICENSE; FIXME (overlay)
 Comment:
@@ -25,8 +25,9 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2020 Andrej Shadura <andrewsh@debian.org>
+ 2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2023 Andrej Shadura <andrewsh@debian.org>
+ 2023 Matthias Geiger <matthias.geiger1024@tutanota.de>
 License: GPL-3.0
 
 License: GPL-3.0

diff --git a/src/cargo-debstatus/debian/debcargo.toml b/src/cargo-debstatus/debian/debcargo.toml
index f445857eeaa0747bcfd473fb830b5a7c8f6f50b2..4c24ab7beeb8a0a4920ba9e3ca45e2326a883e4a 100644 (file)
--- a/src/cargo-debstatus/debian/debcargo.toml
+++ b/src/cargo-debstatus/debian/debcargo.toml
@@ -1,5 +1,5 @@
 overlay = "."
-uploaders = ["Andrej Shadura <andrewsh@debian.org>"]
+uploaders = ["Andrej Shadura <andrewsh@debian.org>", "Matthias Geiger <matthias.geiger1024@tutanota.de>"]
 
 summary = "print dependency tree of a Rust project using Cargo"
 description = """

diff --git a/src/cargo-debstatus/debian/patches/fix-type-mismatch.diff b/src/cargo-debstatus/debian/patches/fix-type-mismatch.diff
new file mode 100644 (file)
index 0000000..d08199a
--- /dev/null
+++ b/src/cargo-debstatus/debian/patches/fix-type-mismatch.diff
@@ -0,0 +1,19 @@
+Description: Fix type mismatch
+ This patch fixes the type mismatch happening because of the newer indicatif crate.
+ Thanks to bnoctis for pointing me in the right direction.
+Author: Matthias Geiger <matthias.geiger1024@tutanota.de>
+Forwarded: yes
+Last-Update: 2023-02-02
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/src/debian.rs
++++ b/src/debian.rs
+@@ -115,7 +115,7 @@
+     let pb = ProgressBar::new(jobs as u64)
+         .with_style(
+             ProgressStyle::default_bar()
+-                .template("[{pos:.green}/{len:.green}] {prefix:.bold} {wide_bar}"),
++                .template("[{pos:.green}/{len:.green}] {prefix:.bold} {wide_bar}")?,
+         )
+         .with_prefix("Resolving debian packages");
+     pb.tick();

diff --git a/src/cargo-debstatus/debian/patches/relax-deps.diff b/src/cargo-debstatus/debian/patches/relax-deps.diff
new file mode 100644 (file)
index 0000000..ea6cf4c
--- /dev/null
+++ b/src/cargo-debstatus/debian/patches/relax-deps.diff
@@ -0,0 +1,18 @@
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -33,13 +33,13 @@
+ version = "0.5.1"
+ 
+ [dependencies.dirs]
+-version = "3"
++version = "4"
+ 
+ [dependencies.env_logger]
+ version = "0.9.0"
+ 
+ [dependencies.indicatif]
+-version = "0.16.2"
++version = "0.17.3"
+ 
+ [dependencies.log]
+ version = "0.4.14"

diff --git a/src/cargo-debstatus/debian/patches/relax-deps.patch b/src/cargo-debstatus/debian/patches/relax-deps.patch
deleted file mode 100644 (file)
index c9900e0..0000000
--- a/src/cargo-debstatus/debian/patches/relax-deps.patch
+++ /dev/null
@@ -1,35 +0,0 @@
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -20,22 +20,22 @@ categories = ["command-line-utilities"]
- license = "GPL-3.0"
- repository = "https://github.com/kpcyrd/cargo-debstatus"
- [dependencies.cargo]
--version = "0.32.0"
-+version = ">= 0.32"
- 
- [dependencies.colored]
- version = "1.6.1"
- 
- [dependencies.dirs]
--version = "1.0"
-+version = "3.0"
- 
- [dependencies.env_logger]
--version = "0.6"
-+version = "0.7"
- 
- [dependencies.failure]
- version = "0.1"
- 
- [dependencies.petgraph]
--version = "0.4"
-+version = "0.5"
- 
- [dependencies.postgres]
- version = "0.15.2"
-@@ -53,4 +53,4 @@ version = "1.0"
- version = "1.0"
- 
- [dependencies.structopt]
--version = "0.2.10"
-+version = "0.3"

diff --git a/src/cargo-debstatus/debian/patches/series b/src/cargo-debstatus/debian/patches/series
index bdddf05ae546555b06f7432fa9bd69cb4590599a..39710efec6c2727942c88f4d3ce27eda2df440ad 100644 (file)
--- a/src/cargo-debstatus/debian/patches/series
+++ b/src/cargo-debstatus/debian/patches/series
@@ -1 +1,2 @@
-relax-deps.patch
+relax-deps.diff
+fix-type-mismatch.diff