diff --git a/CHANGELOG.md b/CHANGELOG.md index 65f97b98e..e8020a007 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,10 @@ # Changelog +## 1.0.0-beta.14 + +- fix packaging issue with our rust-email fork, now we are tracking + master again there. hpk42 + ## 1.0.0-beta.13 - fix #976 -- unicode-issues in display-name of email addresses. @hpk42 diff --git a/Cargo.lock b/Cargo.lock index ef25b9e2e..e74223fd8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -656,7 +656,7 @@ dependencies = [ "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", "debug_stub_derive 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)", "deltachat_derive 0.1.0", - "email 0.0.21 (git+https://github.com/deltachat/rust-email?branch=rfc2047)", + "email 0.0.21 (git+https://github.com/deltachat/rust-email)", "encoded-words 0.1.0 (git+https://github.com/async-email/encoded-words)", "escaper 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)", "failure 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)", @@ -828,21 +828,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" [[package]] name = "email" version = "0.0.21" -source = "git+https://github.com/deltachat/rust-email#265a54a8c31355c506610c032c81112dc0953afb" -dependencies = [ - "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", - "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", - "encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)", - "lazy_static 1.4.0 (registry+https://github.com/rust-lang/crates.io-index)", - "rand 0.7.2 (registry+https://github.com/rust-lang/crates.io-index)", - "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)", - "version_check 0.9.1 (registry+https://github.com/rust-lang/crates.io-index)", -] - -[[package]] -name = "email" -version = "0.0.21" -source = "git+https://github.com/deltachat/rust-email?branch=rfc2047#6f6c5a70d3c8c540604e0d5aa27508f993375b93" +source = "git+https://github.com/deltachat/rust-email#38b325ea23bf9e71da7b5bc1b70d986d09a9e5a7" dependencies = [ "base64 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)", "chrono 0.4.10 (registry+https://github.com/rust-lang/crates.io-index)", @@ -3532,7 +3518,6 @@ dependencies = [ "checksum ed25519-dalek 1.0.0-pre.2 (registry+https://github.com/rust-lang/crates.io-index)" = "845aaacc16f01178f33349e7c992ecd0cee095aa5e577f0f4dee35971bd36455" "checksum either 1.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "bb1f6b1ce1c140482ea30ddd3335fc0024ac7ee112895426e0a629a6c20adfe3" "checksum email 0.0.21 (git+https://github.com/deltachat/rust-email)" = "" -"checksum email 0.0.21 (git+https://github.com/deltachat/rust-email?branch=rfc2047)" = "" "checksum encoded-words 0.1.0 (git+https://github.com/async-email/encoded-words)" = "" "checksum encoding 0.2.33 (registry+https://github.com/rust-lang/crates.io-index)" = "6b0d943856b990d12d3b55b359144ff341533e516d94098b1d3fc1ac666d36ec" "checksum encoding-index-japanese 1.20141219.5 (registry+https://github.com/rust-lang/crates.io-index)" = "04e8b2ff42e9a05335dbf8b5c6f7567e5591d0d916ccef4e0b1710d32a0d0c91" diff --git a/Cargo.toml b/Cargo.toml index 3d7c2e1f9..ff9754d5c 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "deltachat" -version = "1.0.0-beta.13" +version = "1.0.0-beta.14" authors = ["Delta Chat Developers (ML) "] edition = "2018" license = "MPL" @@ -18,7 +18,7 @@ reqwest = { version = "0.9.15", default-features = false, features = ["rustls-tl num-derive = "0.2.5" num-traits = "0.2.6" async-smtp = { git = "https://github.com/async-email/async-smtp" } -email = { git = "https://github.com/deltachat/rust-email", branch = "rfc2047" } +email = { git = "https://github.com/deltachat/rust-email", branch = "master" } lettre_email = { git = "https://github.com/deltachat/lettre", branch = "feat/mail" } async-imap = { git = "https://github.com/async-email/async-imap", branch="master" } async-tls = "0.6" diff --git a/deltachat-ffi/Cargo.toml b/deltachat-ffi/Cargo.toml index 38f26dfda..04555c0bc 100644 --- a/deltachat-ffi/Cargo.toml +++ b/deltachat-ffi/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "deltachat_ffi" -version = "1.0.0-beta.13" +version = "1.0.0-beta.14" description = "Deltachat FFI" authors = ["Delta Chat Developers (ML) "] edition = "2018"