From c81509c5a6dfbe23619a4c77d24ae222da2fafed Mon Sep 17 00:00:00 2001
From: Jonas Platte <jplatte+git@posteo.de>
Date: Fri, 5 Jun 2020 01:31:35 +0200
Subject: [PATCH] Undo previous license move, make ruma crate a subdirectory

---
 Cargo.toml                             | 33 +-------------------------
 LICENSE => ruma-appservice-api/LICENSE |  1 -
 ruma/Cargo.toml                        | 30 +++++++++++++++++++++++
 ruma/LICENSE                           | 19 +++++++++++++++
 {src => ruma/src}/lib.rs               |  0
 5 files changed, 50 insertions(+), 33 deletions(-)
 rename LICENSE => ruma-appservice-api/LICENSE (96%)
 create mode 100644 ruma/Cargo.toml
 create mode 100644 ruma/LICENSE
 rename {src => ruma/src}/lib.rs (100%)

diff --git a/Cargo.toml b/Cargo.toml
index a3ec64df..b2f5e08c 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,33 +1,2 @@
-[package]
-name = "ruma"
-authors = ["Jonas Platte <jplatte@posteo.de>"]
-categories = ["api-bindings", "web-programming"]
-keywords = ["matrix", "chat", "messaging", "ruma"]
-description = "Types and traits for working with the Matrix protocol."
-documentation = "https://docs.rs/ruma-client-api"
-homepage = "https://www.ruma.io/"
-repository = "https://github.com/ruma/ruma"
-readme = "README.md"
-license = "MIT"
-version = "0.1.0"
-edition = "2018"
-
-[features]
-appservice-api = ["ruma-api", "ruma-appservice-api", "ruma-events"]
-client-api = ["ruma-api", "ruma-client-api", "ruma-events"]
-federation-api = ["ruma-api", "ruma-federation-api", "ruma-signatures"]
-
-[dependencies]
-ruma-common = "0.1.3"
-ruma-identifiers = "0.16.2"
-
-ruma-events = { version = "0.21.3", optional = true }
-ruma-signatures = { version = "0.5.0", optional = true }
-
-ruma-api = { version = "0.16.1", optional = true }
-ruma-appservice-api = { version = "0.1.0", path = "ruma-appservice-api", optional = true }
-ruma-client-api = { version = "0.9.0", optional = true }
-ruma-federation-api = { version = "0.0.2", optional = true }
-
 [workspace]
-members = ["ruma-*"]
+members = ["ruma", "ruma-*"]
diff --git a/LICENSE b/ruma-appservice-api/LICENSE
similarity index 96%
rename from LICENSE
rename to ruma-appservice-api/LICENSE
index 662cd008..da7c1156 100644
--- a/LICENSE
+++ b/ruma-appservice-api/LICENSE
@@ -1,4 +1,3 @@
-Copyright (c) 2017 - 2020 Jonas Platte
 Copyright (c) 2019 Wim de With
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
diff --git a/ruma/Cargo.toml b/ruma/Cargo.toml
new file mode 100644
index 00000000..66877c5e
--- /dev/null
+++ b/ruma/Cargo.toml
@@ -0,0 +1,30 @@
+[package]
+name = "ruma"
+authors = ["Jonas Platte <jplatte@posteo.de>"]
+categories = ["api-bindings", "web-programming"]
+keywords = ["matrix", "chat", "messaging", "ruma"]
+description = "Types and traits for working with the Matrix protocol."
+documentation = "https://docs.rs/ruma-client-api"
+homepage = "https://www.ruma.io/"
+repository = "https://github.com/ruma/ruma"
+readme = "README.md"
+license = "MIT"
+version = "0.1.0"
+edition = "2018"
+
+[features]
+appservice-api = ["ruma-api", "ruma-appservice-api", "ruma-events"]
+client-api = ["ruma-api", "ruma-client-api", "ruma-events"]
+federation-api = ["ruma-api", "ruma-federation-api", "ruma-signatures"]
+
+[dependencies]
+ruma-common = "0.1.3"
+ruma-identifiers = "0.16.2"
+
+ruma-events = { version = "0.21.3", optional = true }
+ruma-signatures = { version = "0.5.0", optional = true }
+
+ruma-api = { version = "0.16.1", optional = true }
+ruma-appservice-api = { version = "0.1.0", path = "../ruma-appservice-api", optional = true }
+ruma-client-api = { version = "0.9.0", optional = true }
+ruma-federation-api = { version = "0.0.2", optional = true }
diff --git a/ruma/LICENSE b/ruma/LICENSE
new file mode 100644
index 00000000..f0d48ccb
--- /dev/null
+++ b/ruma/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2020 Jonas Platte
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/src/lib.rs b/ruma/src/lib.rs
similarity index 100%
rename from src/lib.rs
rename to ruma/src/lib.rs