sync clap packaging with Debian unstable

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>

diff --git a/src/clap-builder/debian/debcargo.toml b/src/clap-builder/debian/debcargo.toml
index 6e73587e4bc1f66885aa81e7ac5d9e26a3248e4d..95f222af351e60af6323e962617c340657da9535 100644 (file)
--- a/src/clap-builder/debian/debcargo.toml
+++ b/src/clap-builder/debian/debcargo.toml
@@ -1,3 +1,12 @@
 overlay = "."
 uploaders = ["Fabian Grünbichler <debian@fabian.gruenbichler.email>"]
 collapse_features = true
+
+[packages.lib]
+test_is_broken = true
+
+[packages."lib+std"]
+test_is_broken = false
+
+[packages."lib+default"]
+test_is_broken = false

diff --git a/src/clap-builder/debian/patches/relax-dep.diff b/src/clap-builder/debian/patches/relax-dep.diff
new file mode 100644 (file)
index 0000000..526d228
--- /dev/null
+++ b/src/clap-builder/debian/patches/relax-dep.diff
@@ -0,0 +1,13 @@
+Index: clap-builder/Cargo.toml
+===================================================================
+--- clap-builder.orig/Cargo.toml
++++ clap-builder/Cargo.toml
+@@ -77,7 +77,7 @@ version = "0.10.0"
+ optional = true
+ 
+ [dependencies.terminal_size]
+-version = "0.3.0"
++version = ">= 0.2.6, < 1.0"
+ optional = true
+ 
+ [dependencies.unicase]

diff --git a/src/clap-builder/debian/patches/remove-color-print.patch b/src/clap-builder/debian/patches/remove-color-print.patch
new file mode 100644 (file)
index 0000000..036d38a
--- /dev/null
+++ b/src/clap-builder/debian/patches/remove-color-print.patch
@@ -0,0 +1,14 @@
+Index: clap-builder/Cargo.toml
+===================================================================
+--- clap-builder.orig/Cargo.toml
++++ clap-builder/Cargo.toml
+@@ -88,9 +88,6 @@ optional = true
+ version = "0.1.9"
+ optional = true
+ 
+-[dev-dependencies.color-print]
+-version = "0.3.4"
+-
+ [dev-dependencies.humantime]
+ version = "2.1.0"
+ 

diff --git a/src/clap-builder/debian/patches/series b/src/clap-builder/debian/patches/series
new file mode 100644 (file)
index 0000000..2b37d88
--- /dev/null
+++ b/src/clap-builder/debian/patches/series
@@ -0,0 +1,3 @@
+remove-color-print.patch
+remove-trycmd.patch
+relax-dep.diff

diff --git a/src/clap/debian/patches/disable-trycmd.diff b/src/clap/debian/patches/disable-trycmd.diff
index 479e361413c1d68b9bba37c2dedcba91a73d0d68..e7402b589c0496be028272defa1338fdd5619b17 100644 (file)
--- a/src/clap/debian/patches/disable-trycmd.diff
+++ b/src/clap/debian/patches/disable-trycmd.diff
@@ -1,11 +1,6 @@
-Index: clap/Cargo.toml
-===================================================================
 --- clap.orig/Cargo.toml
 +++ clap/Cargo.toml
-@@ -392,15 +392,6 @@ version = "1.1.0"
- [dev-dependencies.trybuild]
- version = "1.0.83"
- 
+@@ -398,9 +397,0 @@
 -[dev-dependencies.trycmd]
 -version = "0.14.18"
 -features = [
@@ -15,6 +10,3 @@ Index: clap/Cargo.toml
 -]
 -default-features = false
 -
- [dev-dependencies.unic-emoji-char]
- version = "0.9.0"
- 

diff --git a/src/clap/debian/patches/disable-unic-emoji-char.patch b/src/clap/debian/patches/disable-unic-emoji-char.patch
index 4dc0c23e4fbf06db76fc6025b90ebd8008d24ec4..dfc1d1604a7cc0a708c32dfbf30eb950fee88f33 100644 (file)
--- a/src/clap/debian/patches/disable-unic-emoji-char.patch
+++ b/src/clap/debian/patches/disable-unic-emoji-char.patch
@@ -1,14 +1,6 @@
-Index: clap/Cargo.toml
-===================================================================
 --- clap.orig/Cargo.toml
 +++ clap/Cargo.toml
-@@ -385,9 +385,6 @@ version = "1.1.0"
- [dev-dependencies.trybuild]
- version = "1.0.83"
- 
+@@ -391,3 +390,0 @@
 -[dev-dependencies.unic-emoji-char]
 -version = "0.9.0"
 -
- [features]
- cargo = ["clap_builder/cargo"]
- color = ["clap_builder/color"]

diff --git a/src/clap/debian/patches/disable-unstable-doc.patch b/src/clap/debian/patches/disable-unstable-doc.patch
index d2ae6bd3cfcd910c4f4e777916479926de971274..818ad8e4ac48a80284dd8b794299383eae3c3c41 100644 (file)
--- a/src/clap/debian/patches/disable-unstable-doc.patch
+++ b/src/clap/debian/patches/disable-unstable-doc.patch
@@ -1,32 +1,13 @@
-Index: clap/Cargo.toml
-===================================================================
 --- clap.orig/Cargo.toml
 +++ clap/Cargo.toml
-@@ -41,16 +41,12 @@ cargo-args = [
-     "-Zunstable-options",
-     "-Zrustdoc-scrape-examples",
- ]
+@@ -44 +43,0 @@
 -features = ["unstable-doc"]
- rustdoc-args = [
-     "--cfg",
-     "docsrs",
-     "--generate-link-to-definition",
- ]
- 
+@@ -50,3 +48,0 @@
 -[package.metadata.playground]
 -features = ["unstable-doc"]
 -
- [package.metadata.release]
- shared-version = true
- tag-name = "v{{version}}"
-@@ -422,10 +418,6 @@ std = ["clap_builder/std"]
- string = ["clap_builder/string"]
- suggestions = ["clap_builder/suggestions"]
- unicode = ["clap_builder/unicode"]
+@@ -431,4 +426,0 @@
 -unstable-doc = [
 -    "clap_builder/unstable-doc",
 -    "derive",
 -]
- unstable-styles = ["clap_builder/unstable-styles"]
- unstable-v5 = [
-     "clap_builder/unstable-v5",

diff --git a/src/clap/debian/patches/disable-unstable-v5.patch b/src/clap/debian/patches/disable-unstable-v5.patch
index 68421b612bd7aa3061c12ffa1fe4e65d10ea1465..d03b949c5a9b52d2dbd9ca18a647d674d0d142cd 100644 (file)
--- a/src/clap/debian/patches/disable-unstable-v5.patch
+++ b/src/clap/debian/patches/disable-unstable-v5.patch
@@ -2,7 +2,7 @@ Index: clap/Cargo.toml
 ===================================================================
 --- clap.orig/Cargo.toml
 +++ clap/Cargo.toml
-@@ -419,10 +419,5 @@ string = ["clap_builder/string"]
+@@ -425,10 +425,5 @@ string = ["clap_builder/string"]
  suggestions = ["clap_builder/suggestions"]
  unicode = ["clap_builder/unicode"]
  unstable-styles = ["clap_builder/unstable-styles"]