smithay-client-toolkit: Update to 0.16.0

diff --git a/src/smithay-client-toolkit/debian/changelog b/src/smithay-client-toolkit/debian/changelog
index 7b7fd5afe6279c9b8c45563e5125602775c5fd83..9476f711f97cc5241da33f0e8987605badf728a8 100644 (file)
--- a/src/smithay-client-toolkit/debian/changelog
+++ b/src/smithay-client-toolkit/debian/changelog
@@ -1,3 +1,9 @@
+rust-smithay-client-toolkit (0.16.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Package smithay-client-toolkit 0.16.0 from crates.io using debcargo 2.5.0
+
+ -- James McCoy <jamessan@debian.org>  Mon, 12 Sep 2022 20:55:37 -0400
+
 rust-smithay-client-toolkit (0.15.4-2) unstable; urgency=medium
 
   * Team upload.

diff --git a/src/smithay-client-toolkit/debian/debcargo.toml b/src/smithay-client-toolkit/debian/debcargo.toml
index 22b44a5b7e4a5a71b8ae003de68f961c570f2761..de6190209e7b309abe03a3d157a66c597879e5af 100644 (file)
--- a/src/smithay-client-toolkit/debian/debcargo.toml
+++ b/src/smithay-client-toolkit/debian/debcargo.toml
@@ -1,8 +1,5 @@
 overlay = "."
 uploaders = ["James McCoy <jamessan@debian.org>"]
-
+collapse_features = true
 [packages.lib]
 depends = ["libxkbcommon-dev"]
-
-[packages."lib+dlopen"]
-depends = []

diff --git a/src/smithay-client-toolkit/debian/patches/relax-deps.diff b/src/smithay-client-toolkit/debian/patches/relax-deps.diff
index 6f59bcf5500eebd7256fad70013c712097e464d3..5ddddf706f154b9e2e3fc3abc22038e83b1a5807 100644 (file)
--- a/src/smithay-client-toolkit/debian/patches/relax-deps.diff
+++ b/src/smithay-client-toolkit/debian/patches/relax-deps.diff
@@ -1,15 +1,11 @@
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -38,10 +38,10 @@ version = "1.0"
- version = "0.4"
- 
- [dependencies.memmap2]
--version = "0.3.0"
-+version = "0.5"
+@@ -45,7 +45,7 @@ version = "1.0"
+ version = "0.5.0"
  
  [dependencies.nix]
--version = "0.22"
-+version = "0"
- 
- [dependencies.wayland-client]
- version = "0.29"
+-version = "0.24"
++version = ">= 0.24"
+ features = [
+     "mman",
+     "fs",

diff --git a/src/smithay-client-toolkit/debian/tests/control b/src/smithay-client-toolkit/debian/tests/control
index e9be10c09e40857742028b8092146a797a158908..bdaeb7440aaad406f9a4dde207c52c03ac607dad 100644 (file)
--- a/src/smithay-client-toolkit/debian/tests/control
+++ b/src/smithay-client-toolkit/debian/tests/control
@@ -1,26 +1,26 @@
-Test-Command: /usr/share/cargo/bin/cargo-auto-test smithay-client-toolkit 0.15.4 --all-targets --all-features
+Test-Command: /usr/share/cargo/bin/cargo-auto-test smithay-client-toolkit 0.16.0 --all-targets --all-features
 Features: test-name=rust-smithay-client-toolkit:@
-Depends: dh-cargo (>= 18), librust-image-0.23+default-dev, @
+Depends: dh-cargo (>= 18), librust-image-0.24+default-dev, @
 Restrictions: allow-stderr, skip-not-installable
 
-# Avoid running examples, since they require all features to be enabled
-Test-Command: /usr/share/cargo/bin/cargo-auto-test smithay-client-toolkit 0.15.4 --tests --no-default-features
-Features: test-name=librust-smithay-client-toolkit-dev:
-Depends: dh-cargo (>= 18), librust-image-0.23+default-dev, @
+Test-Command: /usr/share/cargo/bin/cargo-auto-test smithay-client-toolkit 0.16.0 --all-targets --no-default-features --features calloop
+Features: test-name=librust-smithay-client-toolkit-dev:calloop
+Depends: dh-cargo (>= 18), librust-image-0.24+default-dev, @
 Restrictions: allow-stderr, skip-not-installable
 
-Test-Command: /usr/share/cargo/bin/cargo-auto-test smithay-client-toolkit 0.15.4 --all-targets --no-default-features --features calloop
-Features: test-name=librust-smithay-client-toolkit+calloop-dev:calloop
-Depends: dh-cargo (>= 18), librust-image-0.23+default-dev, @
+Test-Command: /usr/share/cargo/bin/cargo-auto-test smithay-client-toolkit 0.16.0 --all-targets 
+Features: test-name=librust-smithay-client-toolkit-dev:default
+Depends: dh-cargo (>= 18), librust-image-0.24+default-dev, @
 Restrictions: allow-stderr, skip-not-installable
 
-Test-Command: /usr/share/cargo/bin/cargo-auto-test smithay-client-toolkit 0.15.4 --all-targets 
-Features: test-name=librust-smithay-client-toolkit+default-dev:default
-Depends: dh-cargo (>= 18), librust-image-0.23+default-dev, @
+# Avoid running examples, since they require the calloop feature
+Test-Command: /usr/share/cargo/bin/cargo-auto-test smithay-client-toolkit 0.16.0 --tests --no-default-features --features dlopen
+Features: test-name=librust-smithay-client-toolkit-dev:dlopen
+Depends: dh-cargo (>= 18), librust-image-0.24+default-dev, @
 Restrictions: allow-stderr, skip-not-installable
 
-# Avoid running examples, since they require all features to be enabled
-Test-Command: /usr/share/cargo/bin/cargo-auto-test smithay-client-toolkit 0.15.4 --tests --no-default-features --features dlopen
-Features: test-name=librust-smithay-client-toolkit+dlopen-dev:dlopen
-Depends: dh-cargo (>= 18), librust-image-0.23+default-dev, @
+# Avoid running examples, since they require the calloop feature
+Test-Command: /usr/share/cargo/bin/cargo-auto-test smithay-client-toolkit 0.16.0 --tests --no-default-features
+Features: test-name=librust-smithay-client-toolkit-dev:
+Depends: dh-cargo (>= 18), librust-image-0.24+default-dev, @
 Restrictions: allow-stderr, skip-not-installable

diff --git a/src/smithay-client-toolkit/debian/tests/control.debcargo.hint b/src/smithay-client-toolkit/debian/tests/control.debcargo.hint
index 6f31135e26986e0929556d699d1638bbc0fb2bf4..b70e9185517142fe47f17324534c8143bda32836 100644 (file)
--- a/src/smithay-client-toolkit/debian/tests/control.debcargo.hint
+++ b/src/smithay-client-toolkit/debian/tests/control.debcargo.hint
@@ -1,24 +1,24 @@
-Test-Command: /usr/share/cargo/bin/cargo-auto-test smithay-client-toolkit 0.15.4 --all-targets --all-features
+Test-Command: /usr/share/cargo/bin/cargo-auto-test smithay-client-toolkit 0.16.0 --all-targets --all-features
 Features: test-name=rust-smithay-client-toolkit:@
-Depends: dh-cargo (>= 18), librust-image-0.23+default-dev, @
+Depends: dh-cargo (>= 18), librust-image-0.24+default-dev, @
 Restrictions: allow-stderr, skip-not-installable
 
-Test-Command: /usr/share/cargo/bin/cargo-auto-test smithay-client-toolkit 0.15.4 --all-targets --no-default-features
-Features: test-name=librust-smithay-client-toolkit-dev:
-Depends: dh-cargo (>= 18), librust-image-0.23+default-dev, @
+Test-Command: /usr/share/cargo/bin/cargo-auto-test smithay-client-toolkit 0.16.0 --all-targets --no-default-features --features calloop
+Features: test-name=librust-smithay-client-toolkit-dev:calloop
+Depends: dh-cargo (>= 18), librust-image-0.24+default-dev, @
 Restrictions: allow-stderr, skip-not-installable
 
-Test-Command: /usr/share/cargo/bin/cargo-auto-test smithay-client-toolkit 0.15.4 --all-targets --no-default-features --features calloop
-Features: test-name=librust-smithay-client-toolkit+calloop-dev:calloop
-Depends: dh-cargo (>= 18), librust-image-0.23+default-dev, @
+Test-Command: /usr/share/cargo/bin/cargo-auto-test smithay-client-toolkit 0.16.0 --all-targets 
+Features: test-name=librust-smithay-client-toolkit-dev:default
+Depends: dh-cargo (>= 18), librust-image-0.24+default-dev, @
 Restrictions: allow-stderr, skip-not-installable
 
-Test-Command: /usr/share/cargo/bin/cargo-auto-test smithay-client-toolkit 0.15.4 --all-targets 
-Features: test-name=librust-smithay-client-toolkit+default-dev:default
-Depends: dh-cargo (>= 18), librust-image-0.23+default-dev, @
+Test-Command: /usr/share/cargo/bin/cargo-auto-test smithay-client-toolkit 0.16.0 --all-targets --no-default-features --features dlopen
+Features: test-name=librust-smithay-client-toolkit-dev:dlopen
+Depends: dh-cargo (>= 18), librust-image-0.24+default-dev, @
 Restrictions: allow-stderr, skip-not-installable
 
-Test-Command: /usr/share/cargo/bin/cargo-auto-test smithay-client-toolkit 0.15.4 --all-targets --no-default-features --features dlopen
-Features: test-name=librust-smithay-client-toolkit+dlopen-dev:dlopen
-Depends: dh-cargo (>= 18), librust-image-0.23+default-dev, @
+Test-Command: /usr/share/cargo/bin/cargo-auto-test smithay-client-toolkit 0.16.0 --all-targets --no-default-features
+Features: test-name=librust-smithay-client-toolkit-dev:
+Depends: dh-cargo (>= 18), librust-image-0.24+default-dev, @
 Restrictions: allow-stderr, skip-not-installable