Merge branch 'mr-origin-135'

diff --git a/src/libslirp/debian/patches/enable-all-by-default.patch b/src/libslirp/debian/patches/enable-all-by-default.patch
new file mode 100644 (file)
index 0000000..af4bb0f
--- /dev/null
+++ b/src/libslirp/debian/patches/enable-all-by-default.patch
@@ -0,0 +1,20 @@
+Index: libslirp/Cargo.toml
+===================================================================
+--- libslirp.orig/Cargo.toml
++++ libslirp/Cargo.toml
+@@ -25,7 +25,7 @@ repository = "https://gitlab.freedesktop
+ 
+ [[bin]]
+ name = "libslirp-helper"
+-required-features = ["default", "helper"]
++required-features = ["default"]
+ 
+ [[test]]
+ name = "test-ip"
+@@ -88,5 +88,4 @@ optional = true
+ version = "0.8.0"
+ 
+ [features]
+-default = ["mio", "mio-extras", "ipnetwork", "structopt", "slab"]
+-helper = ["libc", "zbus", "nix", "libsystemd", "url", "lazy_static", "zvariant", "enumflags2"]
++default = ["mio", "mio-extras", "ipnetwork", "structopt", "slab", "libc", "zbus", "nix", "libsystemd", "url", "lazy_static", "zvariant", "enumflags2"]

diff --git a/src/libslirp/debian/patches/series b/src/libslirp/debian/patches/series
index bdddf05ae546555b06f7432fa9bd69cb4590599a..9619f9dcdbfc94a6c74d6242e8cb525b01eb044d 100644 (file)
--- a/src/libslirp/debian/patches/series
+++ b/src/libslirp/debian/patches/series
@@ -1 +1,2 @@
 relax-deps.patch
+enable-all-by-default.patch

diff --git a/src/libsystemd/debian/changelog b/src/libsystemd/debian/changelog
index a08e57476f62ef15b5773fde8a1b636f5bea93bc..04c1f1f97279f101a701fc0a2f3b572727f6678b 100644 (file)
--- a/src/libsystemd/debian/changelog
+++ b/src/libsystemd/debian/changelog
@@ -1,3 +1,11 @@
+rust-libsystemd (0.2.1-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  [ Christopher Obbard ]
+  * Team upload.
+  * Package libsystemd 0.2.1 from crates.io using debcargo 2.4.3
+
+ -- Andrej Shadura <andrewsh@debian.org>  Wed, 02 Dec 2020 12:42:10 +0100
+
 rust-libsystemd (0.1.0-2) unstable; urgency=medium
 
   * Relax nix dependency (Closes: #975180).

diff --git a/src/libsystemd/debian/copyright.debcargo.hint b/src/libsystemd/debian/copyright.debcargo.hint
index 818ab3d69fa6e8330579f90d904c67db05a05cda..cfb210088ee0d9d5cdd5c40388c63e56138391c6 100644 (file)
--- a/src/libsystemd/debian/copyright.debcargo.hint
+++ b/src/libsystemd/debian/copyright.debcargo.hint
@@ -12,6 +12,13 @@ Comment:
  be correct information so you should review and fix this before uploading to
  the archive.
 
+Files: ./COPYRIGHT
+Copyright: 2017-2019, Project contributors
+License: UNKNOWN-LICENSE; FIXME (overlay)
+Comment:
+ FIXME (overlay): These notices are extracted from files. Please review them
+ before uploading to the archive.
+
 Files: debian/*
 Copyright:
  2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>

diff --git a/src/libsystemd/debian/patches/relax-deps.patch b/src/libsystemd/debian/patches/relax-deps.patch
index e0c27c088a520523259350cd609d3cd7a6f54782..41e2d21bdf45a09cc0e8d10ed7f9da342a581cfa 100644 (file)
--- a/src/libsystemd/debian/patches/relax-deps.patch
+++ b/src/libsystemd/debian/patches/relax-deps.patch
@@ -1,37 +1,15 @@
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -31,7 +31,7 @@
- tag-message = "libsystemd {{version}}"
- upload-doc = false
- [dependencies.error-chain]
--version = "^0.12.1"
-+version = "^0.12"
- default-features = false
- 
- [dependencies.hmac]
-@@ -41,13 +41,13 @@
+@@ -41,10 +41,10 @@ version = "0.7"
  version = "0.2"
  
  [dependencies.nix]
--version = "0.13"
-+version = ">= 0.13"
+-version = "0.17"
++version = ">= 0.17"
  
  [dependencies.serde]
 -version = "^1.0.91"
 +version = "^1.0"
- 
- [dependencies.serde_derive]
--version = "^1.0.91"
-+version = "^1.0"
+ features = ["derive"]
  
  [dependencies.sha2]
- version = "0.8"
-@@ -56,7 +56,7 @@
- version = "0.2"
- 
- [dependencies.uuid]
--version = "^0.7.4"
-+version = "^0.8"
- features = ["serde"]
- [dev-dependencies.quickcheck]
- version = "0.7"