From cb33ed9ca571820b08cbb02d842f6fbd0adc26ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Wed, 7 Dec 2022 11:33:47 +0100 Subject: [PATCH] workspace: inherit metadata MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit pbs-buildcfg is the only one that needs to inherit the version as well, since it stores it in the compiled crate. Signed-off-by: Fabian Grünbichler --- Cargo.toml | 12 ++++++++++-- pbs-api-types/Cargo.toml | 4 ++-- pbs-buildcfg/Cargo.toml | 6 +++--- pbs-client/Cargo.toml | 4 ++-- pbs-config/Cargo.toml | 4 ++-- pbs-datastore/Cargo.toml | 4 ++-- pbs-fuse-loop/Cargo.toml | 4 ++-- pbs-pxar-fuse/Cargo.toml | 2 +- pbs-tape/Cargo.toml | 4 ++-- pbs-tools/Cargo.toml | 4 ++-- proxmox-backup-banner/Cargo.toml | 4 ++-- proxmox-backup-client/Cargo.toml | 4 ++-- proxmox-file-restore/Cargo.toml | 4 ++-- proxmox-restore-daemon/Cargo.toml | 4 ++-- proxmox-rrd/Cargo.toml | 6 +++--- pxar-bin/Cargo.toml | 4 ++-- 16 files changed, 41 insertions(+), 33 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 7fac1bfa..00e736b8 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,4 @@ -[package] -name = "proxmox-backup" +[workspace.package] version = "2.3.1" authors = [ "Dietmar Maurer ", @@ -13,9 +12,18 @@ authors = [ ] edition = "2021" license = "AGPL-3" +repository = "https://git.proxmox.com/?p=proxmox-backup.git" + +[package] +name = "proxmox-backup" description = "Proxmox Backup" homepage = "https://www.proxmox.com" +version.workspace = true +edition.workspace = true +license.workspace = true +repository.workspace = true + exclude = [ "build", "debian", "tests/catar_data/test_symlink/symlink1"] [workspace] diff --git a/pbs-api-types/Cargo.toml b/pbs-api-types/Cargo.toml index 61d37d77..ee64b6e1 100644 --- a/pbs-api-types/Cargo.toml +++ b/pbs-api-types/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "pbs-api-types" version = "0.1.0" -authors = ["Proxmox Support Team "] -edition = "2021" +authors.workspace = true +edition.workspace = true description = "general API type helpers for PBS" [dependencies] diff --git a/pbs-buildcfg/Cargo.toml b/pbs-buildcfg/Cargo.toml index 72545c15..e0738b85 100644 --- a/pbs-buildcfg/Cargo.toml +++ b/pbs-buildcfg/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "pbs-buildcfg" -version = "2.3.1" -authors = ["Proxmox Support Team "] -edition = "2021" +version.workspace = true +authors.workspace = true +edition.workspace = true description = "macros used for pbs related paths such as configdir and rundir" build = "build.rs" diff --git a/pbs-client/Cargo.toml b/pbs-client/Cargo.toml index 54dfe7fd..943e90e0 100644 --- a/pbs-client/Cargo.toml +++ b/pbs-client/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "pbs-client" version = "0.1.0" -authors = ["Wolfgang Bumiller "] -edition = "2021" +authors.workspace = true +edition.workspace = true description = "The main proxmox backup client crate" [dependencies] diff --git a/pbs-config/Cargo.toml b/pbs-config/Cargo.toml index dca52e40..63158d38 100644 --- a/pbs-config/Cargo.toml +++ b/pbs-config/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "pbs-config" version = "0.1.0" -authors = ["Proxmox Support Team "] -edition = "2021" +authors.workspace = true +edition.workspace = true description = "Configuration file management for PBS" [dependencies] diff --git a/pbs-datastore/Cargo.toml b/pbs-datastore/Cargo.toml index 7bf7a91a..d73df5f1 100644 --- a/pbs-datastore/Cargo.toml +++ b/pbs-datastore/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "pbs-datastore" version = "0.1.0" -authors = ["Proxmox Support Team "] -edition = "2021" +authors.workspace = true +edition.workspace = true description = "low level pbs data storage access" [dependencies] diff --git a/pbs-fuse-loop/Cargo.toml b/pbs-fuse-loop/Cargo.toml index 12ad6bf6..f865806e 100644 --- a/pbs-fuse-loop/Cargo.toml +++ b/pbs-fuse-loop/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "pbs-fuse-loop" version = "0.1.0" -authors = ["Proxmox Support Team "] -edition = "2021" +authors.workspace = true +edition.workspace = true description = "fuse and loop device helpers" [dependencies] diff --git a/pbs-pxar-fuse/Cargo.toml b/pbs-pxar-fuse/Cargo.toml index cb0abfe8..dc53cdf5 100644 --- a/pbs-pxar-fuse/Cargo.toml +++ b/pbs-pxar-fuse/Cargo.toml @@ -1,7 +1,7 @@ [package] name = "pbs-pxar-fuse" version = "0.1.0" -edition = "2021" +edition.workspace = true description = "pxar fuse file system code" [dependencies] diff --git a/pbs-tape/Cargo.toml b/pbs-tape/Cargo.toml index e10f6449..fc363c78 100644 --- a/pbs-tape/Cargo.toml +++ b/pbs-tape/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "pbs-tape" version = "0.1.0" -authors = ["Proxmox Support Team "] -edition = "2021" +authors.workspace = true +edition.workspace = true description = "LTO tape support" [dependencies] diff --git a/pbs-tools/Cargo.toml b/pbs-tools/Cargo.toml index 562f084d..8c94cde8 100644 --- a/pbs-tools/Cargo.toml +++ b/pbs-tools/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "pbs-tools" version = "0.1.0" -authors = ["Proxmox Support Team "] -edition = "2021" +authors.workspace = true +edition.workspace = true description = "common tools used throughout pbs" # This must not depend on any subcrates more closely related to pbs itself. diff --git a/proxmox-backup-banner/Cargo.toml b/proxmox-backup-banner/Cargo.toml index c2a5b868..df112624 100644 --- a/proxmox-backup-banner/Cargo.toml +++ b/proxmox-backup-banner/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "proxmox-backup-banner" version = "0.1.0" -authors = ["Proxmox Support Team "] -edition = "2021" +authors.workspace = true +edition.workspace = true [dependencies] anyhow = "1" diff --git a/proxmox-backup-client/Cargo.toml b/proxmox-backup-client/Cargo.toml index 76c68003..3ae23b41 100644 --- a/proxmox-backup-client/Cargo.toml +++ b/proxmox-backup-client/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "proxmox-backup-client" version = "0.1.0" -authors = ["Proxmox Support Team "] -edition = "2021" +authors.workspace = true +edition.workspace = true [dependencies] anyhow = "1.0" diff --git a/proxmox-file-restore/Cargo.toml b/proxmox-file-restore/Cargo.toml index e470848b..54542152 100644 --- a/proxmox-file-restore/Cargo.toml +++ b/proxmox-file-restore/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "proxmox-file-restore" version = "0.1.0" -authors = ["Proxmox Support Team "] -edition = "2021" +authors.workspace = true +edition.workspace = true [dependencies] anyhow = "1.0" diff --git a/proxmox-restore-daemon/Cargo.toml b/proxmox-restore-daemon/Cargo.toml index ccbed84b..9013c67f 100644 --- a/proxmox-restore-daemon/Cargo.toml +++ b/proxmox-restore-daemon/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "proxmox-restore-daemon" version = "0.1.0" -authors = ["Proxmox Support Team "] -edition = "2021" +authors.workspace = true +edition.workspace = true description = "Proxmox Restore Daemon" [dependencies] diff --git a/proxmox-rrd/Cargo.toml b/proxmox-rrd/Cargo.toml index 4e9bb317..c79fc4b3 100644 --- a/proxmox-rrd/Cargo.toml +++ b/proxmox-rrd/Cargo.toml @@ -1,9 +1,9 @@ [package] name = "proxmox-rrd" version = "0.1.0" -authors = ["Proxmox Support Team "] -edition = "2021" -license = "AGPL-3" +authors.workspace = true +edition.workspace = true +license.workspace = true description = "Simple RRD database implementation." [dev-dependencies] diff --git a/pxar-bin/Cargo.toml b/pxar-bin/Cargo.toml index bb066a53..bc3cfda2 100644 --- a/pxar-bin/Cargo.toml +++ b/pxar-bin/Cargo.toml @@ -1,8 +1,8 @@ [package] name = "pxar-bin" version = "0.1.0" -authors = ["Proxmox Support Team "] -edition = "2021" +authors.workspace = true +edition.workspace = true [[bin]] name = "pxar"