lewton: update to 0.10.2, remove deprecated deps

diff --git a/src/lewton/debian/RFS b/src/lewton/debian/RFS
new file mode 100644 (file)
index 0000000..e69de29

diff --git a/src/lewton/debian/changelog b/src/lewton/debian/changelog
index 2a5c5d298c114156b1c938f7ff6a7d6d1d4988bf..6f6867eddd8f0fa1602b8d692661b7a2956cd184 100644 (file)
--- a/src/lewton/debian/changelog
+++ b/src/lewton/debian/changelog
@@ -1,3 +1,15 @@
+rust-lewton (0.10.2-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package lewton 0.10.2 from crates.io using debcargo 2.6.0
+  * Patch to remove dep on alto, archived upstream, only used in example
+  * Patch to remove feature async_ogg thus dep on tokio-io, futures because
+    tokio-io was deprecated upstream
+  * Relax deps on ogg
+  * Collapse features
+
+ -- Blair Noctis <n@sail.ng>  Fri, 10 Feb 2023 16:50:55 +0000
+
 rust-lewton (0.9.4-3) unstable; urgency=medium
 
   * Team upload.

diff --git a/src/lewton/debian/copyright.debcargo.hint b/src/lewton/debian/copyright.debcargo.hint
index 90d78a1c8fa5cacfa47dcc005dc3dcedb64459a4..b80cd000d12738fcb55a7e393c2a24fc0c7b18b8 100644 (file)
--- a/src/lewton/debian/copyright.debcargo.hint
+++ b/src/lewton/debian/copyright.debcargo.hint
@@ -12,7 +12,7 @@ Comment:
  be correct information so you should review and fix this before uploading to
  the archive.
 
-Files: ./LICENSE
+Files: LICENSE
 Copyright:
  2016 est31 <MTest31@outlook.com> and contributors
  2016 est31 <MTest31@outlook.com> and contributors
@@ -21,77 +21,70 @@ Comment:
  FIXME (overlay): These notices are extracted from files. Please review them
  before uploading to the archive.
 
-Files: ./lewton.h
-Copyright: 2019 est31 <MTest31@outlook.com>
-License: UNKNOWN-LICENSE; FIXME (overlay)
-Comment:
- FIXME (overlay): These notices are extracted from files. Please review them
- before uploading to the archive.
-
-Files: ./src/audio.rs
+Files: src/audio.rs
 Copyright: 2016 est31 <MTest31@outlook.com>
 License: UNKNOWN-LICENSE; FIXME (overlay)
 Comment:
  FIXME (overlay): These notices are extracted from files. Please review them
  before uploading to the archive.
 
-Files: ./src/bitpacking.rs
+Files: src/bitpacking.rs
 Copyright: 2016 est31 <MTest31@outlook.com>
 License: UNKNOWN-LICENSE; FIXME (overlay)
 Comment:
  FIXME (overlay): These notices are extracted from files. Please review them
  before uploading to the archive.
 
-Files: ./src/header.rs
+Files: src/header.rs
 Copyright: 2016 est31 <MTest31@outlook.com>
 License: UNKNOWN-LICENSE; FIXME (overlay)
 Comment:
  FIXME (overlay): These notices are extracted from files. Please review them
  before uploading to the archive.
 
-Files: ./src/header_cached.rs
+Files: src/header_cached.rs
 Copyright: 2016 est31 <MTest31@outlook.com>
 License: UNKNOWN-LICENSE; FIXME (overlay)
 Comment:
  FIXME (overlay): These notices are extracted from files. Please review them
  before uploading to the archive.
 
-Files: ./src/huffman_tree.rs
+Files: src/huffman_tree.rs
 Copyright: 2016 est31 <MTest31@outlook.com>
 License: UNKNOWN-LICENSE; FIXME (overlay)
 Comment:
  FIXME (overlay): These notices are extracted from files. Please review them
  before uploading to the archive.
 
-Files: ./src/imdct.rs
+Files: src/imdct.rs
 Copyright: 2016 est31 <MTest31@outlook.com>
 License: UNKNOWN-LICENSE; FIXME (overlay)
 Comment:
  FIXME (overlay): These notices are extracted from files. Please review them
  before uploading to the archive.
 
-Files: ./src/imdct_test.rs
+Files: src/imdct_test.rs
 Copyright: 2016 est31 <MTest31@outlook.com>
 License: UNKNOWN-LICENSE; FIXME (overlay)
 Comment:
  FIXME (overlay): These notices are extracted from files. Please review them
  before uploading to the archive.
 
-Files: ./src/inside_ogg.rs
+Files: src/inside_ogg.rs
 Copyright: 2016 est31 <MTest31@outlook.com>
 License: UNKNOWN-LICENSE; FIXME (overlay)
 Comment:
  FIXME (overlay): These notices are extracted from files. Please review them
  before uploading to the archive.
 
-Files: ./src/lib.rs
+Files: src/lib.rs
 Copyright: 2016 est31 <MTest31@outlook.com>
 License: UNKNOWN-LICENSE; FIXME (overlay)
 Comment:
  FIXME (overlay): These notices are extracted from files. Please review them
  before uploading to the archive.
 
-Files: ./src/samples.rs
+Files: src/samples.rs
 Copyright: 2019 est31 <MTest31@outlook.com>
 License: UNKNOWN-LICENSE; FIXME (overlay)
 Comment:
@@ -100,8 +93,8 @@ Comment:
 
 Files: debian/*
 Copyright:
- 2019-2020 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
- 2019-2020 Ximin Luo <infinity0@debian.org>
+ 2019-2023 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
+ 2019-2023 Ximin Luo <infinity0@debian.org>
 License: MIT or Apache-2.0
 
 License: Apache-2.0

diff --git a/src/lewton/debian/debcargo.toml b/src/lewton/debian/debcargo.toml
index fdbb775d760ce64714b82666e229a831a24139b7..1258aca842d92f1ed860fd74b5c66ec97a4981bd 100644 (file)
--- a/src/lewton/debian/debcargo.toml
+++ b/src/lewton/debian/debcargo.toml
@@ -1,2 +1,4 @@
 overlay = "."
 uploaders = ["Ximin Luo <infinity0@debian.org>"]
+
+collapse_features = true

diff --git a/src/lewton/debian/patches/bump-dep.diff b/src/lewton/debian/patches/bump-dep.diff
deleted file mode 100644 (file)
index ec1ab20..0000000
--- a/src/lewton/debian/patches/bump-dep.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: lewton/Cargo.toml
-===================================================================
---- lewton.orig/Cargo.toml
-+++ lewton/Cargo.toml
-@@ -31,7 +31,7 @@ crate-type = ["lib", "cdylib"]
- version = "1.0"
- 
- [dependencies.smallvec]
--version = "0.6"
-+version = "1"
- 
- [dependencies.ogg]
- version = "0.7"

diff --git a/src/lewton/debian/patches/relax-deps.patch b/src/lewton/debian/patches/relax-deps.patch
new file mode 100644 (file)
index 0000000..1d0f5b5
--- /dev/null
+++ b/src/lewton/debian/patches/relax-deps.patch
@@ -0,0 +1,20 @@
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -43,7 +43,7 @@
+ optional = true
+ 
+ [dependencies.ogg]
+-version = "0.8"
++version = "0.9"
+ optional = true
+ 
+ [dependencies.tinyvec]
+@@ -57,7 +57,7 @@
+ version = "3"
+ 
+ [dev-dependencies.ogg]
+-version = "0.8"
++version = "0.9"
+ 
+ [features]
+ async_ogg = ["ogg", "ogg/async", "futures", "tokio-io"]

diff --git a/src/lewton/debian/patches/remove-dep-alto.patch b/src/lewton/debian/patches/remove-dep-alto.patch
new file mode 100644 (file)
index 0000000..2834e06
--- /dev/null
+++ b/src/lewton/debian/patches/remove-dep-alto.patch
@@ -0,0 +1,24 @@
+Description: Remove dep on alto, which is archived upstream
+ (and only used in an example anyway)
+Last-Update: 2023-02-10
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -32,9 +32,6 @@
+ name = "perf"
+ required-features = ["ogg"]
+
+-[[example]]
+-name = "player"
+-required-features = ["ogg"]
+ [dependencies.byteorder]
+ version = "1.0"
+
+@@ -53,8 +50,6 @@
+ [dependencies.tokio-io]
+ version = "0.1"
+ optional = true
+-[dev-dependencies.alto]
+-version = "3"
+
+ [dev-dependencies.ogg]
+ version = "0.9"

diff --git a/src/lewton/debian/patches/remove-feature-async-ogg.patch b/src/lewton/debian/patches/remove-feature-async-ogg.patch
new file mode 100644 (file)
index 0000000..6638a6f
--- /dev/null
+++ b/src/lewton/debian/patches/remove-feature-async-ogg.patch
@@ -0,0 +1,30 @@
+Description: Remove feature async-io, depends on deprecated tokio-io
+ This also removes dep on futures
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -35,10 +35,6 @@
+ [dependencies.byteorder]
+ version = "1.0"
+ 
+-[dependencies.futures]
+-version = "0.1"
+-optional = true
+-
+ [dependencies.ogg]
+ version = "0.9"
+ optional = true
+@@ -47,13 +43,9 @@
+ version = "1.0"
+ features = ["alloc"]
+ 
+-[dependencies.tokio-io]
+-version = "0.1"
+-optional = true
+-
+ [dev-dependencies.ogg]
+ version = "0.9"
+ 
+ [features]
+-async_ogg = ["ogg", "ogg/async", "futures", "tokio-io"]
++#async_ogg = ["ogg", "ogg/async", "futures", "tokio-io"]
+ default = ["ogg"]

diff --git a/src/lewton/debian/patches/series b/src/lewton/debian/patches/series
index bbad2f2801758cca17702d0350e5640103aa2e7c..4a7ed93ecb34195bee9b1e68c572e190ade9c7bf 100644 (file)
--- a/src/lewton/debian/patches/series
+++ b/src/lewton/debian/patches/series
@@ -1 +1,3 @@
-bump-dep.diff
+relax-deps.patch
+remove-dep-alto.patch
+remove-feature-async-ogg.patch