From 71a26e433f3f5f68475f22ec57430125b9c2d568 Mon Sep 17 00:00:00 2001 From: Ginger Date: Wed, 31 Dec 2025 15:04:08 -0500 Subject: [PATCH] fix: Update package and crate metadata --- Cargo.toml | 13 ++----------- docs/reference/server.mdx | 2 +- pkg/fedora/continuwuity.spec.rpkg | 4 ++-- src/admin/Cargo.toml | 2 -- src/api/Cargo.toml | 2 -- src/build_metadata/Cargo.toml | 2 -- src/core/Cargo.toml | 2 -- src/database/Cargo.toml | 2 -- src/macros/Cargo.toml | 2 -- src/main/Cargo.toml | 8 ++------ src/router/Cargo.toml | 2 -- src/service/Cargo.toml | 2 -- src/web/Cargo.toml | 2 -- xtask/generate-generate-commands/Cargo.toml | 3 --- xtask/main/Cargo.toml | 3 --- 15 files changed, 7 insertions(+), 44 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 1209272e..7b41069b 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,26 +1,17 @@ -#cargo-features = ["profile-rustflags"] - [workspace] resolver = "2" members = ["src/*", "xtask/*"] default-members = ["src/*"] [workspace.package] -authors = [ - "June Clementine Strawberry ", - "strawberry ", # woof - "Jason Volk ", -] -categories = ["network-programming"] -description = "a very cool Matrix chat homeserver written in Rust" +authors = ["Continuwuity Team and contributors "] +description = "A Matrix homeserver written in Rust, the official continuation of the conduwuit homeserver." edition = "2024" homepage = "https://continuwuity.org/" -keywords = ["chat", "matrix", "networking", "server", "uwu"] license = "Apache-2.0" # See also `rust-toolchain.toml` readme = "README.md" repository = "https://forgejo.ellis.link/continuwuation/continuwuity" -rust-version = "1.86.0" version = "0.5.1" [workspace.metadata.crane] diff --git a/docs/reference/server.mdx b/docs/reference/server.mdx index e34bc51e..0061ad98 100644 --- a/docs/reference/server.mdx +++ b/docs/reference/server.mdx @@ -8,7 +8,7 @@ This document contains the help content for the `continuwuity` command-line prog ## `continuwuity` -a very cool Matrix chat homeserver written in Rust +A Matrix homeserver written in Rust, the official continuation of the conduwuit homeserver. **Usage:** `continuwuity [OPTIONS]` diff --git a/pkg/fedora/continuwuity.spec.rpkg b/pkg/fedora/continuwuity.spec.rpkg index e9d3abdd..41724552 100644 --- a/pkg/fedora/continuwuity.spec.rpkg +++ b/pkg/fedora/continuwuity.spec.rpkg @@ -4,7 +4,7 @@ Name: continuwuity Version: {{{ git_repo_version }}} Release: 1%{?dist} -Summary: Very cool Matrix chat homeserver written in Rust +Summary: A Matrix homeserver written in Rust. License: Apache-2.0 AND MIT @@ -23,7 +23,7 @@ Requires: glibc Requires: libstdc++ %global _description %{expand: -A cool hard fork of Conduit, a Matrix homeserver written in Rust} +A Matrix homeserver written in Rust, the official continuation of the conduwuit homeserver.} %description %{_description} diff --git a/src/admin/Cargo.toml b/src/admin/Cargo.toml index 907dd5d1..ad541ecf 100644 --- a/src/admin/Cargo.toml +++ b/src/admin/Cargo.toml @@ -1,9 +1,7 @@ [package] name = "conduwuit_admin" -categories.workspace = true description.workspace = true edition.workspace = true -keywords.workspace = true license.workspace = true readme.workspace = true repository.workspace = true diff --git a/src/api/Cargo.toml b/src/api/Cargo.toml index 18a2ddbd..e1d73597 100644 --- a/src/api/Cargo.toml +++ b/src/api/Cargo.toml @@ -1,9 +1,7 @@ [package] name = "conduwuit_api" -categories.workspace = true description.workspace = true edition.workspace = true -keywords.workspace = true license.workspace = true readme.workspace = true repository.workspace = true diff --git a/src/build_metadata/Cargo.toml b/src/build_metadata/Cargo.toml index 62c4dc70..1e0bd50f 100644 --- a/src/build_metadata/Cargo.toml +++ b/src/build_metadata/Cargo.toml @@ -1,9 +1,7 @@ [package] name = "conduwuit_build_metadata" -categories.workspace = true description.workspace = true edition.workspace = true -keywords.workspace = true license.workspace = true readme.workspace = true repository.workspace = true diff --git a/src/core/Cargo.toml b/src/core/Cargo.toml index 900b2345..8139f2d3 100644 --- a/src/core/Cargo.toml +++ b/src/core/Cargo.toml @@ -1,9 +1,7 @@ [package] name = "conduwuit_core" -categories.workspace = true description.workspace = true edition.workspace = true -keywords.workspace = true license.workspace = true readme.workspace = true repository.workspace = true diff --git a/src/database/Cargo.toml b/src/database/Cargo.toml index d37ca585..4dd47154 100644 --- a/src/database/Cargo.toml +++ b/src/database/Cargo.toml @@ -1,9 +1,7 @@ [package] name = "conduwuit_database" -categories.workspace = true description.workspace = true edition.workspace = true -keywords.workspace = true license.workspace = true readme.workspace = true repository.workspace = true diff --git a/src/macros/Cargo.toml b/src/macros/Cargo.toml index 167de8c0..e691944f 100644 --- a/src/macros/Cargo.toml +++ b/src/macros/Cargo.toml @@ -1,9 +1,7 @@ [package] name = "conduwuit_macros" -categories.workspace = true description.workspace = true edition.workspace = true -keywords.workspace = true license.workspace = true readme.workspace = true repository.workspace = true diff --git a/src/main/Cargo.toml b/src/main/Cargo.toml index 49e110ea..0a966462 100644 --- a/src/main/Cargo.toml +++ b/src/main/Cargo.toml @@ -2,15 +2,12 @@ name = "conduwuit" default-run = "conduwuit" authors.workspace = true -categories.workspace = true description.workspace = true edition.workspace = true homepage.workspace = true -keywords.workspace = true license.workspace = true readme.workspace = true repository.workspace = true -rust-version.workspace = true version.workspace = true metadata.crane.workspace = true @@ -23,14 +20,13 @@ crate-type = [ [package.metadata.deb] name = "continuwuity" -maintainer = "continuwuity developers " -copyright = "2024, continuwuity developers" +maintainer = "Continuwuity Team and contributors " license-file = ["../../LICENSE", "3"] depends = "$auto, ca-certificates" breaks = ["conduwuit (<<0.5.0)"] replaces = ["conduwuit (<<0.5.0)"] extended-description = """\ -a cool hard fork of Conduit, a Matrix homeserver written in Rust""" +A Matrix homeserver written in Rust, the official continuation of the conduwuit homeserver.""" section = "net" priority = "optional" conf-files = ["/etc/conduwuit/conduwuit.toml"] diff --git a/src/router/Cargo.toml b/src/router/Cargo.toml index 45978ead..6d3cfde7 100644 --- a/src/router/Cargo.toml +++ b/src/router/Cargo.toml @@ -1,9 +1,7 @@ [package] name = "conduwuit_router" -categories.workspace = true description.workspace = true edition.workspace = true -keywords.workspace = true license.workspace = true readme.workspace = true repository.workspace = true diff --git a/src/service/Cargo.toml b/src/service/Cargo.toml index 878190a3..16e37b4e 100644 --- a/src/service/Cargo.toml +++ b/src/service/Cargo.toml @@ -1,9 +1,7 @@ [package] name = "conduwuit_service" -categories.workspace = true description.workspace = true edition.workspace = true -keywords.workspace = true license.workspace = true readme.workspace = true repository.workspace = true diff --git a/src/web/Cargo.toml b/src/web/Cargo.toml index 5c2dbebb..c5c6a06a 100644 --- a/src/web/Cargo.toml +++ b/src/web/Cargo.toml @@ -1,9 +1,7 @@ [package] name = "conduwuit_web" -categories.workspace = true description.workspace = true edition.workspace = true -keywords.workspace = true license.workspace = true readme.workspace = true repository.workspace = true diff --git a/xtask/generate-generate-commands/Cargo.toml b/xtask/generate-generate-commands/Cargo.toml index 5ca7517e..32f36696 100644 --- a/xtask/generate-generate-commands/Cargo.toml +++ b/xtask/generate-generate-commands/Cargo.toml @@ -1,15 +1,12 @@ [package] name = "xtask-generate-commands" authors.workspace = true -categories.workspace = true description.workspace = true edition.workspace = true homepage.workspace = true -keywords.workspace = true license.workspace = true readme.workspace = true repository.workspace = true -rust-version.workspace = true version.workspace = true [dependencies] diff --git a/xtask/main/Cargo.toml b/xtask/main/Cargo.toml index d07047a6..5b89c21d 100644 --- a/xtask/main/Cargo.toml +++ b/xtask/main/Cargo.toml @@ -1,15 +1,12 @@ [package] name = "xtask" authors.workspace = true -categories.workspace = true description.workspace = true edition.workspace = true homepage.workspace = true -keywords.workspace = true license.workspace = true readme.workspace = true repository.workspace = true -rust-version.workspace = true version.workspace = true [dependencies]