sequoia-sq: prepare 0.27.0

diff --git a/src/sequoia-sq/debian/changelog b/src/sequoia-sq/debian/changelog
index 2e5c17ff193b50d7fece3b7a5ae77387551db6b2..f03178040f4602dd982a8960c64f1f0667625f0d 100644 (file)
--- a/src/sequoia-sq/debian/changelog
+++ b/src/sequoia-sq/debian/changelog
@@ -1,3 +1,9 @@
+rust-sequoia-sq (0.27.0-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Package sequoia-sq 0.27.0 from crates.io using debcargo 2.5.0
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Wed, 20 Jul 2022 00:01:43 -0400
+
 rust-sequoia-sq (0.26.0-3) unstable; urgency=medium
 
   * Team upload.

diff --git a/src/sequoia-sq/debian/patches/bump-itertools.patch b/src/sequoia-sq/debian/patches/bump-itertools.patch
deleted file mode 100644 (file)
index b95ba1c..0000000
--- a/src/sequoia-sq/debian/patches/bump-itertools.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-Author: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Description: bump itertools dependency from 0.9 to 0.10
-
-itertools upstream's CHANGELOG.md says that no significant API changes
-happened between 0.9 and 0.10 (just a shift in the MSRV, which is fine
-for debian).
-
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -44,7 +44,7 @@
- features = ["wrap_help"]
- 
- [dependencies.itertools]
--version = "0.9"
-+version = "0.10"
- 
- [dependencies.rpassword]
- version = "5.0"
-Bump-itertools.patch

diff --git a/src/sequoia-sq/debian/patches/drop-subplot.patch b/src/sequoia-sq/debian/patches/drop-subplot.patch
index 9029951679048235176a87e630883eac0378bbab..3bfc54964768400659deb8ca39d80a9db238f2f8 100644 (file)
--- a/src/sequoia-sq/debian/patches/drop-subplot.patch
+++ b/src/sequoia-sq/debian/patches/drop-subplot.patch
@@ -9,37 +9,37 @@ was guided by Lars Wirzenius from upstream.
 
 --- a/Cargo.toml
 +++ b/Cargo.toml
-@@ -80,8 +80,6 @@
+@@ -87,8 +87,6 @@
  [dev-dependencies.predicates]
  version = "2"
  
 -[dev-dependencies.subplotlib]
--version = "0.1.0"
- [build-dependencies.clap]
- version = "2.33"
+-version = "0.4.1"
+ [build-dependencies.anyhow]
+ version = "1.0.18"
  
-@@ -89,9 +87,6 @@
+@@ -113,9 +111,6 @@
  version = "1.0.0"
  default-features = false
  
 -[build-dependencies.subplot-build]
--version = "0.1.0"
+-version = "0.4.0"
 -
  [features]
  autocrypt = ["sequoia-autocrypt"]
  compression-bzip2 = ["buffered-reader/compression-bzip2", "sequoia-openpgp/compression-bzip2"]
 --- a/build.rs
 +++ b/build.rs
-@@ -14,9 +14,6 @@ fn main() {
+@@ -14,9 +14,6 @@
      // XXX: Revisit once
      // https://github.com/rust-lang/rust/issues/44732 is stabilized.
  
 -    subplot_build::codegen(Path::new("sq-subplot.md"))
 -        .expect("failed to generate code with Subplot");
 -
-     let mut sq = sq_cli::configure(
-         clap::App::new("sq").set_term_width(80),
-         cfg!(feature = "autocrypt"),
+     let mut sq = sq_cli::build().term_width(80);
+     let mut main = fs::File::create("src/sq-usage.rs").unwrap();
+     dump_help(&mut main,
 --- a/tests/sq-subplot.rs
 +++ /dev/null
 @@ -1 +0,0 @@

diff --git a/src/sequoia-sq/debian/patches/relax-dep.patch b/src/sequoia-sq/debian/patches/relax-dep.patch
deleted file mode 100644 (file)
index d2c34d6..0000000
--- a/src/sequoia-sq/debian/patches/relax-dep.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: sequoia-sq/Cargo.toml
-===================================================================
---- sequoia-sq.orig/Cargo.toml
-+++ sequoia-sq/Cargo.toml
-@@ -55,7 +55,7 @@ optional = true
- default-features = false
- 
- [dependencies.sequoia-net]
--version = "0.24"
-+version = "0.25"
- default-features = false
- 
- [dependencies.sequoia-openpgp]

diff --git a/src/sequoia-sq/debian/patches/relax-serde_json.patch b/src/sequoia-sq/debian/patches/relax-serde_json.patch
new file mode 100644 (file)
index 0000000..8401846
--- /dev/null
+++ b/src/sequoia-sq/debian/patches/relax-serde_json.patch
@@ -0,0 +1,18 @@
+Author: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
+Description: relax serde_json dep from 1.0.81 to 1.0.80
+
+Upstream indicated no reason to need serde_json 1.0.81 specifically
+and uploading serde_json > 1.0.80 to debian runs into #1015743 so it
+is simpler to just relax this dependency here for now.
+
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -68,7 +68,7 @@
+ features = ["derive"]
+ 
+ [dependencies.serde_json]
+-version = "1.0.81"
++version = "1.0.80"
+ 
+ [dependencies.tempfile]
+ version = "3.1"

diff --git a/src/sequoia-sq/debian/patches/series b/src/sequoia-sq/debian/patches/series
index 1331080da4adb666d540e57c86f9b59bcb0252d1..32da906b68fe5b4e5c2258b9366730c2349e387f 100644 (file)
--- a/src/sequoia-sq/debian/patches/series
+++ b/src/sequoia-sq/debian/patches/series
@@ -1,3 +1,2 @@
 drop-subplot.patch
-bump-itertools.patch
-relax-dep.patch
+relax-serde_json.patch

diff --git a/src/sequoia-sq/debian/sq.manpages b/src/sequoia-sq/debian/sq.manpages
index 44b6c529b5c7a932d58d63dea443c212b93e86f4..6b86684718862f2b2cd5fd5b09eec4b68ae43e78 100644 (file)
--- a/src/sequoia-sq/debian/sq.manpages
+++ b/src/sequoia-sq/debian/sq.manpages
@@ -1 +1 @@
-man-sq-net-autocrypt/*.1
+man-sq-autocrypt/*.1