Pretty assertions: new upstream release + rebase of the patches

diff --git a/src/pretty-assertions/debian/changelog b/src/pretty-assertions/debian/changelog
index 6d2b89de2f13eb8610c15f1703242f40d637187e..3f7d6bead6dfcab3e6c7091bc5fa56ce777b513d 100644 (file)
--- a/src/pretty-assertions/debian/changelog
+++ b/src/pretty-assertions/debian/changelog
@@ -1,3 +1,10 @@
+rust-pretty-assertions (1.1.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package pretty_assertions 1.1.0 from crates.io using debcargo 2.5.0
+
+ -- Sylvestre Ledru <sylvestre@debian.org>  Thu, 10 Mar 2022 13:23:39 +0100
+
 rust-pretty-assertions (0.6.1-3) unstable; urgency=medium
 
   * Team upload.

diff --git a/src/pretty-assertions/debian/copyright.debcargo.hint b/src/pretty-assertions/debian/copyright.debcargo.hint
index eaf3d4683bf63b3a54c37673be323bde75346d88..aa9ab240bd2bc541a9264a99b92316ce86ac8e3b 100644 (file)
--- a/src/pretty-assertions/debian/copyright.debcargo.hint
+++ b/src/pretty-assertions/debian/copyright.debcargo.hint
@@ -3,12 +3,14 @@ Upstream-Name: pretty_assertions
 Upstream-Contact:
  Colin Kiegel <kiegel@gmx.de>
  Florent Fayolle <florent.fayolle69@gmail.com>
+ Tom Milligan <code@tommilligan.net>
 Source: https://github.com/colin-kiegel/rust-pretty-assertions
 
 Files: *
 Copyright:
  FIXME (overlay) UNKNOWN-YEARS Colin Kiegel <kiegel@gmx.de>
  FIXME (overlay) UNKNOWN-YEARS Florent Fayolle <florent.fayolle69@gmail.com>
+ FIXME (overlay) UNKNOWN-YEARS Tom Milligan <code@tommilligan.net>
 License: MIT or Apache-2.0
 Comment:
  FIXME (overlay): Since upstream copyright years are not available in
@@ -25,9 +27,9 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2019-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2019-2020 Robin Krahl <robin.krahl@ireas.org>
- 2019-2020 Wolfgang Silbermayr <wolfgang@silbermayr.at>
+ 2019-2022 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2019-2022 Robin Krahl <robin.krahl@ireas.org>
+ 2019-2022 Wolfgang Silbermayr <wolfgang@silbermayr.at>
 License: MIT or Apache-2.0
 
 License: Apache-2.0

diff --git a/src/pretty-assertions/debian/patches/fix-tests.diff b/src/pretty-assertions/debian/patches/fix-tests.diff
index 6b3a5041da22f57b9d01f01f87abc98d3a14b394..e69de29bb2d1d6434b8b29ae775ad8c2e48c5391 100644 (file)
--- a/src/pretty-assertions/debian/patches/fix-tests.diff
+++ b/src/pretty-assertions/debian/patches/fix-tests.diff
@@ -1,129 +0,0 @@
-Index: pretty-assertions/tests/assert_eq.rs
-===================================================================
---- pretty-assertions.orig/tests/assert_eq.rs
-+++ pretty-assertions/tests/assert_eq.rs
-@@ -12,10 +12,10 @@ extern crate difference;
- \e[32m>\e[0m\e[32m        lorem: "Hello W\e[0m\e[1;48;5;22;32mr\e[0m\e[32mo\e[0m\e[32mld!",\e[0m\r
-          ipsum: 42,\r
-          dolor: Ok(\r
--\e[31m<\e[0m\e[31m            "hey\e[0m\e[31m"\e[0m\r
--\e[32m>\e[0m\e[32m            "hey\e[0m\e[1;48;5;22;32m ho!\e[0m\e[32m"\e[0m\r
--         )\r
--     }\r
-+\e[31m<\e[0m\e[31m            "hey\e[0m\e[31m",\e[0m\r
-+\e[32m>\e[0m\e[32m            "hey\e[0m\e[1;48;5;22;32m ho!\e[0m\e[32m",\e[0m\r
-+         ),\r
-+     },\r
-  )\r
- \r
- "#)]\r
-@@ -52,10 +52,10 @@ fn assert_eq() {
- \e[32m>\e[0m\e[32m        lorem: "Hello W\e[0m\e[1;48;5;22;32mr\e[0m\e[32mo\e[0m\e[32mld!",\e[0m\r
-          ipsum: 42,\r
-          dolor: Ok(\r
--\e[31m<\e[0m\e[31m            "hey\e[0m\e[31m"\e[0m\r
--\e[32m>\e[0m\e[32m            "hey\e[0m\e[1;48;5;22;32m ho!\e[0m\e[32m"\e[0m\r
--         )\r
--     }\r
-+\e[31m<\e[0m\e[31m            "hey\e[0m\e[31m",\e[0m\r
-+\e[32m>\e[0m\e[32m            "hey\e[0m\e[1;48;5;22;32m ho!\e[0m\e[32m",\e[0m\r
-+         ),\r
-+     },\r
-  )\r
- \r
- "#\r
-@@ -104,7 +104,7 @@ fn assert_eq_with_comparable_types() {
- \e[32m>\e[0m\e[32m    \e[0m\e[1;48;5;22;32m84\e[0m\e[32m,\e[0m\r
- \e[32m>\e[0m\e[32m    \e[0m\e[32m2\e[0m\e[1;48;5;22;32m4\e[0m\e[32m8,\e[0m\r
- \e[32m>\e[0m\e[32m    \e[0m\e[1;48;5;22;32m4\e[0m\e[32m5,\e[0m\r
--     64\r
-+     64,\r
-  ]\r
- \r
- "#)]\r
-@@ -124,10 +124,10 @@ fn issue12() {
- \e[32m>\e[0m\e[32m        lorem: "Hello W\e[0m\e[1;48;5;22;32mr\e[0m\e[32mo\e[0m\e[32mld!",\e[0m\r
-          ipsum: 42,\r
-          dolor: Ok(\r
--\e[31m<\e[0m\e[31m            "hey\e[0m\e[31m"\e[0m\r
--\e[32m>\e[0m\e[32m            "hey\e[0m\e[1;48;5;22;32m ho!\e[0m\e[32m"\e[0m\r
--         )\r
--     }\r
-+\e[31m<\e[0m\e[31m            "hey\e[0m\e[31m",\e[0m\r
-+\e[32m>\e[0m\e[32m            "hey\e[0m\e[1;48;5;22;32m ho!\e[0m\e[32m",\e[0m\r
-+         ),\r
-+     },\r
-  )\r
- \r
- "#)]\r
-@@ -164,10 +164,10 @@ fn assert_eq_trailing_comma() {
- \e[32m>\e[0m\e[32m        lorem: "Hello W\e[0m\e[1;48;5;22;32mr\e[0m\e[32mo\e[0m\e[32mld!",\e[0m\r
-          ipsum: 42,\r
-          dolor: Ok(\r
--\e[31m<\e[0m\e[31m            "hey\e[0m\e[31m"\e[0m\r
--\e[32m>\e[0m\e[32m            "hey\e[0m\e[1;48;5;22;32m ho!\e[0m\e[32m"\e[0m\r
--         )\r
--     }\r
-+\e[31m<\e[0m\e[31m            "hey\e[0m\e[31m",\e[0m\r
-+\e[32m>\e[0m\e[32m            "hey\e[0m\e[1;48;5;22;32m ho!\e[0m\e[32m",\e[0m\r
-+         ),\r
-+     },\r
-  )\r
- \r
- "#\r
-Index: pretty-assertions/tests/assert_ne.rs
-===================================================================
---- pretty-assertions.orig/tests/assert_ne.rs
-+++ pretty-assertions/tests/assert_ne.rs
-@@ -9,9 +9,9 @@ Some(
-         lorem: "Hello World!",\r
-         ipsum: 42,\r
-         dolor: Ok(\r
--            "hey"\r
--        )\r
--    }\r
-+            "hey",\r
-+        ),\r
-+    },\r
- )\r
- \r
- "#)]\r
-@@ -42,9 +42,9 @@ Some(
-         lorem: "Hello World!",\r
-         ipsum: 42,\r
-         dolor: Ok(\r
--            "hey"\r
--        )\r
--    }\r
-+            "hey",\r
-+        ),\r
-+    },\r
- )\r
- \r
- "#\r
-@@ -116,9 +116,9 @@ Some(
-         lorem: "Hello World!",\r
-         ipsum: 42,\r
-         dolor: Ok(\r
--            "hey"\r
--        )\r
--    }\r
-+            "hey",\r
-+        ),\r
-+    },\r
- )\r
- \r
- "#)]\r
-@@ -149,9 +149,9 @@ Some(
-         lorem: "Hello World!",\r
-         ipsum: 42,\r
-         dolor: Ok(\r
--            "hey"\r
--        )\r
--    }\r
-+            "hey",\r
-+        ),\r
-+    },\r
- )\r
- \r
- "#\r

diff --git a/src/pretty-assertions/debian/patches/relax-dep.diff b/src/pretty-assertions/debian/patches/relax-dep.diff
index c820cc2e8b00dc9ef23cd35a4e96819d3fe9f24a..951558f1ad7fb7392737cf06ba0ed9db9902d719 100644 (file)
--- a/src/pretty-assertions/debian/patches/relax-dep.diff
+++ b/src/pretty-assertions/debian/patches/relax-dep.diff
@@ -2,12 +2,12 @@ Index: pretty-assertions/Cargo.toml
 ===================================================================
 --- pretty-assertions.orig/Cargo.toml
 +++ pretty-assertions/Cargo.toml
-@@ -23,7 +23,7 @@ categories = ["development-tools"]
- license = "MIT/Apache-2.0"
+@@ -22,7 +22,7 @@ categories = ["development-tools"]
+ license = "MIT OR Apache-2.0"
  repository = "https://github.com/colin-kiegel/rust-pretty-assertions"
  [dependencies.ansi_term]
--version = "0.11"
+-version = "0.12.1"
 +version = ">= 0.11, < 0.13"
  
- [dependencies.difference]
- version = "2.0.0"
+ [dependencies.diff]
+ version = "0.1.12"