nix - new upstream release.

diff --git a/src/nix/debian/changelog b/src/nix/debian/changelog
index 47cedd2fb560370284142d00f6e51121bed5b813..40d3bbe4a47d35d59338a981cd5b9a78ba701236 100644 (file)
--- a/src/nix/debian/changelog
+++ b/src/nix/debian/changelog
@@ -1,3 +1,12 @@
+rust-nix (0.26.1-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package nix 0.26.1 from crates.io using debcargo 2.6.0
+  * Drop lower-bitflags-dep.diff, no longer needed.
+  * Revert upstream bump of memoffset dependency.
+
+ -- Peter Michael Green <plugwash@debian.org>  Tue, 06 Dec 2022 14:15:32 +0000
+
 rust-nix (0.25.0-1) unstable; urgency=medium
 
   * Team upload.

diff --git a/src/nix/debian/copyright.debcargo.hint b/src/nix/debian/copyright.debcargo.hint
index b3f44a0e610e956e964ecaf28fac681054d67f77..d8835c2503a3e2bf7c6c55d335c2719fcd4fa3cc 100644 (file)
--- a/src/nix/debian/copyright.debcargo.hint
+++ b/src/nix/debian/copyright.debcargo.hint
@@ -12,14 +12,14 @@ Comment:
  be correct information so you should review and fix this before uploading to
  the archive.
 
-Files: ./LICENSE
+Files: LICENSE
 Copyright: 2015 Carl Lerche + nix-rust Authors
 License: UNKNOWN-LICENSE; FIXME (overlay)
 Comment:
  FIXME (overlay): These notices are extracted from files. Please review them
  before uploading to the archive.
 
-Files: ./src/sys/signal.rs
+Files: src/sys/signal.rs
 Copyright: 2014 The Rust Project Developers.
 License: UNKNOWN-LICENSE; FIXME (overlay)
 Comment:

diff --git a/src/nix/debian/patches/lower-bitflags-dep.diff b/src/nix/debian/patches/lower-bitflags-dep.diff
deleted file mode 100644 (file)
index 4030267..0000000
--- a/src/nix/debian/patches/lower-bitflags-dep.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: nix/Cargo.toml
-===================================================================
---- nix.orig/Cargo.toml
-+++ nix/Cargo.toml
-@@ -73,7 +73,7 @@ name = "test-ptymaster-drop"
- path = "test/test_ptymaster_drop.rs"
- 
- [dependencies.bitflags]
--version = "1.1"
-+version = "1"
- 
- [dependencies.cfg-if]
- version = "1.0"

diff --git a/src/nix/debian/patches/relax-dep.diff b/src/nix/debian/patches/relax-dep.diff
new file mode 100644 (file)
index 0000000..b0c1676
--- /dev/null
+++ b/src/nix/debian/patches/relax-dep.diff
@@ -0,0 +1,13 @@
+Index: nix/Cargo.toml
+===================================================================
+--- nix.orig/Cargo.toml
++++ nix/Cargo.toml
+@@ -178,7 +178,7 @@ zerocopy = [
+ version = "0.5.3"
+ 
+ [target."cfg(not(target_os = \"redox\"))".dependencies.memoffset]
+-version = "0.7"
++version = "0.6.3"
+ optional = true
+ 
+ [target."cfg(target_os = \"freebsd\")".dev-dependencies.sysctl]

diff --git a/src/nix/debian/patches/series b/src/nix/debian/patches/series
index d0f6f6e566c133559113b5109d192be7fef1cfcd..75abb7f14b7ecca84c97cd91e0c5e3fc349c6d09 100644 (file)
--- a/src/nix/debian/patches/series
+++ b/src/nix/debian/patches/series
@@ -1 +1 @@
-lower-bitflags-dep.diff
+relax-dep.diff